优化代码

java110 · Sep 30, 2020 · 36e9739 · 36e9739
1 parent 6a3fc65
commit 36e9739
Show file tree

Hide file tree

Showing 14 changed files with 498 additions and 79 deletions.
diff --git a/java110-bean/src/main/java/com/java110/dto/order/BusinessDto.java b/java110-bean/src/main/java/com/java110/dto/order/BusinessDto.java
@@ -12,6 +12,7 @@ public class BusinessDto  extends PageDto implements Serializable {
     private String oId;
 
     private String bId;
+    private String[] bIds;
 
     private String businessTypeCd;
 
@@ -59,4 +60,12 @@ public String getStatusCd() {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String[] getbIds() {
+        return bIds;
+    }
+
+    public void setbIds(String[] bIds) {
+        this.bIds = bIds;
+    }
 }
diff --git a/java110-bean/src/main/java/com/java110/dto/order/OrderDto.java b/java110-bean/src/main/java/com/java110/dto/order/OrderDto.java
@@ -17,6 +17,7 @@ public class OrderDto extends PageDto implements Serializable {
     private String appId;
     private String extTransactionId;
     private String userId;
+    private String userName;
     private String requestTime;
     private String orderTypeCd;
     private String finishTime;
@@ -32,6 +33,7 @@ public class OrderDto extends PageDto implements Serializable {
     private String[] businessTypeCds;
 
 
+
     public String getoId() {
         return oId;
     }
@@ -127,4 +129,12 @@ public String getStatusCd() {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
 }
diff --git a/java110-bean/src/main/java/com/java110/dto/owner/OwnerCarDto.java b/java110-bean/src/main/java/com/java110/dto/owner/OwnerCarDto.java
@@ -32,6 +32,7 @@ public class OwnerCarDto extends PageDto implements Serializable {
     private String ownerId;
     private String userId;
     private String carId;
+    private String[] carIds;
     private boolean withOwner =false;
     private String ownerName;
     private String idCard;
@@ -272,4 +273,12 @@ public String getbId() {
     public void setbId(String bId) {
         this.bId = bId;
     }
+
+    public String[] getCarIds() {
+        return carIds;
+    }
+
+    public void setCarIds(String[] carIds) {
+        this.carIds = carIds;
+    }
 }
diff --git a/java110-bean/src/main/java/com/java110/dto/payFeeAudit/PayFeeAuditDto.java b/java110-bean/src/main/java/com/java110/dto/payFeeAudit/PayFeeAuditDto.java
@@ -1,6 +1,7 @@
 package com.java110.dto.payFeeAudit;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,12 +16,26 @@
 public class PayFeeAuditDto extends PageDto implements Serializable {
 
     private String auditUserId;
-private String auditUserName;
-private String feeDetailId;
-private String state;
-private String message;
-private String communityId;
-private String feeId;
+    private String auditUserName;
+    private String feeDetailId;
+    private String state;
+    private String message;
+    private String communityId;
+    private String feeId;
+    private String payerObjId;
+    private String payerObjName;
+    private String payerObjType;
+    private String feeName;
+    private String cycles;
+    private String startTime;
+    private String endTime;
+    private String receivableAmount;
+    private String receivedAmount;
+    private String remark;
+    private String userId;
+    private String userName;
+    private String bId;
+
 
 
     private Date createTime;
@@ -31,43 +46,56 @@ public class PayFeeAuditDto extends PageDto implements Serializable {
     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 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;
     }
 
@@ -87,4 +115,108 @@ public String getStatusCd() {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getPayerObjId() {
+        return payerObjId;
+    }
+
+    public void setPayerObjId(String payerObjId) {
+        this.payerObjId = payerObjId;
+    }
+
+    public String getPayerObjType() {
+        return payerObjType;
+    }
+
+    public void setPayerObjType(String payerObjType) {
+        this.payerObjType = payerObjType;
+    }
+
+    public String getFeeName() {
+        return feeName;
+    }
+
+    public void setFeeName(String feeName) {
+        this.feeName = feeName;
+    }
+
+    public String getCycles() {
+        return cycles;
+    }
+
+    public void setCycles(String cycles) {
+        this.cycles = cycles;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getReceivableAmount() {
+        return receivableAmount;
+    }
+
+    public void setReceivableAmount(String receivableAmount) {
+        this.receivableAmount = receivableAmount;
+    }
+
+    public String getReceivedAmount() {
+        return receivedAmount;
+    }
+
+    public void setReceivedAmount(String receivedAmount) {
+        this.receivedAmount = receivedAmount;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getPayerObjName() {
+        return payerObjName;
+    }
+
+    public void setPayerObjName(String payerObjName) {
+        this.payerObjName = payerObjName;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getbId() {
+        return bId;
+    }
+
+    public void setbId(String bId) {
+        this.bId = bId;
+    }
 }
diff --git a/java110-core/src/main/java/com/java110/core/smo/IComputeFeeSMO.java b/java110-core/src/main/java/com/java110/core/smo/IComputeFeeSMO.java
@@ -4,6 +4,7 @@
 import com.java110.po.feeReceiptDetail.FeeReceiptDetailPo;
 
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -55,6 +56,12 @@ public interface IComputeFeeSMO {
      */
     public String getFeeObjName(FeeDto feeDto);
 
+    /**
+     * 刷入 付费方名称
+     * @param feeDtos
+     */
+    public void freshFeeObjName(List<FeeDto> feeDtos);
+
     /**
      * 根据缴费周期计算 结束时间
      *