|
@@ -64,7 +64,13 @@ public class SwMeterExchangeRegisterServiceImpl extends ServiceImpl<SwMeterExcha
|
|
|
// 1. 先插入旧表数据
|
|
|
swWaterUsageEntryDao.insert(oldEntry);
|
|
|
// 2. 生成账单,
|
|
|
- billGenerationService.generateBill(Collections.singletonList(oldEntry),(ServletRequestAttributes) RequestContextHolder.getRequestAttributes());
|
|
|
+// 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);
|
|
|
+
|
|
|
|
|
|
updateUserMeterInfo(newEntry);
|
|
|
|