--换表新增用户表数据

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

@@ -327,4 +327,7 @@ public class BillGenerationServiceImpl {
         swBillManagementUnpaidDo.setWaterusageid(swWaterUsageEntryDo.getId());
         return swBillManagementUnpaidDo;
     }
+
+
+
 }

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

@@ -64,13 +64,7 @@ public class SwMeterExchangeRegisterServiceImpl extends ServiceImpl<SwMeterExcha
         // 1. 先插入旧表数据
         swWaterUsageEntryDao.insert(oldEntry);
         // 2. 生成账单，
-//        billGenerationService.generateBill(Collections.singletonList(oldEntry),(ServletRequestAttributes) RequestContextHolder.getRequestAttributes());
-//        billGenerationService.generateBill(oldEntry.getId(),(ServletRequestAttributes) RequestContextHolder.getRequestAttributes());
-
-        SwUserManagementDo user = swUserManagementService.getById(oldEntry.getUserid());
-
-        billGenerationService.produceBill(user,oldEntry);
-
+        billGenerationService.generateBill(oldEntry.getId());
 
         updateUserMeterInfo(newEntry);