From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +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 | 25 ++++++++++++++++++++-----
1 files changed, 20 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 5990d5f..ff36395 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
@@ -24,13 +24,15 @@
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.payFee.ReturnPayFeeDto;
+import com.java110.dto.user.UserDto;
import com.java110.intf.fee.IFeeDetailInnerServiceSMO;
import com.java110.intf.fee.IFeeInnerServiceSMO;
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.po.payFee.ReturnPayFeePo;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -71,6 +73,9 @@
@Autowired
private IFeeDetailInnerServiceSMO feeDetailInnerServiceSMOImpl;
+ @Autowired
+ private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
//Assert.hasKeyAndValue(reqJson, "configId", "璇锋眰鎶ユ枃涓湭鍖呭惈configId");
@@ -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"));
@@ -106,10 +119,12 @@
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.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