From deaac9ebe189b9739197d59440f04bd7b8a6cabd Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 26 七月 2023 09:55:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-fee/src/main/java/com/java110/fee/cmd/returnPayFee/SaveReturnPayFeeCmd.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/cmd/returnPayFee/SaveReturnPayFeeCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/returnPayFee/SaveReturnPayFeeCmd.java
index ff36395..3934aa8 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/returnPayFee/SaveReturnPayFeeCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/returnPayFee/SaveReturnPayFeeCmd.java
@@ -113,6 +113,11 @@
Assert.listOnlyOne(feeDtos, "涓嶅瓨鍦ㄨ璐圭敤");
+ FeeDetailDto feeDetailDto = new FeeDetailDto();
+ feeDetailDto.setDetailId(reqJson.getString("detailId"));
+ List<FeeDetailDto> feeDetailDtos = feeDetailInnerServiceSMOImpl.queryFeeDetails(feeDetailDto);
+ Assert.listOnlyOne(feeDetailDtos, "鏈壘鍒伴渶瑕佷慨鏀圭殑娲诲姩 鎴栧鏉℃暟鎹�");
+
reqJson.put("configId", feeDtos.get(0).getConfigId());
reqJson.put("feeTypeCd", feeDtos.get(0).getFeeTypeCd());
@@ -122,7 +127,9 @@
returnPayFeePo.setCycles((reqJson.getDouble("cycles") * -1) + "");
returnPayFeePo.setReceivableAmount((reqJson.getDouble("receivableAmount") * -1) + "");
returnPayFeePo.setReceivedAmount((reqJson.getDouble("receivedAmount") * -1) + "");
- returnPayFeePo.setPrimeRate("7"); //閫�璐归粯璁ゆ柟寮忎负杞处
+ //todo 杩欓噷涓嶇煡閬撲负鍟ュ啓姝讳负 杞处锛岀墿涓氫氦璐规槸鐜伴噾 閫�璐逛负杞处鏃� 鐗╀笟璇В锛屾墍浠ユ殏鏃跺睆钄�,濡傛灉閫�娆句篃闇�瑕� 鏀粯鏂瑰紡 寤鸿閫�娆鹃〉闈㈣ˉ鍏�
+ //returnPayFeePo.setPrimeRate("7"); //閫�璐归粯璁ゆ柟寮忎负杞处
+ returnPayFeePo.setPrimeRate(feeDetailDtos.get(0).getPrimeRate());
returnPayFeePo.setApplyPersonId(userId);
returnPayFeePo.setApplyPersonName(userDtos.get(0).getName());
int flag = returnPayFeeV1InnerServiceSMOImpl.saveReturnPayFee(returnPayFeePo);
@@ -132,10 +139,7 @@
}
reqJson.put("state", "1000");
- FeeDetailDto feeDetailDto = new FeeDetailDto();
- feeDetailDto.setDetailId(reqJson.getString("detailId"));
- List<FeeDetailDto> feeDetailDtos = feeDetailInnerServiceSMOImpl.queryFeeDetails(feeDetailDto);
- Assert.listOnlyOne(feeDetailDtos, "鏈壘鍒伴渶瑕佷慨鏀圭殑娲诲姩 鎴栧鏉℃暟鎹�");
+
JSONObject businessReturnPayFee = new JSONObject();
businessReturnPayFee.putAll(BeanConvertUtil.beanCovertMap(feeDetailDtos.get(0)));
--
Gitblit v1.8.0