加入费用审核功能

java110-bean/src/main/java/com/java110/po/payFeeAudit/PayFeeAuditPo.java

@@ -1,65 +1,80 @@
 package com.java110.po.payFeeAudit;
 
 import java.io.Serializable;
-import java.util.Date;
 
 public class PayFeeAuditPo implements Serializable {
 
     private String auditId;
     private String auditUserId;
-private String auditUserName;
-private String feeDetailId;
-private String statusCd = "0";
-private String state;
-private String message;
-private String communityId;
-private String feeId;
-public String getAuditUserId() {
+    private String auditUserName;
+    private String feeDetailId;
+    private String statusCd = "0";
+    private String state;
+    private String message;
+    private String communityId;
+    private String feeId;
+
+    public String getAuditUserId() {
         return auditUserId;
     }
-public void setAuditUserId(String auditUserId) {
+
+    public void setAuditUserId(String auditUserId) {
         this.auditUserId = auditUserId;
     }
-public String getAuditUserName() {
+
+    public String getAuditUserName() {
         return auditUserName;
     }
-public void setAuditUserName(String auditUserName) {
+
+    public void setAuditUserName(String auditUserName) {
         this.auditUserName = auditUserName;
     }
-public String getFeeDetailId() {
+
+    public String getFeeDetailId() {
         return feeDetailId;
     }
-public void setFeeDetailId(String feeDetailId) {
+
+    public void setFeeDetailId(String feeDetailId) {
         this.feeDetailId = feeDetailId;
     }
-public String getStatusCd() {
+
+    public String getStatusCd() {
         return statusCd;
     }
-public void setStatusCd(String statusCd) {
+
+    public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
-public String getState() {
+
+    public String getState() {
         return state;
     }
-public void setState(String state) {
+
+    public void setState(String state) {
         this.state = state;
     }
-public String getMessage() {
+
+    public String getMessage() {
         return message;
     }
-public void setMessage(String message) {
+
+    public void setMessage(String message) {
         this.message = message;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getFeeId() {
+
+    public String getFeeId() {
         return feeId;
     }
-public void setFeeId(String feeId) {
+
+    public void setFeeId(String feeId) {
         this.feeId = feeId;
     }
 

service-fee/src/main/java/com/java110/fee/api/PayFeeAuditApi.java

@@ -11,11 +11,7 @@ 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.*;
 
 
 @RestController
@@ -41,16 +37,19 @@ public class PayFeeAuditApi {
      * @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,
+                                                  @RequestHeader(value="user-name")String userName) {
 
         Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
         Assert.hasKeyAndValue(reqJson, "feeId", "请求报文中未包含feeId");
-        Assert.hasKeyAndValue(reqJson, "auditUserId", "请求报文中未包含auditUserId");
-        Assert.hasKeyAndValue(reqJson, "auditUserName", "请求报文中未包含auditUserName");
+        Assert.hasKeyAndValue(reqJson, "feeDetailId", "请求报文中未包含缴费ID");
         Assert.hasKeyAndValue(reqJson, "state", "请求报文中未包含state");
 
 
         PayFeeAuditPo payFeeAuditPo = BeanConvertUtil.covertBean(reqJson, PayFeeAuditPo.class);
+        payFeeAuditPo.setAuditUserId(userId);
+        payFeeAuditPo.setAuditUserName(userName);
         return savePayFeeAuditBMOImpl.save(payFeeAuditPo);
     }