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

2024-09-02 10:59:37 +08:00
parent a5046976c5 2985ae0f14
commit 3e3a23becd
1 changed files with 1 additions and 1 deletions
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
@@ -690,7 +690,7 @@ public class PayService {
        }


-        TbShopUser user = tbShopUserMapper.selectByShopId(orderInfo.getShopId(), tbUserInfo.getId().toString()).get(0);
+        TbShopUser user = tbShopUserMapper.selectByShopId(orderInfo.getShopId(), tbUserInfo.getId().toString(),"2").get(0);
        if (ObjectUtil.isEmpty(user) || !"1".equals(user.getIsVip().toString())) {
            return Result.fail(CodeEnum.MEMBERNOEXIST);
        }