From 6e27c1e9455efde6ff85facdf977147953eabd93 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 02 二月 2023 16:22:19 +0800
Subject: [PATCH] optimize batch import history fee bug
---
service-fee/src/main/java/com/java110/fee/api/PayFeeAuditApi.java | 25 +++++++++++++++++++++++--
1 files changed, 23 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 0ddce74..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);
@@ -105,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