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 | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 fd1b41b..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
@@ -185,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());
@@ -238,7 +244,7 @@
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);
+ CommonCache.setValue(payFeeDetailPo.getDetailId() + CommonCache.RECEIPT_CODE, receiptCode, CommonCache.DEFAULT_EXPIRETIME_TWO_MIN);
//todo 鍒ゆ柇鏄惁鏈夎禒閫佽鍒�
hasDiscount(paramObj, payFeePo, payFeeDetailPo);
@@ -1064,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())) {
@@ -1129,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