From e46395d507a9eb1d4534c61184b4d60dbd75f888 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 18 五月 2023 18:28:27 +0800
Subject: [PATCH] optimize

---
 service-fee/src/main/java/com/java110/fee/cmd/returnPayFee/SaveReturnPayFeeCmd.java |   30 +++++++++++++++++++++++-------
 1 files changed, 23 insertions(+), 7 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 6b88ecd..db5aafe 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
@@ -19,16 +19,18 @@
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.event.cmd.AbstractServiceCmdListener;
+import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.dto.fee.FeeDetailDto;
 import com.java110.dto.fee.FeeDto;
 import com.java110.dto.returnPayFee.ReturnPayFeeDto;
+import com.java110.dto.user.UserDto;
 import com.java110.intf.fee.IFeeDetailInnerServiceSMO;
 import com.java110.intf.fee.IFeeInnerServiceSMO;
-import com.java110.intf.fee.IPayFeeDetailNewV1InnerServiceSMO;
+import com.java110.intf.fee.IPayFeeDetailV1InnerServiceSMO;
 import com.java110.intf.fee.IReturnPayFeeV1InnerServiceSMO;
+import com.java110.intf.user.IUserV1InnerServiceSMO;
 import com.java110.po.fee.PayFeeDetailPo;
 import com.java110.po.returnPayFee.ReturnPayFeePo;
 import com.java110.utils.exception.CmdException;
@@ -52,7 +54,7 @@
  * // modify by 寮犱笁 at 2021-09-12 绗�10琛屽湪鏌愮鍦烘櫙涓嬪瓨鍦ㄦ煇绉峛ug 闇�瑕佷慨澶嶏紝娉ㄩ噴10鑷�20琛� 鍔犲叆 20琛岃嚦30琛�
  */
 @Java110Cmd(serviceCode = "returnPayFee.saveReturnPayFee")
-public class SaveReturnPayFeeCmd extends AbstractServiceCmdListener {
+public class SaveReturnPayFeeCmd extends Cmd {
 
     private static Logger logger = LoggerFactory.getLogger(SaveReturnPayFeeCmd.class);
 
@@ -65,11 +67,14 @@
     private IFeeInnerServiceSMO feeInnerServiceSMOImpl;
 
     @Autowired
-    private IPayFeeDetailNewV1InnerServiceSMO payFeeDetailNewV1InnerServiceSMOImpl;
+    private IPayFeeDetailV1InnerServiceSMO payFeeDetailNewV1InnerServiceSMOImpl;
 
 
     @Autowired
     private IFeeDetailInnerServiceSMO feeDetailInnerServiceSMOImpl;
+
+    @Autowired
+    private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
 
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
@@ -92,6 +97,14 @@
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
+        String userId = cmdDataFlowContext.getReqHeaders().get("user-id");
+
+        UserDto userDto = new UserDto();
+        userDto.setUserId(userId);
+        List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
+
+        Assert.listOnlyOne(userDtos, "鐢ㄦ埛涓嶅瓨鍦�");
+
         FeeDto feeDto = new FeeDto();
         feeDto.setCommunityId(reqJson.getString("communityId"));
         feeDto.setFeeId(reqJson.getString("feeId"));
@@ -102,13 +115,16 @@
 
         reqJson.put("configId", feeDtos.get(0).getConfigId());
         reqJson.put("feeTypeCd", feeDtos.get(0).getFeeTypeCd());
-        reqJson.put("cycles",(reqJson.getDouble("cycles") * -1)+"");
-        reqJson.put("receivableAmount",(reqJson.getDouble("receivableAmount") * -1)+"");
-        reqJson.put("receivedAmount",(reqJson.getDouble("receivedAmount") * -1)+"");
 
         ReturnPayFeePo returnPayFeePo = BeanConvertUtil.covertBean(reqJson, ReturnPayFeePo.class);
         returnPayFeePo.setReturnFeeId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
         returnPayFeePo.setState(ReturnPayFeeDto.STATE_WAIT);
+        returnPayFeePo.setCycles((reqJson.getDouble("cycles") * -1) + "");
+        returnPayFeePo.setReceivableAmount((reqJson.getDouble("receivableAmount") * -1) + "");
+        returnPayFeePo.setReceivedAmount((reqJson.getDouble("receivedAmount") * -1) + "");
+        returnPayFeePo.setPrimeRate("7"); //閫�璐归粯璁ゆ柟寮忎负杞处
+        returnPayFeePo.setApplyPersonId(userId);
+        returnPayFeePo.setApplyPersonName(userDtos.get(0).getName());
         int flag = returnPayFeeV1InnerServiceSMOImpl.saveReturnPayFee(returnPayFeePo);
 
         if (flag < 1) {

--
Gitblit v1.8.0