feature 代码提交增加相关日志信息

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

@@ -63,7 +63,7 @@ public class BillServiceImpl implements BillService {
                 .eq(SwBillManagementUnpaidDo::getDeleted, 0)
                 .eq(SwBillManagementUnpaidDo::getUsernumber, accountNum)
                 .eq(SwBillManagementUnpaidDo::getYear, year)
-                .eq(SwBillManagementUnpaidDo::getStatus,2)
+                .eq(SwBillManagementUnpaidDo::getStatus, 2)
                 .orderByDesc(SwBillManagementUnpaidDo::getYear)
                 .orderByDesc(SwBillManagementUnpaidDo::getMonth));
         // 已缴账单
@@ -121,19 +121,21 @@ public class BillServiceImpl implements BillService {
 
     @Override
     public R pendingBills(String accountNumber) {
+        log.info("开始获取用户：{}的余额信息", accountNumber);
         // 获取所有待缴费账单
         List<SwBillManagementUnpaidDo> outstandingBills = swBillManagementUnpaidService.list(new LambdaQueryWrapper<SwBillManagementUnpaidDo>()
                 .eq(SwBillManagementUnpaidDo::getDeleted, 0)
-                .eq(SwBillManagementUnpaidDo::getStatus,2)
+                .eq(SwBillManagementUnpaidDo::getStatus, 2)
                 .eq(SwBillManagementUnpaidDo::getUsernumber, accountNumber));
         // 获取余额信息
         SwUserManagementDo swUserManagementDo = swUserManagementService.getOne(new LambdaQueryWrapper<SwUserManagementDo>()
                 .eq(BaseDo::getDeleted, "0")
                 .eq(SwUserManagementDo::getUsernumber, accountNumber));
         Map<String, Object> returnMao = new HashMap<String, Object>();
-        returnMao.put("yj",outstandingBills.stream().map(SwBillManagementUnpaidDo::getActualdue).reduce(BigDecimal.ZERO, BigDecimal::add));
-        returnMao.put("ye",swUserManagementDo.getAccountbalance());
-        returnMao.put("zdId",outstandingBills.stream().map(SwBillManagementUnpaidDo::getId).collect(Collectors.joining(",")));
+        returnMao.put("yj", outstandingBills.stream().map(SwBillManagementUnpaidDo::getActualdue).reduce(BigDecimal.ZERO, BigDecimal::add));
+        returnMao.put("ye", swUserManagementDo.getAccountbalance());
+        returnMao.put("zdId", outstandingBills.stream().map(SwBillManagementUnpaidDo::getId).collect(Collectors.joining(",")));
+        log.error("获取当前用户的余额和账单信息为，{}", returnMao);
         return R.ok(returnMao);
     }
 }

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

@@ -43,6 +43,7 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.LocalDateTime;
 import java.util.*;
+import java.util.stream.Collectors;
 
 import static com.rongwei.wechat.system.utils.SaveConstans.PayType.*;
 
@@ -77,7 +78,7 @@ public class PayMentServiceImpl implements PayMentService {
 
     @Override
     public R paymentInitiation(WxPrepayOrderVo vo) {
-        log.info("开始发起付款申请");
+        log.info("开始发起付款申请!参数为：{}", vo);
         // 获取商户基本信息
         SwEnterpriseConfigInfoDo swEnterpriseConfigInfoDo = swEnterpriseConfigInfoService.getOne(new LambdaQueryWrapper<SwEnterpriseConfigInfoDo>().eq(BaseDo::getDeleted, "0"));
         if (swEnterpriseConfigInfoDo == null) {
@@ -138,6 +139,15 @@ public class PayMentServiceImpl implements PayMentService {
         paymentReturnMap.put("paymentSign", prepayWithRequestPaymentResponse);
         paymentReturnMap.put("orderNo", nonceStr);
         String zdId = vo.getZdId();
+        // 防止用户第二次进入缴费页面导致账单ID丢失的问题
+        if (StringUtils.isBlank(zdId)) {
+            log.debug("账单ID为空");
+            List<SwBillManagementUnpaidDo> swBillManagementUnpaidDoList = swBillManagementUnpaidService.list(new LambdaQueryWrapper<SwBillManagementUnpaidDo>()
+                    .eq(SwBillManagementUnpaidDo::getUsernumber, vo.getUserNumber())
+                    .eq(SwBillManagementUnpaidDo::getStatus, 2));
+            zdId = swBillManagementUnpaidDoList.stream().map(SwBillManagementUnpaidDo::getId).collect(Collectors.joining(","));
+        }
+
         createAdvancePayRecordData(WE_CHAT, zdId, vo.getUserNumber(), nonceStr, vo.toString(), paymentReturnMap.toString(), vo.getOpenId());
         if (StringUtils.isNotBlank(zdId)) {
             // 预缴款项对应的账单信息 更新订单号