Merge remote-tracking branch 'origin/master'

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);
 

zhsw-common/src/main/java/com/rongwei/zhsw/system/wechat/impl/AccountServiceImpl.java

@@ -188,10 +188,23 @@ public class AccountServiceImpl implements AccountService {
                     swUserWechatService.updateById(nextAccount);
                 }
             }
-
         }
+        
+        // 检查该户号是否还有其他微信绑定记录
+        long count = swUserWechatService.count(new LambdaQueryWrapper<SwUserWechatDo>()
+                .eq(SwUserWechatDo::getUserno, account)
+                .ne(SwUserWechatDo::getWechatsign, currentWeChatOpenId)
+                .eq(SwUserWechatDo::getDeleted, 0));
+                
         // 删除绑定关系
         swUserManagementService.getBaseMapper().unbindAccount(dsKey, currentWeChatOpenId, account);
+        
+        // 如果没有其他微信绑定该户号，则将WECHATBINDSTATUS设置为null
+        if (count == 0) {
+            swUserManagementService.update(new LambdaUpdateWrapper<SwUserManagementDo>()
+                    .eq(SwUserManagementDo::getUsernumber, account)
+                    .set(SwUserManagementDo::getWechatbindstatus, null));
+        }
 
         // 默认不刷新直接返回
         if (!accountUnbindVo.getRefresh()) {