From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-fee/src/main/java/com/java110/fee/api/PayFeeAuditApi.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/api/PayFeeAuditApi.java b/service-fee/src/main/java/com/java110/fee/api/PayFeeAuditApi.java
old mode 100644
new mode 100755
index c80eab0..ed55852
--- a/service-fee/src/main/java/com/java110/fee/api/PayFeeAuditApi.java
+++ b/service-fee/src/main/java/com/java110/fee/api/PayFeeAuditApi.java
@@ -2,16 +2,20 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.dto.payFeeAudit.PayFeeAuditDto;
+import com.java110.dto.user.UserDto;
import com.java110.fee.bmo.payFeeAudit.IDeletePayFeeAuditBMO;
import com.java110.fee.bmo.payFeeAudit.IGetPayFeeAuditBMO;
import com.java110.fee.bmo.payFeeAudit.ISavePayFeeAuditBMO;
import com.java110.fee.bmo.payFeeAudit.IUpdatePayFeeAuditBMO;
+import com.java110.intf.user.IUserV1InnerServiceSMO;
import com.java110.po.payFeeAudit.PayFeeAuditPo;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
@RestController
@@ -28,6 +32,9 @@
@Autowired
private IGetPayFeeAuditBMO getPayFeeAuditBMOImpl;
+ @Autowired
+ private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
+
/**
* 寰俊淇濆瓨娑堟伅妯℃澘
*
@@ -38,14 +45,21 @@
*/
@RequestMapping(value = "/savePayFeeAudit", method = RequestMethod.POST)
public ResponseEntity<String> savePayFeeAudit(@RequestBody JSONObject reqJson,
- @RequestHeader(value = "user-id") String userId,
- @RequestHeader(value = "user-name") String userName) {
+ @RequestHeader(value = "user-id") String userId){
+
Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
Assert.hasKeyAndValue(reqJson, "feeId", "璇锋眰鎶ユ枃涓湭鍖呭惈feeId");
Assert.hasKeyAndValue(reqJson, "feeDetailId", "璇锋眰鎶ユ枃涓湭鍖呭惈缂磋垂ID");
Assert.hasKeyAndValue(reqJson, "state", "璇锋眰鎶ユ枃涓湭鍖呭惈state");
+ UserDto userDto = new UserDto();
+ userDto.setUserId(userId);
+ List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
+ Assert.listOnlyOne(userDtos,"鏈寘鍚敤鎴�");
+
+
+ String userName = userDtos.get(0).getName();
PayFeeAuditPo payFeeAuditPo = BeanConvertUtil.covertBean(reqJson, PayFeeAuditPo.class);
payFeeAuditPo.setAuditUserId(userId);
--
Gitblit v1.8.0