Merge remote-tracking branch 'origin/test' into test

2024-09-25 18:04:39 +08:00
parent bafc281a10 1d41a37d5b
commit 4fe01911d0
6 changed files with 46 additions and 1 deletions
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java
@@ -37,6 +37,9 @@ public class LoginService {
    @Autowired
    private TbShopUserMapper tbShopUserMapper;

+    @Autowired
+    private TbActivateInRecordMapper inRecordMapper;
+
    @Autowired
    private TbShopTableMapper tbShopTableMapper;

@@ -498,6 +501,9 @@ public class LoginService {
        if (tbUserInfo == null) {
            return Result.success(CodeEnum.ENCRYPT, new ArrayList());
        }
+        tbUserInfo.setBalanceAll(tbShopUserMapper.countAmount(userId));
+        tbUserInfo.setCouponAll(inRecordMapper.countCouponNum(userId));
+
        return Result.success(CodeEnum.ENCRYPT, tbUserInfo);
    }