From 0fea532b07be89978343cb4aede3693af99f5656 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 25 七月 2023 23:04:41 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-fee/src/main/java/com/java110/fee/cmd/fee/PayOweFeeCmd.java | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/cmd/fee/PayOweFeeCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/fee/PayOweFeeCmd.java
index c055cdc..47a5e82 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/fee/PayOweFeeCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/fee/PayOweFeeCmd.java
@@ -35,6 +35,7 @@
import com.java110.po.fee.FeeReceiptDetailPo;
import com.java110.po.owner.RepairPoolPo;
import com.java110.po.owner.RepairUserPo;
+import com.java110.utils.cache.CommonCache;
import com.java110.utils.constant.ResponseConstant;
import com.java110.utils.exception.CmdException;
import com.java110.utils.exception.ListenerExecuteException;
@@ -120,6 +121,24 @@
Assert.hasKeyAndValue(feeObject, "startTime", "鏈寘鍚紑濮嬫椂闂�");
Assert.hasKeyAndValue(feeObject, "endTime", "鏈寘鍚粨鏉熸椂闂�");
Assert.hasKeyAndValue(feeObject, "receivedAmount", "鏈寘鍚疄鏀堕噾棰�");
+
+ //璁＄畻 搴旀敹閲戦
+ FeeDto feeDto = new FeeDto();
+ feeDto.setFeeId(feeObject.getString("feeId"));
+ feeDto.setCommunityId(feeObject.getString("communityId"));
+ Date pageEndTime = null;
+ List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
+ if (feeDtos == null || feeDtos.size() != 1) {
+ throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "鏌ヨ璐圭敤淇℃伅澶辫触锛屾湭鏌ュ埌鏁版嵁鎴栨煡鍒板鏉℃暟鎹�");
+ }
+ feeDto = feeDtos.get(0);
+
+ pageEndTime = DateUtil.getDateFromStringB(feeObject.getString("endTime"));
+ if (pageEndTime.getTime() <= feeDto.getEndTime().getTime()) {
+ throw new IllegalArgumentException("鍙兘瀛樺湪閲嶅缂磋垂锛岃鍒锋柊椤甸潰閲嶆柊缂磋垂");
+ }
+
+ feeObject.put("feeDto", feeDto);
}
}
@@ -339,18 +358,11 @@
businessFeeDetail.putAll(paramInJson);
businessFeeDetail.put("detailId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
businessFeeDetail.put("primeRate", paramInJson.getString("primeRate"));
- //璁＄畻 搴旀敹閲戦
- FeeDto feeDto = new FeeDto();
- feeDto.setFeeId(paramInJson.getString("feeId"));
- feeDto.setCommunityId(paramInJson.getString("communityId"));
- List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
- if (feeDtos == null || feeDtos.size() != 1) {
- throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "鏌ヨ璐圭敤淇℃伅澶辫触锛屾湭鏌ュ埌鏁版嵁鎴栨煡鍒板鏉℃暟鎹�");
- }
+ FeeDto feeDto = (FeeDto) paramInJson.get("feeDto");
if (!businessFeeDetail.containsKey("state") || StringUtil.isEmpty(businessFeeDetail.getString("state"))) {
businessFeeDetail.put("state", "1400");
}
- feeDto = feeDtos.get(0);
+
businessFeeDetail.put("startTime", paramInJson.getString("startTime"));
BigDecimal cycles = null;
Map feePriceAll = computeFeeSMOImpl.getFeePrice(feeDto);
@@ -385,8 +397,8 @@
}
payFeeDetailPo.setCashierId(userDto.getUserId());
payFeeDetailPo.setCashierName(userDto.getName());
- payFeeDetailPo.setReceiptCode(receiptCode);
-
+ //todo 缂撳瓨鏀舵嵁缂栧彿
+ CommonCache.setValue(payFeeDetailPo.getDetailId() + CommonCache.RECEIPT_CODE, receiptCode, CommonCache.DEFAULT_EXPIRETIME_TWO_MIN);
int flag = payFeeDetailV1InnerServiceSMOImpl.savePayFeeDetailNew(payFeeDetailPo);
if (flag < 1) {
--
Gitblit v1.8.0