From 8954429263a75e3c7d19db20a60370fca005f2bd Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 08 八月 2023 15:44:49 +0800
Subject: [PATCH] 优化代码
---
service-fee/src/main/java/com/java110/fee/api/PayFeeAuditApi.java | 42 +++++++++++++++++++++++++++++++-----------
1 files changed, 31 insertions(+), 11 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 50aeb8e..df0bb5d
--- a/service-fee/src/main/java/com/java110/fee/api/PayFeeAuditApi.java
+++ b/service-fee/src/main/java/com/java110/fee/api/PayFeeAuditApi.java
@@ -1,21 +1,21 @@
package com.java110.fee.api;
import com.alibaba.fastjson.JSONObject;
-import com.java110.dto.payFeeAudit.PayFeeAuditDto;
+import com.java110.dto.payFee.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.po.payFeeAudit.PayFeeAuditPo;
+import com.java110.intf.user.IUserV1InnerServiceSMO;
+import com.java110.po.payFee.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.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
@RestController
@@ -32,6 +32,9 @@
@Autowired
private IGetPayFeeAuditBMO getPayFeeAuditBMOImpl;
+ @Autowired
+ private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
+
/**
* 寰俊淇濆瓨娑堟伅妯℃澘
*
@@ -41,16 +44,26 @@
* @path /app/payFeeAudit/savePayFeeAudit
*/
@RequestMapping(value = "/savePayFeeAudit", method = RequestMethod.POST)
- public ResponseEntity<String> savePayFeeAudit(@RequestBody JSONObject reqJson) {
+ public ResponseEntity<String> savePayFeeAudit(@RequestBody JSONObject reqJson,
+ @RequestHeader(value = "user-id") String userId){
+
Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
- Assert.hasKeyAndValue(reqJson, "feeId", "璇锋眰鎶ユ枃涓湭鍖呭惈feeId");
- Assert.hasKeyAndValue(reqJson, "auditUserId", "璇锋眰鎶ユ枃涓湭鍖呭惈auditUserId");
- Assert.hasKeyAndValue(reqJson, "auditUserName", "璇锋眰鎶ユ枃涓湭鍖呭惈auditUserName");
+ //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);
+ payFeeAuditPo.setAuditUserName(userName);
return savePayFeeAuditBMOImpl.save(payFeeAuditPo);
}
@@ -106,12 +119,19 @@
*/
@RequestMapping(value = "/queryPayFeeAudit", method = RequestMethod.GET)
public ResponseEntity<String> queryPayFeeAudit(@RequestParam(value = "communityId") String communityId,
+ @RequestParam(value = "payObjType", required = false) String payObjType,
+ @RequestParam(value = "payerObjId", required = false) String payerObjId,
+ @RequestParam(value = "state", required = false) String state,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
+
PayFeeAuditDto payFeeAuditDto = new PayFeeAuditDto();
payFeeAuditDto.setPage(page);
payFeeAuditDto.setRow(row);
payFeeAuditDto.setCommunityId(communityId);
+ payFeeAuditDto.setState(state);
+ payFeeAuditDto.setPayerObjType(payObjType);
+ payFeeAuditDto.setPayerObjId(payerObjId);
return getPayFeeAuditBMOImpl.get(payFeeAuditDto);
}
}
--
Gitblit v1.8.0