Browse Source

问题修复

FengChaoYu 1 day ago
parent
commit
5d6d9b34b3

+ 19 - 0
mall-miniapp-service/src/main/java/com/gree/mall/miniapp/enums/UserCreditBillStatusEnum.java

@@ -0,0 +1,19 @@
+package com.gree.mall.miniapp.enums;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public enum UserCreditBillStatusEnum {
+
+    UNPAID ("UNPAID","未还款"),
+    REPAYMENT("REPAYMENT","部分还款"),
+    REPAID("REPAID","已还款"),
+    ;
+
+
+    private final String key;
+    private final String remark;
+}

+ 2 - 1
mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/user/UserCompanyCreditLogic.java

@@ -10,6 +10,7 @@ import com.gree.mall.miniapp.bean.user.SettleMonthWagesWorkerBean;
 import com.gree.mall.miniapp.commonmapper.LockQueryMapper;
 import com.gree.mall.miniapp.constant.Constant;
 import com.gree.mall.miniapp.enums.TransactionTypeEnum;
+import com.gree.mall.miniapp.enums.UserCreditBillStatusEnum;
 import com.gree.mall.miniapp.exception.RemoteServiceException;
 import com.gree.mall.miniapp.helper.ResponseHelper;
 import com.gree.mall.miniapp.logic.common.CommonLogic;
@@ -71,7 +72,7 @@ public class UserCompanyCreditLogic {
             final Integer count = userCompanyCreditBillService.lambdaQuery()
                     .eq(UserCompanyCreditBill::getCompanyWechatId, orderInfo.getCompanyWechatId())
                     .eq(UserCompanyCreditBill::getUserId, orderInfo.getUserId())
-                    .eq(UserCompanyCreditBill::getIsPaid, false)
+                    .in(UserCompanyCreditBill::getStatus, UserCreditBillStatusEnum.UNPAID.getKey(), UserCreditBillStatusEnum.REPAYMENT.getKey())
                     .eq(UserCompanyCreditBill::getDueDate, curDate)
                     .count();