From e46395d507a9eb1d4534c61184b4d60dbd75f888 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 18 五月 2023 18:28:27 +0800
Subject: [PATCH] optimize
---
service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java | 297 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 189 insertions(+), 108 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 8a8ebd8..7da4df7 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
@@ -8,18 +8,20 @@
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.core.factory.Java110TransactionalFactory;
import com.java110.core.log.LoggerFactory;
import com.java110.core.smo.IComputeFeeSMO;
import com.java110.dto.account.AccountDto;
-import com.java110.dto.accountDetail.AccountDetailDto;
+import com.java110.dto.account.AccountDetailDto;
import com.java110.dto.fee.FeeAttrDto;
import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.fee.FeeDto;
-import com.java110.dto.feeReceipt.FeeReceiptDetailDto;
+import com.java110.dto.fee.FeeReceiptDetailDto;
import com.java110.dto.owner.OwnerCarDto;
import com.java110.dto.parking.ParkingSpaceDto;
import com.java110.dto.repair.RepairDto;
import com.java110.dto.repair.RepairUserDto;
+import com.java110.dto.user.UserDto;
import com.java110.intf.acct.IAccountDetailInnerServiceSMO;
import com.java110.intf.acct.IAccountInnerServiceSMO;
import com.java110.intf.acct.ICouponUserDetailV1InnerServiceSMO;
@@ -28,6 +30,7 @@
import com.java110.intf.fee.*;
import com.java110.intf.fee.IFeeAccountDetailServiceSMO;
import com.java110.intf.user.IOwnerCarInnerServiceSMO;
+import com.java110.intf.user.IUserV1InnerServiceSMO;
import com.java110.po.accountDetail.AccountDetailPo;
import com.java110.po.applyRoomDiscount.ApplyRoomDiscountPo;
import com.java110.po.car.OwnerCarPo;
@@ -37,6 +40,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;
@@ -55,6 +59,12 @@
import java.text.SimpleDateFormat;
import java.util.*;
+/**
+ * 鍓嶅彴 鐜伴噾鎴栬�呰浆璐︽敹璐� 缂磋垂澶勭悊绫�
+ * <p>
+ * 鍋囧 缂磋垂 鍚庤澶勭悊涓�浜涢�昏緫寤鸿鐢╠atabus
+ * 杩欎釜绫诲凡缁忓緢澶嶆潅 锛屾渶濂戒笉瑕佸姞鏂伴�昏緫
+ */
@Java110Cmd(serviceCode = "fee.payFee")
public class PayFeeCmd extends Cmd {
@@ -126,6 +136,10 @@
@Autowired
private IFeeAccountDetailServiceSMO feeAccountDetailServiceSMOImpl;
+ @Autowired
+ private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
+
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
Assert.jsonObjectHaveKey(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId鑺傜偣");
@@ -165,11 +179,11 @@
//涓�娆℃�ц垂鐢� 鍜岄棿鎺ユ�ц垂鐢�
Date maxEndTime = feeDtos.get(0).getDeadlineTime();
//鍛ㄦ湡鎬ц垂鐢�
- if (maxEndTime == null) {
+ if (maxEndTime == null || FeeDto.FEE_FLAG_CYCLE.equals(feeConfigDtos.get(0).getFeeFlag())) {
maxEndTime = DateUtil.getDateFromStringA(feeConfigDtos.get(0).getEndTime());
}
- if (maxEndTime != null && endTime != null) {
+ if (maxEndTime != null && endTime != null && !FeeDto.FEE_FLAG_ONCE.equals(feeConfigDtos.get(0).getFeeFlag())) {
Date newDate = DateUtil.stepMonth(endTime, reqJson.getDouble("cycles").intValue());
if (newDate.getTime() > maxEndTime.getTime()) {
throw new IllegalArgumentException("缂磋垂鍛ㄦ湡瓒呰繃 缂磋垂缁撴潫鏃堕棿,璇风敤鎸夌粨鏉熸椂闂存柟寮忕即璐�");
@@ -189,6 +203,13 @@
@Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject paramObj) throws CmdException {
logger.debug("paramObj : {}", paramObj);
+
+ String userId = cmdDataFlowContext.getReqHeaders().get("user-id");
+ UserDto userDto = new UserDto();
+ userDto.setUserId(userId);
+ List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
+ Assert.listOnlyOne(userDtos, "鐢ㄦ埛鏈櫥褰�");
+
PayFeePo payFeePo = null;
String requestId = DistributedLock.getLockUUID();
String key = this.getClass().getSimpleName() + paramObj.get("feeId");
@@ -202,99 +223,18 @@
payFeeDetailPo.setReceivableAmount(feeDetail.getString("totalFeePrice"));
//鍒ゆ柇鏄惁鏈夎禒閫佽鍒�
hasDiscount(paramObj, payFeePo, payFeeDetailPo);
- //鍒ゆ柇閫夋嫨鐨勮处鍙�
- JSONArray jsonArray = paramObj.getJSONArray("selectUserAccount");
- if (jsonArray == null || jsonArray.size() < 1) {
- FeeAccountDetailPo feeAccountDetailPo = new FeeAccountDetailPo();
- feeAccountDetailPo.setFadId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_fadId));
- feeAccountDetailPo.setDetailId(payFeeDetailPo.getDetailId());
- feeAccountDetailPo.setCommunityId(payFeeDetailPo.getCommunityId());
- feeAccountDetailPo.setState("1001"); //1001 鏃犳姷鎵� 1002 鐜伴噾璐︽埛鎶垫墸 1003 绉垎璐︽埛鎶垫墸 1004 浼樻儬鍒告姷鎵�
- feeAccountDetailPo.setAmount(paramObj.getString("receivedAmount"));
- feeAccountDetailServiceSMOImpl.saveFeeAccountDetail(feeAccountDetailPo);
+
+ // todo 澶勭悊鐢ㄦ埛璐︽埛
+ dealUserAccount(paramObj, payFeeDetailPo);
+
+ String oId = Java110TransactionalFactory.getOId();
+ if (StringUtil.isEmpty(oId)) {
+ oId = payFeeDetailPo.getDetailId();
}
- for (int columnIndex = 0; columnIndex < jsonArray.size(); columnIndex++) {
- JSONObject param = jsonArray.getJSONObject(columnIndex);
- if (AccountDto.ACCT_TYPE_INTEGRAL.equals(param.getString("acctType"))) { //绉垎璐︽埛
- //璐︽埛閲戦
- BigDecimal amount = new BigDecimal(param.getString("amount"));
- //鑾峰彇鏈�澶ф姷鎵ｇН鍒�
- BigDecimal maximumNumber = new BigDecimal(param.getString("maximumNumber"));
- //鑾峰彇绉垎鎶垫墸
- BigDecimal deductionProportion = new BigDecimal(param.getString("deductionProportion"));
- int flag = amount.compareTo(maximumNumber);
- BigDecimal redepositAmount = new BigDecimal("0.00");
- if (flag == 1) { //璐︽埛绉垎澶т簬鏈�澶т娇鐢ㄧН鍒嗭紝灏辩敤鏈�澶т娇鐢ㄧН鍒嗘姷鎵�
- redepositAmount = maximumNumber;
- }
- if (flag > -1) { //璐︽埛绉垎澶т簬绛変簬鏈�澶т娇鐢ㄧН鍒嗭紝灏辩敤鏈�澶т娇鐢ㄧН鍒嗘姷鎵�
- redepositAmount = maximumNumber;
- }
- if (flag == -1) { //璐︽埛绉垎灏忎簬鏈�澶т娇鐢ㄧН鍒嗭紝灏辩敤璐︽埛绉垎鎶垫墸
- redepositAmount = amount;
- }
- if (flag < 1) { //璐︽埛绉垎灏忎簬绛変簬鏈�澶т娇鐢ㄧН鍒嗭紝灏辩敤璐︽埛绉垎鎶垫墸
- redepositAmount = amount;
- }
- if (flag == 0) { //璐︽埛绉垎绛変簬鏈�澶т娇鐢ㄧН鍒�
- redepositAmount = amount;
- }
- //璁＄畻绉垎鎹㈢畻鐨勯噾棰�
- BigDecimal divide = redepositAmount.divide(deductionProportion);
- BigDecimal receivedAmount = new BigDecimal(payFeeDetailPo.getReceivedAmount());
- //璁＄畻瀹炰粯閲戦
- int flag2 = divide.compareTo(receivedAmount);
- BigDecimal subtract = new BigDecimal("0.00");
- //鐢熸垚鎶垫墸鏄庣粏璁板綍
- FeeAccountDetailPo feeAccountDetailPo = new FeeAccountDetailPo();
- if (flag2 == -1) { //绉垎鎹㈢畻閲戦灏忎簬瀹炰粯閲戦
- subtract = receivedAmount.subtract(divide);
- feeAccountDetailPo.setAmount(divide.toString()); //绉垎鎶垫墸閲戦
- } else if (flag < 1) { //绉垎鎹㈢畻閲戦灏忎簬绛変簬瀹炰粯閲戦
- subtract = receivedAmount.subtract(divide);
- feeAccountDetailPo.setAmount(divide.toString()); //绉垎鎶垫墸閲戦
- } else {
- feeAccountDetailPo.setAmount(receivedAmount.toString()); //绉垎鎶垫墸閲戦
- }
- payFeeDetailPo.setReceivedAmount(subtract.toString());
- feeAccountDetailPo.setFadId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_fadId));
- feeAccountDetailPo.setDetailId(payFeeDetailPo.getDetailId());
- feeAccountDetailPo.setCommunityId(payFeeDetailPo.getCommunityId());
- feeAccountDetailPo.setState("1003"); //1001 鏃犳姷鎵� 1002 鐜伴噾璐︽埛鎶垫墸 1003 绉垎璐︽埛鎶垫墸 1004 浼樻儬鍒告姷鎵�
- feeAccountDetailServiceSMOImpl.saveFeeAccountDetail(feeAccountDetailPo);
- } else if (!StringUtil.isEmpty(param.getString("acctType")) && param.getString("acctType").equals("2003")) { //鐜伴噾璐︽埛
- //璐︽埛閲戦
- BigDecimal amount = new BigDecimal(param.getString("amount"));
- //瀹炴敹閲戦
- BigDecimal receivedAmount = new BigDecimal(payFeeDetailPo.getReceivedAmount());
- int flag = amount.compareTo(receivedAmount);
- BigDecimal redepositAmount = new BigDecimal("0.00");
- if (flag == 1) { //鐜伴噾璐︽埛澶т簬瀹炴敹閲戦锛屽氨鐢ㄥ疄鏀堕噾棰�
- redepositAmount = receivedAmount;
- }
- if (flag > -1) { //鐜伴噾璐︽埛澶т簬绛変簬瀹炴敹閲戦锛屽氨鐢ㄥ疄鏀堕噾棰�
- redepositAmount = receivedAmount;
- }
- if (flag == -1) { //鐜伴噾璐︽埛灏忎簬瀹炴敹閲戦锛屽氨鐢ㄧ幇閲戣处鎴�
- redepositAmount = amount;
- }
- if (flag < 1) { //鐜伴噾璐︽埛灏忎簬绛変簬瀹炴敹閲戦锛屽氨鐢ㄧ幇閲戣处鎴�
- redepositAmount = amount;
- }
- if (flag == 0) { //鐜伴噾璐︽埛绛変簬瀹炴敹閲戦
- redepositAmount = amount;
- }
- //鐢熸垚鎶垫墸鏄庣粏璁板綍
- FeeAccountDetailPo feeAccountDetailPo = new FeeAccountDetailPo();
- feeAccountDetailPo.setFadId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_fadId));
- feeAccountDetailPo.setDetailId(payFeeDetailPo.getDetailId());
- feeAccountDetailPo.setCommunityId(payFeeDetailPo.getCommunityId());
- feeAccountDetailPo.setState("1002"); //1001 鏃犳姷鎵� 1002 鐜伴噾璐︽埛鎶垫墸 1003 绉垎璐︽埛鎶垫墸 1004 浼樻儬鍒告姷鎵�
- feeAccountDetailPo.setAmount(redepositAmount.toString()); //绉垎鎶垫墸閲戦
- feeAccountDetailServiceSMOImpl.saveFeeAccountDetail(feeAccountDetailPo);
- }
- }
- payFeeDetailPo.setPayOrderId(payFeeDetailPo.getDetailId());
+
+ payFeeDetailPo.setPayOrderId(oId);
+ payFeeDetailPo.setCashierId(userDtos.get(0).getUserId());
+ payFeeDetailPo.setCashierName(userDtos.get(0).getName());
int flag = payFeeDetailNewV1InnerServiceSMOImpl.savePayFeeDetailNew(payFeeDetailPo);
if (flag < 1) {
throw new CmdException("缂磋垂澶辫触");
@@ -342,18 +282,111 @@
}
}
-// //鏍规嵁鏄庣粏ID 鏌ヨ鏀舵嵁淇℃伅
+ //鏍规嵁鏄庣粏ID 鏌ヨ鏀舵嵁淇℃伅
FeeReceiptDetailDto feeReceiptDetailDto = new FeeReceiptDetailDto();
feeReceiptDetailDto.setDetailId(paramObj.getString("detailId"));
-// feeReceiptDetailDto.setCommunityId(paramObj.getString("communityId"));
-// List<FeeReceiptDetailDto> feeReceiptDetailDtos = feeReceiptDetailInnerServiceSMOImpl.queryFeeReceiptDetails(feeReceiptDetailDto);
-//
-// if (feeReceiptDetailDtos != null && feeReceiptDetailDtos.size() > 0) {
-// cmdDataFlowContext.setResponseEntity(ResultVo.createResponseEntity(feeReceiptDetailDtos.get(0)));
-// return;
-// }
cmdDataFlowContext.setResponseEntity(ResultVo.createResponseEntity(feeReceiptDetailDto));
+ }
+
+ private void dealUserAccount(JSONObject paramObj, PayFeeDetailPo payFeeDetailPo) {
+ //鍒ゆ柇閫夋嫨鐨勮处鍙�
+ JSONArray jsonArray = paramObj.getJSONArray("selectUserAccount");
+ if (jsonArray == null || jsonArray.size() < 1) {
+ return;
+ }
+
+ BigDecimal integralSum = new BigDecimal(0);
+ BigDecimal cashSum = new BigDecimal(0);
+
+ for (int columnIndex = 0; columnIndex < jsonArray.size(); columnIndex++) {
+ JSONObject param = jsonArray.getJSONObject(columnIndex);
+ //璐︽埛閲戦
+ BigDecimal amount = new BigDecimal(param.getString("amount"));
+ if (AccountDto.ACCT_TYPE_INTEGRAL.equals(param.getString("acctType"))) { //绉垎璐︽埛
+ //鑾峰彇鏈�澶ф姷鎵ｇН鍒�
+ BigDecimal maximumNumber = new BigDecimal(param.getString("maximumNumber"));
+ //鑾峰彇绉垎鎶垫墸
+ BigDecimal deductionProportion = new BigDecimal(param.getString("deductionProportion"));
+ int flag = amount.compareTo(maximumNumber);
+ BigDecimal redepositAmount = new BigDecimal("0.00");
+ if (flag == 1) { //璐︽埛绉垎澶т簬鏈�澶т娇鐢ㄧН鍒嗭紝灏辩敤鏈�澶т娇鐢ㄧН鍒嗘姷鎵�
+ redepositAmount = maximumNumber;
+ }
+ if (flag > -1) { //璐︽埛绉垎澶т簬绛変簬鏈�澶т娇鐢ㄧН鍒嗭紝灏辩敤鏈�澶т娇鐢ㄧН鍒嗘姷鎵�
+ redepositAmount = maximumNumber;
+ }
+ if (flag == -1) { //璐︽埛绉垎灏忎簬鏈�澶т娇鐢ㄧН鍒嗭紝灏辩敤璐︽埛绉垎鎶垫墸
+ redepositAmount = amount;
+ }
+ if (flag < 1) { //璐︽埛绉垎灏忎簬绛変簬鏈�澶т娇鐢ㄧН鍒嗭紝灏辩敤璐︽埛绉垎鎶垫墸
+ redepositAmount = amount;
+ }
+ if (flag == 0) { //璐︽埛绉垎绛変簬鏈�澶т娇鐢ㄧН鍒�
+ redepositAmount = amount;
+ }
+ //璁＄畻绉垎鎹㈢畻鐨勯噾棰�
+ BigDecimal divide = redepositAmount.divide(deductionProportion);
+ BigDecimal receivedAmount = new BigDecimal(payFeeDetailPo.getReceivedAmount());
+ //璁＄畻瀹炰粯閲戦
+ int flag2 = divide.compareTo(receivedAmount);
+ BigDecimal subtract = new BigDecimal("0.00");
+ //鐢熸垚鎶垫墸鏄庣粏璁板綍
+ if (flag2 == -1) { //绉垎鎹㈢畻閲戦灏忎簬瀹炰粯閲戦
+ subtract = receivedAmount.subtract(divide);
+ } else if (flag < 1) { //绉垎鎹㈢畻閲戦灏忎簬绛変簬瀹炰粯閲戦
+ subtract = receivedAmount.subtract(divide);
+ }
+ integralSum = integralSum.add(subtract);
+ payFeeDetailPo.setReceivedAmount(subtract.toString());
+ } else if (AccountDto.ACCT_TYPE_CASH.equals(param.getString("acctType"))) { //鐜伴噾璐︽埛
+ //瀹炴敹閲戦
+ BigDecimal receivedAmount = new BigDecimal(payFeeDetailPo.getReceivedAmount());
+ int flag = amount.compareTo(receivedAmount);
+ BigDecimal redepositAmount = new BigDecimal(0.00);
+ if (flag == 1) { //鐜伴噾璐︽埛澶т簬瀹炴敹閲戦锛屽氨鐢ㄥ疄鏀堕噾棰�
+ redepositAmount = receivedAmount;
+ }
+ if (flag > -1) { //鐜伴噾璐︽埛澶т簬绛変簬瀹炴敹閲戦锛屽氨鐢ㄥ疄鏀堕噾棰�
+ redepositAmount = receivedAmount;
+ }
+ if (flag == -1) { //鐜伴噾璐︽埛灏忎簬瀹炴敹閲戦锛屽氨鐢ㄧ幇閲戣处鎴�
+ redepositAmount = amount;
+ }
+ if (flag < 1) { //鐜伴噾璐︽埛灏忎簬绛変簬瀹炴敹閲戦锛屽氨鐢ㄧ幇閲戣处鎴�
+ redepositAmount = amount;
+ }
+ if (flag == 0) { //鐜伴噾璐︽埛绛変簬瀹炴敹閲戦
+ redepositAmount = amount;
+ }
+ cashSum = cashSum.add(redepositAmount);
+
+ }
+
+ // todo 濡傛灉绉垎澶т簬0
+ if (integralSum.doubleValue() > 0) {
+ FeeAccountDetailPo feeAccountDetailPo = new FeeAccountDetailPo();
+ feeAccountDetailPo.setFadId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_fadId));
+ feeAccountDetailPo.setDetailId(payFeeDetailPo.getDetailId());
+ feeAccountDetailPo.setCommunityId(payFeeDetailPo.getCommunityId());
+ feeAccountDetailPo.setAmount(integralSum.doubleValue() + "");
+ feeAccountDetailPo.setState("1003"); //1001 鏃犳姷鎵� 1002 鐜伴噾璐︽埛鎶垫墸 1003 绉垎璐︽埛鎶垫墸 1004 浼樻儬鍒告姷鎵�
+ feeAccountDetailServiceSMOImpl.saveFeeAccountDetail(feeAccountDetailPo);
+ }
+ if (cashSum.doubleValue() > 0) {
+ //鐢熸垚鎶垫墸鏄庣粏璁板綍
+ FeeAccountDetailPo feeAccountDetailPo = new FeeAccountDetailPo();
+ feeAccountDetailPo.setFadId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_fadId));
+ feeAccountDetailPo.setDetailId(payFeeDetailPo.getDetailId());
+ feeAccountDetailPo.setCommunityId(payFeeDetailPo.getCommunityId());
+ feeAccountDetailPo.setState("1002"); //1001 鏃犳姷鎵� 1002 鐜伴噾璐︽埛鎶垫墸 1003 绉垎璐︽埛鎶垫墸 1004 浼樻儬鍒告姷鎵�
+ feeAccountDetailPo.setAmount(cashSum.doubleValue() + ""); //鐜伴噾鎶垫墸閲戦
+ feeAccountDetailServiceSMOImpl.saveFeeAccountDetail(feeAccountDetailPo);
+ BigDecimal receivedAmountDec = new BigDecimal(payFeeDetailPo.getReceivedAmount());
+ receivedAmountDec = receivedAmountDec.subtract(cashSum);
+ payFeeDetailPo.setReceivedAmount(receivedAmountDec.doubleValue() + "");
+ }
+ }
}
/**
@@ -499,7 +532,7 @@
feeDto.setCommunityId(paramObj.getString("communityId"));
List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
- if(feeDtos == null || feeDtos.size() < 1){
+ if (feeDtos == null || feeDtos.size() < 1) {
return;
}
if (!FeeDto.PAYER_OBJ_TYPE_CAR.equals(feeDtos.get(0).getPayerObjType())) {
@@ -518,6 +551,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();
@@ -529,17 +564,30 @@
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);
}
Calendar endTimeCalendar = null;
//杞︿綅璐圭敤缁
for (OwnerCarDto tmpOwnerCarDto : ownerCarDtos) {
- //鍚庝粯璐� 鍔犱竴涓湀
- if(FeeConfigDto.PAYMENT_CD_AFTER.equals(feeDtos.get(0).getPaymentCd())){
+ //鍚庝粯璐� 鎴栬�呬俊鐢ㄦ湡杞﹁締 鍔犱竴涓湀
+ if (FeeConfigDto.PAYMENT_CD_AFTER.equals(feeDtos.get(0).getPaymentCd())
+ || OwnerCarDto.CAR_TYPE_CREDIT.equals(tmpOwnerCarDto.getCarType())) {
endTimeCalendar = Calendar.getInstance();
endTimeCalendar.setTime(feeEndTime);
- endTimeCalendar.add(Calendar.MONTH,1);
+ endTimeCalendar.add(Calendar.MONTH, 1);
feeEndTime = endTimeCalendar.getTime();
}
if (tmpOwnerCarDto.getEndTime().getTime() >= feeEndTime.getTime()) {
@@ -557,6 +605,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