From 8954429263a75e3c7d19db20a60370fca005f2bd Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 08 八月 2023 15:44:49 +0800
Subject: [PATCH] 优化代码
---
service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java | 50 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 41 insertions(+), 9 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 6010e7d..2b5ac30 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
@@ -13,15 +13,13 @@
import com.java110.core.smo.IComputeFeeSMO;
import com.java110.dto.account.AccountDto;
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.fee.FeeReceiptDetailDto;
+import com.java110.dto.fee.*;
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.fee.smo.impl.FeeReceiptInnerServiceSMOImpl;
import com.java110.intf.acct.IAccountDetailInnerServiceSMO;
import com.java110.intf.acct.IAccountInnerServiceSMO;
import com.java110.intf.acct.ICouponUserDetailV1InnerServiceSMO;
@@ -141,6 +139,9 @@
@Autowired
private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
+ @Autowired
+ private FeeReceiptInnerServiceSMOImpl feeReceiptInnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
@@ -184,6 +185,12 @@
if (maxEndTime == null || FeeDto.FEE_FLAG_CYCLE.equals(feeConfigDtos.get(0).getFeeFlag())) {
maxEndTime = DateUtil.getDateFromStringA(feeConfigDtos.get(0).getEndTime());
}
+// Date maxEndTime = null;
+// if (!StringUtil.isEmpty(feeDto.getFeeFlag()) && feeDto.getFeeFlag().equals(FeeDto.FEE_FLAG_CYCLE)) { //鍛ㄦ湡鎬ц垂鐢�
+// maxEndTime = DateUtil.getDateFromStringA(feeConfigDtos.get(0).getEndTime());
+// } else { //涓�娆℃�ц垂鐢� 鍜岄棿鎺ユ�ц垂鐢�
+// maxEndTime = feeDtos.get(0).getDeadlineTime();
+// }
if (maxEndTime != null && endTime != null && !FeeDto.FEE_FLAG_ONCE.equals(feeConfigDtos.get(0).getFeeFlag())) {
Date newDate = DateUtil.stepMonth(endTime, reqJson.getDouble("cycles").intValue());
@@ -218,6 +225,9 @@
String cycles = paramObj.getString("cycles");
Date endTime = null;
+ //todo 鐢熸垚鏀舵嵁缂栧彿
+ String receiptCode = feeReceiptInnerServiceSMOImpl.generatorReceiptCode(paramObj.getString("communityId"));
+
PayFeePo payFeePo = null;
String requestId = DistributedLock.getLockUUID();
String key = this.getClass().getSimpleName() + paramObj.get("feeId");
@@ -233,7 +243,10 @@
payFeePo = BeanConvertUtil.covertBean(fee, PayFeePo.class);
PayFeeDetailPo payFeeDetailPo = BeanConvertUtil.covertBean(feeDetail, PayFeeDetailPo.class);
payFeeDetailPo.setReceivableAmount(feeDetail.getString("totalFeePrice"));
- //鍒ゆ柇鏄惁鏈夎禒閫佽鍒�
+ //todo 缂撳瓨鏀舵嵁缂栧彿
+ CommonCache.setValue(payFeeDetailPo.getDetailId() + CommonCache.RECEIPT_CODE, receiptCode, CommonCache.DEFAULT_EXPIRETIME_TWO_MIN);
+
+ //todo 鍒ゆ柇鏄惁鏈夎禒閫佽鍒�
hasDiscount(paramObj, payFeePo, payFeeDetailPo);
// todo 澶勭悊鐢ㄦ埛璐︽埛
@@ -295,6 +308,7 @@
applyRoomDiscountInnerServiceSMOImpl.updateApplyRoomDiscount(applyRoomDiscountPo);
}
}
+
//鏍规嵁鏄庣粏ID 鏌ヨ鏀舵嵁淇℃伅
FeeReceiptDetailDto feeReceiptDetailDto = new FeeReceiptDetailDto();
@@ -1034,25 +1048,30 @@
}
FeeConfigDto tmpFeeConfigDto = new FeeConfigDto();
- tmpFeeConfigDto.setFeeNameEq(feeConfigDto.getFeeNameEq() + "娆犺垂");
+ tmpFeeConfigDto.setFeeNameEq(feeConfigDto.getFeeName() + "娆犺垂");
tmpFeeConfigDto.setFeeFlag(FeeDto.FEE_FLAG_CYCLE_ONCE);
tmpFeeConfigDto.setComputingFormula(feeConfigDto.getComputingFormula());
List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(tmpFeeConfigDto);
- Assert.listOnlyOne(feeConfigDtos, "鎸夌即璐规椂闂存缂磋垂鏃讹紝璐圭敤蹇呴』涓洪棿鎺ユ�ц垂鐢紝鎴栬�呭瓨鍦ㄥ悕绉颁负=" + feeConfigDto.getFeeName() + "娆犺垂 鐨勯棿鎺ユ�ц垂鐢紝瀹冪殑鍏紡璁＄畻蹇呴』瑕佸拰" + feeConfigDto.getFeeName() + "涓�鑷�");
+ Assert.listOnlyOne(feeConfigDtos, "鎸夎嚜瀹氫箟鏃堕棿娈电即璐规椂锛岃垂鐢ㄥ繀椤讳负闂存帴鎬ц垂鐢紝鎴栬�呭瓨鍦ㄥ悕绉颁负 " + feeConfigDto.getFeeName() + "娆犺垂 鐨勯棿鎺ユ�ц垂鐢紝瀹冪殑鍏紡璁＄畻蹇呴』瑕佸拰" + feeConfigDto.getFeeName() + "涓�鑷�");
}
/**
* 鑷畾涔夋椂闂存 缂磋垂
*
- * @param cycle
+ * @param cycles
* @param endTime
* @param payFeeDetailPo
* @param payFeePo
*/
private void ifCustomStartEndTimePayFee(String cycles, Date endTime, PayFeeDetailPo payFeeDetailPo, PayFeePo payFeePo, JSONObject reqJson) {
if (!"-105".equals(cycles)) {
+ return;
+ }
+
+ //todo 濡傛灉鏄悓涓�澶╀笉鍒涘缓
+ if (DateUtil.getFormatTimeStringB(endTime).equals(reqJson.getString("customStartTime"))) {
return;
}
@@ -1073,6 +1092,7 @@
tmpPayFeeDetailPo.setPayableAmount("0");
tmpPayFeeDetailPo.setStartTime(DateUtil.getFormatTimeStringB(endTime));
tmpPayFeeDetailPo.setEndTime(reqJson.getString("customStartTime"));
+ tmpPayFeeDetailPo.setState(FeeDetailDto.STATE_OWE);
tmpPayFeeDetailPo.setRemark("鎸夌即璐规椂闂存缂磋垂,杩欓儴鍒嗚垂鐢ㄦ寜娆犺垂鐨勬柟寮忛噸鏂扮敓鎴愶紝璇峰湪" + payObjNameRemark + "涓婃煡鐪�");
int flag = payFeeDetailNewV1InnerServiceSMOImpl.savePayFeeDetailNew(tmpPayFeeDetailPo);
@@ -1107,14 +1127,26 @@
List<FeeAttrPo> tmpFeeAttrPos = new ArrayList<>();
FeeAttrPo tmpFeeAttrPo = null;
+ boolean hasDeadLineTime = false;
for (FeeAttrDto tmpFeeAttrDto : feeAttrDtos) {
tmpFeeAttrDto.setFeeId(tmpPayFeePo.getFeeId());
tmpFeeAttrDto.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId, true));
if (FeeAttrDto.SPEC_CD_ONCE_FEE_DEADLINE_TIME.equals(tmpFeeAttrDto.getSpecCd())) {
tmpFeeAttrDto.setValue(reqJson.getString("customStartTime"));
+ hasDeadLineTime = true;
}
tmpFeeAttrPo = BeanConvertUtil.covertBean(tmpFeeAttrDto, FeeAttrPo.class);
+ tmpFeeAttrPos.add(tmpFeeAttrPo);
+ }
+ //todo 娌℃湁缁撴潫鏃堕棿鏃�
+ if (!hasDeadLineTime) {
+ tmpFeeAttrPo = new FeeAttrPo();
+ tmpFeeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId, true));
+ tmpFeeAttrPo.setFeeId(tmpPayFeePo.getFeeId());
+ tmpFeeAttrPo.setCommunityId(tmpFeeAttrPo.getCommunityId());
+ tmpFeeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_ONCE_FEE_DEADLINE_TIME);
+ tmpFeeAttrPo.setValue(reqJson.getString("customStartTime"));
tmpFeeAttrPos.add(tmpFeeAttrPo);
}
@@ -1140,7 +1172,7 @@
FeeConfigDto tmpFeeConfigDto = new FeeConfigDto();
- tmpFeeConfigDto.setFeeNameEq(feeConfigDtos.get(0).getFeeNameEq() + "娆犺垂");
+ tmpFeeConfigDto.setFeeNameEq(feeConfigDtos.get(0).getFeeName() + "娆犺垂");
tmpFeeConfigDto.setFeeFlag(FeeDto.FEE_FLAG_CYCLE_ONCE);
tmpFeeConfigDto.setComputingFormula(feeConfigDto.getComputingFormula());
//todo 鏍￠獙鐨勬椂鍊欐牎楠岃繃浜� 鎵�浠ヨ繖閲屼笉鍙兘涓虹┖
--
Gitblit v1.8.0