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/PayOweFeeCmd.java | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 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 fe3873a..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
@@ -121,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);
}
}
@@ -340,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);
@@ -387,7 +398,7 @@
payFeeDetailPo.setCashierId(userDto.getUserId());
payFeeDetailPo.setCashierName(userDto.getName());
//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);
int flag = payFeeDetailV1InnerServiceSMOImpl.savePayFeeDetailNew(payFeeDetailPo);
if (flag < 1) {
--
Gitblit v1.8.0