feature 代码提交

zhsw-common/src/main/java/com/rongwei/zhsw/system/service/impl/BillGenerationServiceImpl.java

@@ -78,7 +78,7 @@ public class BillGenerationServiceImpl {
     public void generateBill(List<SwWaterUsageEntryDo> swWaterUsageEntryDoList, Map<String, SwUserManagementDo> userMap) {
         String dsKey = ContextHolder.getValue("dsKey");
         log.info("dsKey:{}", dsKey);
-        log.debug("需要生成账单的抄表记录为：{},条数为：{}", swWaterUsageEntryDoList,swWaterUsageEntryDoList.size());
+        log.debug("需要生成账单的抄表记录为：{},条数为：{}", swWaterUsageEntryDoList, swWaterUsageEntryDoList.size());
         long asyncTasksStart = System.currentTimeMillis();
         // 对数据按照抄表日期排序
         List<SwWaterUsageEntryDo> collect = swWaterUsageEntryDoList.parallelStream()
@@ -149,11 +149,11 @@ public class BillGenerationServiceImpl {
                 continue;
             }
             // 特殊处理 上次抄表数为1本次为0
-            if(BigDecimal.ZERO.compareTo(swWaterUsageEntry.getThisreading())==0 && BigDecimal.ONE.compareTo(swWaterUsageEntry.getLastreading())==0 ) {
+            if (BigDecimal.ZERO.compareTo(swWaterUsageEntry.getThisreading()) == 0 && BigDecimal.ONE.compareTo(swWaterUsageEntry.getLastreading()) == 0) {
                 log.debug("户号：{}上次抄表数为1本次为0", swWaterUsageEntry.getUsernumber());
-              // 不生成账单
+                // 不生成账单
                 usageEntryDo.setState("5");
-            }else{
+            } else {
                 try {
                     // 生成代缴费账单
                     swBillManagementUnpaidDo = produceBill(swUserManagementDo, swWaterUsageEntry, currentUser);
@@ -161,17 +161,16 @@ public class BillGenerationServiceImpl {
                     e.printStackTrace();
                     log.error("缴费记录生成失败原因:{}", e.getMessage());
                 }
-            }
-
-            if (swBillManagementUnpaidDo == null) {
-                usageEntryDo.setState("4");
-            } else {
-                usageEntryDo.setState("1");
-                saveList.add(swBillManagementUnpaidDo);
-                // 设置本次的抄表日期
-                swUserManagementDo.setLastmeterreaddate(swBillManagementUnpaidDo.getThismeterreadingdate());
-                // 设置本次的抄表用量
-                swUserManagementDo.setLastmeterreading(swBillManagementUnpaidDo.getThismeterreading());
+                if (swBillManagementUnpaidDo == null) {
+                    usageEntryDo.setState("4");
+                } else {
+                    usageEntryDo.setState("1");
+                    saveList.add(swBillManagementUnpaidDo);
+                    // 设置本次的抄表日期
+                    swUserManagementDo.setLastmeterreaddate(swBillManagementUnpaidDo.getThismeterreadingdate());
+                    // 设置本次的抄表用量
+                    swUserManagementDo.setLastmeterreading(swBillManagementUnpaidDo.getThismeterreading());
+                }
             }
             userSaveList.add(swUserManagementDo);
             saveUsageEntryList.add(usageEntryDo);
@@ -352,8 +351,8 @@ public class BillGenerationServiceImpl {
 
         swBillManagementUnpaidDo.setStatus(1 + "");
         ZHSWCommonUtils.initModelGeneralParameters(swBillManagementUnpaidDo, currentUser);
-       //没有获取到 token
-        if( currentUser ==null || currentUser.getId() ==null){
+        //没有获取到 token
+        if (currentUser == null || currentUser.getId() == null) {
             swBillManagementUnpaidDo.setCreateuserid(swWaterUsageEntryDo.getCreateuserid());
             swBillManagementUnpaidDo.setCreateusername(swWaterUsageEntryDo.getCreateusername());
             swBillManagementUnpaidDo.setModifyuserid(swWaterUsageEntryDo.getModifyuserid());