费用支持拆分 和合并功能

java110-bean/src/main/java/com/java110/dto/payFeeSub/PayFeeSubDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.payFeeSub;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,21 +16,25 @@ import java.util.Date;
 public class PayFeeSubDto extends PageDto implements Serializable {
 
     private String maxTime;
-private String amount;
-private String feeTypeCd;
-private String batchId;
-private String feeId;
-private String userId;
-private String preFeeId;
-private String payerObjName;
-private String incomeObjId;
-private String configId;
-private String feeFlag;
-private String startTime;
-private String endTime;
-private String communityId;
-private String payerObjType;
-private String payerObjId;
+    private String amount;
+    private String feeTypeCd;
+    private String batchId;
+    private String feeId;
+    private String userId;
+    private String preFeeId;
+    private String payerObjName;
+    private String incomeObjId;
+    private String configId;
+    private String feeFlag;
+    private String startTime;
+    private String endTime;
+    private String communityId;
+    private String payerObjType;
+    private String payerObjId;
+
+    private String pcFeeId;
+
+    private String feeName;
 
 
     private Date createTime;
@@ -40,97 +45,128 @@ private String payerObjId;
     public String getMaxTime() {
         return maxTime;
     }
-public void setMaxTime(String maxTime) {
+
+    public void setMaxTime(String maxTime) {
         this.maxTime = maxTime;
     }
-public String getAmount() {
+
+    public String getAmount() {
         return amount;
     }
-public void setAmount(String amount) {
+
+    public void setAmount(String amount) {
         this.amount = amount;
     }
-public String getFeeTypeCd() {
+
+    public String getFeeTypeCd() {
         return feeTypeCd;
     }
-public void setFeeTypeCd(String feeTypeCd) {
+
+    public void setFeeTypeCd(String feeTypeCd) {
         this.feeTypeCd = feeTypeCd;
     }
-public String getBatchId() {
+
+    public String getBatchId() {
         return batchId;
     }
-public void setBatchId(String batchId) {
+
+    public void setBatchId(String batchId) {
         this.batchId = batchId;
     }
-public String getFeeId() {
+
+    public String getFeeId() {
         return feeId;
     }
-public void setFeeId(String feeId) {
+
+    public void setFeeId(String feeId) {
         this.feeId = feeId;
     }
-public String getUserId() {
+
+    public String getUserId() {
         return userId;
     }
-public void setUserId(String userId) {
+
+    public void setUserId(String userId) {
         this.userId = userId;
     }
-public String getPreFeeId() {
+
+    public String getPreFeeId() {
         return preFeeId;
     }
-public void setPreFeeId(String preFeeId) {
+
+    public void setPreFeeId(String preFeeId) {
         this.preFeeId = preFeeId;
     }
-public String getPayerObjName() {
+
+    public String getPayerObjName() {
         return payerObjName;
     }
-public void setPayerObjName(String payerObjName) {
+
+    public void setPayerObjName(String payerObjName) {
         this.payerObjName = payerObjName;
     }
-public String getIncomeObjId() {
+
+    public String getIncomeObjId() {
         return incomeObjId;
     }
-public void setIncomeObjId(String incomeObjId) {
+
+    public void setIncomeObjId(String incomeObjId) {
         this.incomeObjId = incomeObjId;
     }
-public String getConfigId() {
+
+    public String getConfigId() {
         return configId;
     }
-public void setConfigId(String configId) {
+
+    public void setConfigId(String configId) {
         this.configId = configId;
     }
-public String getFeeFlag() {
+
+    public String getFeeFlag() {
         return feeFlag;
     }
-public void setFeeFlag(String feeFlag) {
+
+    public void setFeeFlag(String feeFlag) {
         this.feeFlag = feeFlag;
     }
-public String getStartTime() {
+
+    public String getStartTime() {
         return startTime;
     }
-public void setStartTime(String startTime) {
+
+    public void setStartTime(String startTime) {
         this.startTime = startTime;
     }
-public String getEndTime() {
+
+    public String getEndTime() {
         return endTime;
     }
-public void setEndTime(String endTime) {
+
+    public void setEndTime(String endTime) {
         this.endTime = endTime;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getPayerObjType() {
+
+    public String getPayerObjType() {
         return payerObjType;
     }
-public void setPayerObjType(String payerObjType) {
+
+    public void setPayerObjType(String payerObjType) {
         this.payerObjType = payerObjType;
     }
-public String getPayerObjId() {
+
+    public String getPayerObjId() {
         return payerObjId;
     }
-public void setPayerObjId(String payerObjId) {
+
+    public void setPayerObjId(String payerObjId) {
         this.payerObjId = payerObjId;
     }
 
@@ -150,4 +186,20 @@ public void setPayerObjId(String payerObjId) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getPcFeeId() {
+        return pcFeeId;
+    }
+
+    public void setPcFeeId(String pcFeeId) {
+        this.pcFeeId = pcFeeId;
+    }
+
+    public String getFeeName() {
+        return feeName;
+    }
+
+    public void setFeeName(String feeName) {
+        this.feeName = feeName;
+    }
 }

java110-db/src/main/resources/mapper/fee/PayFeeSubV1ServiceDaoImplMapper.xml

@@ -22,8 +22,9 @@
         userId,t.pre_fee_id,t.pre_fee_id preFeeId,t.payer_obj_name,t.payer_obj_name
         payerObjName,t.income_obj_id,t.income_obj_id incomeObjId,t.config_id,t.config_id configId,t.fee_flag,t.fee_flag
         feeFlag,t.start_time,t.start_time startTime,t.end_time,t.end_time endTime,t.community_id,t.community_id
-        communityId,t.payer_obj_type,t.payer_obj_type payerObjType,t.payer_obj_id,t.payer_obj_id payerObjId
+        communityId,t.payer_obj_type,t.payer_obj_type payerObjType,t.payer_obj_id,t.payer_obj_id payerObjId,pfc.fee_name feeName
         from pay_fee_sub t
+        left join pay_fee_config pfc on t.config_id = pfc.config_id
         where 1 =1
         <if test="maxTime !=null and maxTime != ''">
             and t.max_time= #{maxTime}
@@ -43,6 +44,10 @@
         <if test="feeId !=null and feeId != ''">
             and t.fee_id= #{feeId}
         </if>
+        <if test="pcFeeId !=null and pcFeeId != ''">
+            and (t.fee_id = #{pcFeeId} or t.pre_fee_id = #{pcFeeId})
+        </if>
+
         <if test="userId !=null and userId != ''">
             and t.user_id= #{userId}
         </if>
@@ -166,6 +171,9 @@
         <if test="feeId !=null and feeId != ''">
             and t.fee_id= #{feeId}
         </if>
+        <if test="pcFeeId !=null and pcFeeId != ''">
+            and (t.fee_id = #{pcFeeId} or t.pre_fee_id = #{pcFeeId})
+        </if>
         <if test="userId !=null and userId != ''">
             and t.user_id= #{userId}
         </if>

service-fee/src/main/java/com/java110/fee/cmd/feeSub/ListPayFeeSubCmd.java

@@ -56,7 +56,6 @@ public class ListPayFeeSubCmd extends Cmd {
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         super.validatePageInfo(reqJson);
         Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
-        Assert.hasKeyAndValue(reqJson, "preFeeId", "preFeeId不能为空");
 
     }
 

service-fee/src/main/java/com/java110/fee/cmd/feeSub/SplitPayFeeCmd.java

@@ -110,7 +110,7 @@ public class SplitPayFeeCmd extends Cmd {
             throw new CmdException("费用错误未包含最大结束时间");
         }
 
-        Date splitTime = DateUtil.getDateFromStringA(reqJson.getString("splitTime"));
+        Date splitTime = DateUtil.getDateFromStringB(reqJson.getString("splitTime"));
         if (splitTime.before(endTime)) {
             throw new CmdException("拆分时间错误，应大于计费起始时间");
         }