From 7958f1dddb8a7f4e70d232b07a7703955ecedae0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期六, 26 八月 2023 12:45:33 +0800
Subject: [PATCH] 优化diamante
---
service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 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 a833d8d..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
@@ -19,6 +19,7 @@
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;
@@ -138,6 +139,9 @@
@Autowired
private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
+ @Autowired
+ private FeeReceiptInnerServiceSMOImpl feeReceiptInnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
@@ -181,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());
@@ -215,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");
@@ -230,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 澶勭悊鐢ㄦ埛璐︽埛
@@ -292,6 +308,7 @@
applyRoomDiscountInnerServiceSMOImpl.updateApplyRoomDiscount(applyRoomDiscountPo);
}
}
+
//鏍规嵁鏄庣粏ID 鏌ヨ鏀舵嵁淇℃伅
FeeReceiptDetailDto feeReceiptDetailDto = new FeeReceiptDetailDto();
@@ -815,10 +832,10 @@
} else if ("-105".equals(paramInJson.getString("cycles"))) {
String customEndTime = paramInJson.getString("customEndTime");
Date endDates = DateUtil.getDateFromStringB(customEndTime);
-// Calendar c = Calendar.getInstance();
-// c.setTime(endDates);
-// c.add(Calendar.DAY_OF_MONTH, 1);
-// endDates = c.getTime();//杩欐槸鏄庡ぉ
+ Calendar c = Calendar.getInstance();
+ c.setTime(endDates);
+ c.add(Calendar.DAY_OF_MONTH, 1);
+ endDates = c.getTime();//杩欐槸鏄庡ぉ
endCalender.setTime(endDates);
} else {
endCalender.add(Calendar.MONTH, Integer.parseInt(paramInJson.getString("cycles")));
@@ -1053,6 +1070,11 @@
return;
}
+ //todo 濡傛灉鏄悓涓�澶╀笉鍒涘缓
+ if (DateUtil.getFormatTimeStringB(endTime).equals(reqJson.getString("customStartTime"))) {
+ return;
+ }
+
FeeDto feeInfo = (FeeDto) reqJson.get("feeInfo");
String payObjNameRemark = "鎴垮眿";
if (FeeDto.PAYER_OBJ_TYPE_CAR.equals(feeInfo.getPayerObjType())) {
@@ -1118,7 +1140,7 @@
tmpFeeAttrPos.add(tmpFeeAttrPo);
}
//todo 娌℃湁缁撴潫鏃堕棿鏃�
- if(!hasDeadLineTime){
+ if (!hasDeadLineTime) {
tmpFeeAttrPo = new FeeAttrPo();
tmpFeeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId, true));
tmpFeeAttrPo.setFeeId(tmpPayFeePo.getFeeId());
--
Gitblit v1.8.0