From 4ce807bb99088dc6f41262046830fc872e772be4 Mon Sep 17 00:00:00 2001
From: cgf <2156125618@qq.com>
Date: 星期二, 02 九月 2025 14:23:33 +0800
Subject: [PATCH] 折扣已完成现有需求2025/08/09
---
service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java | 22 ++++++++++++++++------
1 files changed, 16 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 56859f2..d9ee08f 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
@@ -46,6 +46,7 @@
import com.java110.vo.ResultVo;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
import java.math.BigDecimal;
import java.text.ParseException;
@@ -136,6 +137,15 @@
Assert.hasLength(reqJson.getString("cycles"), "鍛ㄦ湡涓嶈兘涓虹┖");
Assert.hasLength(reqJson.getString("receivedAmount"), "瀹炴敹閲戦涓嶈兘涓虹┖");
Assert.hasLength(reqJson.getString("feeId"), "璐圭敤ID涓嶈兘涓虹┖");
+
+ //褰撴敮浠樻柟寮忎负杞处鏃讹紝闇�瑕佹牎楠岃浆璐︿汉鏄惁涓虹┖
+ String primeRate = reqJson.getString("primeRate");
+ if(!StringUtils.isEmpty(primeRate) && primeRate.equals("7")){
+ String transferorName = reqJson.getString("transferorName");
+ if(StringUtils.isEmpty(transferorName)){
+ Assert.hasLength(reqJson.getString("transferorName"), "鏀粯鏂瑰紡涓鸿浆璐︽椂锛岃浆璐︿汉涓嶈兘涓虹┖");
+ }
+ }
//鍒ゆ柇鏄惁 璐圭敤鐘舵�佷负缂磋垂缁撴潫
FeeDto feeDto = new FeeDto();
feeDto.setFeeId(reqJson.getString("feeId"));
@@ -707,17 +717,17 @@
return;
}
// todo 鑷繁鏄棿鎺ユ�ц垂鐢�
- if (FeeDto.FEE_FLAG_CYCLE.equals(feeConfigDto.getFeeFlag())) {
+ if (FeeDto.FEE_FLAG_CYCLE_ONCE.equals(feeConfigDto.getFeeFlag())) {
return;
}
FeeConfigDto tmpFeeConfigDto = new FeeConfigDto();
tmpFeeConfigDto.setFeeNameEq(feeConfigDto.getFeeName() + "娆犺垂");
- tmpFeeConfigDto.setFeeFlag(FeeDto.FEE_FLAG_CYCLE);
+ 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() + "涓�鑷�");
}
@@ -770,7 +780,7 @@
}
int flag = payFeeDetailNewV1InnerServiceSMOImpl.savePayFeeDetailNew(tmpPayFeeDetailPo);
-
+ //3
if (flag < 1) {
throw new CmdException("鐢熸垚娆犺垂澶辫触");
}
@@ -841,14 +851,14 @@
feeConfigDto.setCommunityId(feeInfo.getCommunityId());
List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
Assert.listOnlyOne(feeConfigDtos, "璐圭敤椤逛笉瀛樺湪");
- if (FeeDto.FEE_FLAG_CYCLE.equals(feeConfigDtos.get(0).getFeeFlag())) {
+ if (FeeDto.FEE_FLAG_CYCLE_ONCE.equals(feeConfigDtos.get(0).getFeeFlag())) {
return;
}
FeeConfigDto tmpFeeConfigDto = new FeeConfigDto();
tmpFeeConfigDto.setFeeNameEq(feeConfigDtos.get(0).getFeeName() + "娆犺垂");
- tmpFeeConfigDto.setFeeFlag(FeeDto.FEE_FLAG_CYCLE);
+ tmpFeeConfigDto.setFeeFlag(FeeDto.FEE_FLAG_CYCLE_ONCE);
tmpFeeConfigDto.setComputingFormula(feeConfigDto.getComputingFormula());
//todo 鏍￠獙鐨勬椂鍊欐牎楠岃繃浜� 鎵�浠ヨ繖閲屼笉鍙兘涓虹┖
feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(tmpFeeConfigDto);
--
Gitblit v1.8.0