feature 项目启动时刷新租户信息

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

@@ -12,4 +12,6 @@ import com.rongwei.rwcommon.base.R;
 public interface BillService {
 
     R getBillList(BillListSearchVo billListSearchVo);
+
+    R pendingBills(String accountNumber);
 }

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

@@ -3,8 +3,11 @@ package com.rongwei.zhsw.system.wechat.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.rongwe.zhsw.system.domain.SwBillManagementPaidDo;
 import com.rongwe.zhsw.system.domain.SwBillManagementUnpaidDo;
+import com.rongwe.zhsw.system.domain.SwUserManagementDo;
 import com.rongwe.zhsw.system.vo.BillListSearchVo;
 import com.rongwe.zhsw.system.vo.BillListVo;
+import com.rongwe.zhsw.system.vo.WeChatHomePageVo;
+import com.rongwei.rwcommon.base.BaseDo;
 import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.base.exception.CustomException;
 import com.rongwei.zhsw.system.service.impl.SwBillManagementPaidServiceImpl;
@@ -19,7 +22,9 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * BillServiceImpl class
@@ -77,7 +82,7 @@ public class BillServiceImpl implements BillService {
             billListVo.setUsage(unpaidRecord.getCurrentwateruse());
             String start = unpaidRecord.getLastmeterreading().stripTrailingZeros().toPlainString();
             String end = unpaidRecord.getThismeterreading().stripTrailingZeros().toPlainString();
-            billListVo.setMeterReading(start+ "-" +end);
+            billListVo.setMeterReading(start + "-" + end);
             billListVo.setPaymentTime(null);
             billListVo.setIsPaid(false);
             billListVo.setCurrentDate(unpaidRecord.getThismeterreadingdate());
@@ -97,7 +102,7 @@ public class BillServiceImpl implements BillService {
             billListVo.setUsage(paidRecord.getCurrentwateruse());
             String start = paidRecord.getLastmeterreading().stripTrailingZeros().toPlainString();
             String end = paidRecord.getThismeterreading().stripTrailingZeros().toPlainString();
-            billListVo.setMeterReading(start+ "-" +end);
+            billListVo.setMeterReading(start + "-" + end);
             billListVo.setPaymentTime(paidRecord.getPaymentdate());
             billListVo.setIsPaid(true);
             billListVo.setCurrentDate(paidRecord.getThismeterreadingdate());
@@ -111,4 +116,20 @@ public class BillServiceImpl implements BillService {
         });
         return R.ok(returnList);
     }
+
+    @Override
+    public R pendingBills(String accountNumber) {
+        // 获取所有待缴费账单
+        List<SwBillManagementUnpaidDo> outstandingBills = swBillManagementUnpaidService.list(new LambdaQueryWrapper<SwBillManagementUnpaidDo>()
+                .eq(SwBillManagementUnpaidDo::getDeleted, 0)
+                .eq(SwBillManagementUnpaidDo::getUsernumber, accountNumber));
+        // 获取余额信息
+        SwUserManagementDo swUserManagementDo = swUserManagementService.getOne(new LambdaQueryWrapper<SwUserManagementDo>()
+                .eq(BaseDo::getDeleted, "0")
+                .eq(SwUserManagementDo::getUsernumber, accountNumber));
+        Map<String, BigDecimal> returnMao = new HashMap<String, BigDecimal>();
+        returnMao.put("yj",outstandingBills.stream().map(SwBillManagementUnpaidDo::getActualdue).reduce(BigDecimal.ZERO, BigDecimal::add));
+        returnMao.put("ye",swUserManagementDo.getAccountbalance());
+        return R.ok(returnMao);
+    }
 }

zhsw-server/src/main/java/com/rongwei/zhsw/system/controller/weChat/BillController.java

@@ -1,5 +1,6 @@
 package com.rongwei.zhsw.system.controller.weChat;
 
+import com.rongwe.zhsw.system.vo.AccountUnbindVo;
 import com.rongwe.zhsw.system.vo.BillListSearchVo;
 import com.rongwei.rwcommon.base.R;
 import com.rongwei.zhsw.system.wechat.BillService;
@@ -26,4 +27,11 @@ public class BillController {
     private R info(@RequestBody BillListSearchVo billListSearchVo) {
         return billService.getBillList(billListSearchVo);
     }
+
+
+
+    @PostMapping("/pending/{accountNumber}")
+    private R  pendingBills(@PathVariable("accountNumber") String accountNumber) {
+        return billService.pendingBills(accountNumber);
+    }
 }