优化代码

java110-bean/src/main/java/com/java110/po/payFeeRuleBill/PayFeeRuleBillPo.java

@@ -17,6 +17,7 @@ package com.java110.po.payFeeRuleBill;
 
 import java.io.Serializable;
 import java.util.Date;
+
 /**
  * 类表述： Po 数据模型实体对象 基本保持与数据库模型一直 用于 增加修改删除 等时的数据载体
  * add by 吴学文 at 2023-10-23 16:59:08 mail: 928255095@qq.com
@@ -28,76 +29,95 @@ import java.util.Date;
 public class PayFeeRuleBillPo implements Serializable {
 
     private String billName;
-private String configId;
-private String billId;
-private String curYearMonth;
-private String statusCd = "0";
-private String remark;
-private String ruleId;
-private String communityId;
-private String batchId;
-private String feeId;
-public String getBillName() {
+    private String configId;
+    private String billId;
+    private String curYearMonth;
+    private String statusCd = "0";
+    private String remark;
+    private String ruleId;
+    private String communityId;
+    private String batchId;
+    private String feeId;
+
+    public String getBillName() {
         return billName;
     }
-public void setBillName(String billName) {
+
+    public void setBillName(String billName) {
         this.billName = billName;
     }
-public String getConfigId() {
+
+    public String getConfigId() {
         return configId;
     }
-public void setConfigId(String configId) {
+
+    public void setConfigId(String configId) {
         this.configId = configId;
     }
-public String getBillId() {
+
+    public String getBillId() {
         return billId;
     }
-public void setBillId(String billId) {
+
+    public void setBillId(String billId) {
         this.billId = billId;
     }
-public String getCurYearMonth() {
+
+    public String getCurYearMonth() {
         return curYearMonth;
     }
-public void setCurYearMonth(String curYearMonth) {
+
+    public void setCurYearMonth(String curYearMonth) {
         this.curYearMonth = curYearMonth;
     }
-public String getStatusCd() {
+
+    public String getStatusCd() {
         return statusCd;
     }
-public void setStatusCd(String statusCd) {
+
+    public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getRuleId() {
+
+    public String getRuleId() {
         return ruleId;
     }
-public void setRuleId(String ruleId) {
+
+    public void setRuleId(String ruleId) {
         this.ruleId = ruleId;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-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;
     }
 
 
-
 }

service-fee/src/main/java/com/java110/fee/bill/CycleConvertOnceFeeImpl.java

@@ -14,6 +14,7 @@ import com.java110.intf.fee.*;
 import com.java110.po.fee.FeeAttrPo;
 import com.java110.po.fee.PayFeePo;
 import com.java110.po.payFeeRule.PayFeeRulePo;
+import com.java110.po.payFeeRuleBill.PayFeeRuleBillPo;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.DateUtil;
@@ -58,6 +59,9 @@ public class CycleConvertOnceFeeImpl implements ICycleConvertOnceFee {
     @Autowired
     private IComputeFeeSMO computeFeeSMOImpl;
 
+    @Autowired
+    private IPayFeeRuleBillV1InnerServiceSMO payFeeRuleBillV1InnerServiceSMOImpl;
+
     @Override
     public int convertPayFees(List<PayFeePo> payFeePos) {
 
@@ -154,6 +158,7 @@ public class CycleConvertOnceFeeImpl implements ICycleConvertOnceFee {
 
     /**
      * 规则生成费用
+     *
      * @param tmpPayFeeRulePo
      */
     public int ruleGeneratePayFee(PayFeeRulePo tmpPayFeeRulePo) {
@@ -170,7 +175,7 @@ public class CycleConvertOnceFeeImpl implements ICycleConvertOnceFee {
         Date targetEndTime = computeTargetEndTime(tmpPayFeeRulePo, feeConfigDtos.get(0));
 
         //todo 创建 pay_fee 和 attrs 数据
-
+        List<PayFeeRuleBillPo> payFeeRuleBillPos = new ArrayList<>();
         List<PayFeePo> tmpPayFeePos = new ArrayList<>();
         List<FeeAttrPo> tmpFeeAttrPos = new ArrayList<>();
 
@@ -195,7 +200,7 @@ public class CycleConvertOnceFeeImpl implements ICycleConvertOnceFee {
                 endTime = targetEndTime;
             }
             //todo 生成 费用
-            doGeneratorPayFee(tmpPayFeeRulePo, startTime, endTime, feeConfigDtos.get(0), tmpPayFeePos, tmpFeeAttrPos, ownerDto, payerObjName);
+            doGeneratorPayFee(tmpPayFeeRulePo, startTime, endTime, feeConfigDtos.get(0), tmpPayFeePos, tmpFeeAttrPos, payFeeRuleBillPos, ownerDto, payerObjName);
 
             startTime = endTime;
 
@@ -203,7 +208,7 @@ public class CycleConvertOnceFeeImpl implements ICycleConvertOnceFee {
         while (endTime.getTime() < targetEndTime.getTime());
         int saveFlag = 0;
         if (!tmpPayFeePos.isEmpty()) {
-            saveFlag = saveFeeAndAttrs(tmpPayFeePos, tmpFeeAttrPos);
+            saveFlag = saveFeeAndAttrs(tmpPayFeePos, tmpFeeAttrPos, payFeeRuleBillPos);
         }
 
         //todo 修改pay_fee_rule 的CurYearMonth
@@ -220,6 +225,7 @@ public class CycleConvertOnceFeeImpl implements ICycleConvertOnceFee {
 
     private void doGeneratorPayFee(PayFeeRulePo tmpPayFeeRulePo, Date startTime, Date endTime, FeeConfigDto feeConfigDto,
                                    List<PayFeePo> tmpPayFeePos, List<FeeAttrPo> tmpFeeAttrPos,
+                                   List<PayFeeRuleBillPo> payFeeRuleBillPos,
                                    OwnerDto ownerDto,
                                    String payerObjName) {
 
@@ -232,6 +238,17 @@ public class CycleConvertOnceFeeImpl implements ICycleConvertOnceFee {
 
         tmpPayFeePos.add(payFeePo);
 
+        //todo 生成ruleBill 数据
+        PayFeeRuleBillPo payFeeRuleBillPo = new PayFeeRuleBillPo();
+        payFeeRuleBillPo.setFeeId(payFeePo.getFeeId());
+        payFeeRuleBillPo.setBillId(GenerateCodeFactory.getGeneratorId("13"));
+        payFeeRuleBillPo.setBillName(feeConfigDto.getFeeName());
+        payFeeRuleBillPo.setRuleId(tmpPayFeeRulePo.getRuleId());
+        payFeeRuleBillPo.setConfigId(tmpPayFeeRulePo.getConfigId());
+        payFeeRuleBillPo.setBatchId(payFeePo.getBatchId());
+        payFeeRuleBillPo.setCurYearMonth(DateUtil.getFormatTimeStringB(startTime));
+        payFeeRuleBillPo.setCommunityId(payFeePo.getCommunityId());
+        payFeeRuleBillPos.add(payFeeRuleBillPo);
 
         tmpFeeAttrPos.add(addFeeAttr(payFeePo, FeeAttrDto.SPEC_CD_ONCE_FEE_DEADLINE_TIME, DateUtil.getFormatTimeStringB(endTime)));
 
@@ -258,7 +275,7 @@ public class CycleConvertOnceFeeImpl implements ICycleConvertOnceFee {
     }
 
 
-    private int saveFeeAndAttrs(List<PayFeePo> feePos, List<FeeAttrPo> feeAttrsPos) {
+    private int saveFeeAndAttrs(List<PayFeePo> feePos, List<FeeAttrPo> feeAttrsPos, List<PayFeeRuleBillPo> payFeeRuleBillPos) {
         if (feePos == null || feePos.isEmpty()) {
             return 1;
         }
@@ -267,6 +284,10 @@ public class CycleConvertOnceFeeImpl implements ICycleConvertOnceFee {
             return flag;
         }
 
+        if (!payFeeRuleBillPos.isEmpty()) {
+            payFeeRuleBillV1InnerServiceSMOImpl.savePayFeeRuleBills(payFeeRuleBillPos);
+        }
+
         flag = feeAttrInnerServiceSMOImpl.saveFeeAttrs(feeAttrsPos);
 
         // todo 这里异步的方式计算 月数据 和欠费数据