From 8d7554d5e7e6d9f5576fd7b94baf68c27f3ca4c2 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 31 三月 2023 11:48:47 +0800
Subject: [PATCH] optimize owner member
---
service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 54 insertions(+), 0 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java
index 62ea5b7..52ca884 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java
@@ -38,6 +38,7 @@
import com.java110.po.owner.RepairPoolPo;
import com.java110.po.owner.RepairUserPo;
import com.java110.po.payFeeDetailDiscount.PayFeeDetailDiscountPo;
+import com.java110.utils.cache.CommonCache;
import com.java110.utils.constant.FeeFlagTypeConstant;
import com.java110.utils.constant.ResponseConstant;
import com.java110.utils.exception.CmdException;
@@ -56,6 +57,12 @@
import java.text.SimpleDateFormat;
import java.util.*;
+/**
+ * 鍓嶅彴 鐜伴噾鎴栬�呰浆璐︽敹璐� 缂磋垂澶勭悊绫�
+ *
+ * 鍋囧 缂磋垂 鍚庤澶勭悊涓�浜涢�昏緫寤鸿鐢╠atabus
+ * 杩欎釜绫诲凡缁忓緢澶嶆潅 锛屾渶濂戒笉瑕佸姞鏂伴�昏緫
+ */
@Java110Cmd(serviceCode = "fee.payFee")
public class PayFeeCmd extends Cmd {
@@ -531,6 +538,8 @@
//鑾峰彇杞︿綅id
String psId = ownerCarDtos.get(0).getPsId();
//鑾峰彇杞﹁締鐘舵��(1001 姝ｅ父鐘舵�侊紝2002 娆犺垂鐘舵�� 3003 杞︿綅閲婃斁)
+ boolean sonMotherParking = false;
+ String num = "";
String carState = ownerCarDtos.get(0).getState();
if (!StringUtil.isEmpty(psId) && "3003".equals(carState)) {
ParkingSpaceDto parkingSpaceDto = new ParkingSpaceDto();
@@ -542,6 +551,18 @@
if (!StringUtil.isEmpty(state) && !state.equals("F")) {
throw new IllegalArgumentException("杞︿綅宸茶浣跨敤锛屼笉鑳藉啀缂磋垂锛�");
}
+
+ if(ParkingSpaceDto.TYPE_CD_SON_MOTHER.equals(parkingSpaceDtos.get(0).getTypeCd())
+ && !parkingSpaceDtos.get(0).getTypeCd().contains(ParkingSpaceDto.NUM_MOTHER)
+ ){
+ sonMotherParking = true;
+ num = parkingSpaceDtos.get(0).getNum();
+ }
+ }
+
+ // todo 瀛楁瘝杞︿綅锛屽瓙杞︿綅缂磋垂 姣嶈溅浣嶅欢鏈�
+ if(sonMotherParking){
+ queryMotherOwnerCars(num,ownerCarDtos,psId);
}
@@ -569,6 +590,39 @@
}
+
+ }
+
+ /**
+ * 瀛愭瘝杞︿綅寤舵湡 姣嶈溅浣嶄篃闇�瑕佸欢鏈�
+ * @param num
+ * @param ownerCarDtos
+ */
+ private void queryMotherOwnerCars(String num, List<OwnerCarDto> ownerCarDtos,String paId) {
+
+ String sonMotherSwitch = CommonCache.getValue("SON_MOTHER_PARKING_AUTO_FEE");
+
+ if(!"ON".equals(sonMotherSwitch)){
+ return ;
+ }
+
+ ParkingSpaceDto parkingSpaceDto = new ParkingSpaceDto();
+ parkingSpaceDto.setNum(num+ParkingSpaceDto.NUM_MOTHER);
+ parkingSpaceDto.setPaId(paId);
+ List<ParkingSpaceDto> parkingSpaceDtos = parkingSpaceInnerServiceSMOImpl.queryParkingSpaces(parkingSpaceDto);
+ Assert.listOnlyOne(parkingSpaceDtos, "鏌ヨ杞︿綅淇℃伅閿欒锛�");
+
+ OwnerCarDto ownerCarDto = new OwnerCarDto();
+ ownerCarDto.setCommunityId(parkingSpaceDtos.get(0).getCommunityId());
+ ownerCarDto.setPsId(parkingSpaceDtos.get(0).getPsId());
+ ownerCarDto.setCarTypeCd("1001"); //涓氫富杞﹁締
+ List<OwnerCarDto> tmpOwnerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
+
+ if(ownerCarDtos == null){
+ ownerCarDtos = new ArrayList<>();
+ }
+
+ ownerCarDtos.addAll(tmpOwnerCarDtos);
}
--
Gitblit v1.8.0