feature 票据打印参数配置化

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

@@ -95,7 +95,7 @@ public class BillGenerationServiceImpl {
             // 本次抄表日期
             Date currentreadingdate = swWaterUsageEntry.getCurrentreadingdate();
             // 校验 是否已存在抄表记录
-            if (swWaterUsageEntry.getState() != 0) {
+            if (swWaterUsageEntry.getState() == 1) {
                 log.error("当前用户：{},时间：{}的抄表记录已生成账单信息", usernumber, currentreadingdate);
                 return;
             }
@@ -127,6 +127,7 @@ public class BillGenerationServiceImpl {
                 // 生成代缴费账单
                 swBillManagementUnpaidDo= produceBill(swUserManagementDo, swWaterUsageEntry);
             }catch (Exception e) {
+                e.printStackTrace();
                 log.error("缴费记录生成失败原因:{}",e.getMessage());
             }
 
@@ -180,15 +181,23 @@ public class BillGenerationServiceImpl {
         def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
         TransactionStatus status = transactionManager.getTransaction(def);
         try {
-            // 抄表记录状态更新
-            swWaterUsageEntryService.updateBatchById(saveUsageEntryList,4000);
-            // 账单保存
-            swBillManagementUnpaidService.saveBatch(swBillManagementUnpaidDos, 1000);
-            // 更新用户表的本次抄表时间和本次抄表度数
-            swUserManagementService.updateBatchById(userSaveList);
+            if(!saveUsageEntryList.isEmpty()){
+                // 抄表记录状态更新
+                swWaterUsageEntryService.updateBatchById(saveUsageEntryList,4000);
+            }
+            if(!swBillManagementUnpaidDos.isEmpty()){
+                // 账单保存
+                swBillManagementUnpaidService.saveBatch(swBillManagementUnpaidDos, 1000);
+            }
+            if(!userSaveList.isEmpty()){
+                // 更新用户表的本次抄表时间和本次抄表度数
+                swUserManagementService.updateBatchById(userSaveList);
+            }
+
             // 事务性操作
             transactionManager.commit(status);
         } catch (Exception e) {
+            e.printStackTrace();
             transactionManager.rollback(status);
             log.error("账单保存异常");
         }

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

@@ -186,7 +186,7 @@ public class PrintServiceImpl implements PrintService {
             // 内容
             List<List<Object>> partition = Lists.partition(loopData, 8);
             for (int i = 0; i < partition.size(); i++) {
-                initialTop = initialTop + 5*(i+1);
+                initialTop = initialTop + 5 ;
                 List<Object> dataList = partition.get(i);
                 for (int j = 0; j < dataList.size(); j++) {
                     printReceiptVo = new PrintReceiptVo();

zhsw-server/src/main/resources/bootstrap-dev.yml

@@ -10,3 +10,4 @@ spring:
       discovery:
         server-addr: 127.0.0.1:8848
         namespace: cd047569-9470-4dfb-8663-b113d01cd30f
+        #cd047569-9470-4dfb-8663-b113d01cd30f