From cdfefd1f4cd66b727aafd0ad7bb5c6aade3726ad Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Tue, 12 Nov 2024 14:59:57 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=20=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TbShopCouponServiceImpl.java    | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbShopCouponServiceImpl.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbShopCouponServiceImpl.java
index de88c40..4fa3354 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbShopCouponServiceImpl.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbShopCouponServiceImpl.java
@@ -157,13 +157,15 @@ public class TbShopCouponServiceImpl implements TbShopCouponService {
             }
         } else {
             List<TbShopUser> tbShopUser = shopUserMapper.selectAllByUserId(param.getUserId().toString());
-            List<Integer> ids = tbShopUser.stream().map(TbShopUser::getId).map(Integer::valueOf).collect(Collectors.toList());
-            if (param.getStatus().equals(1)) {
-                return new Result(CodeEnum.SUCCESS, inRecordMapper.queryByVipIdAndShopId(ids, param.getShopId()));
-            } else if (param.getStatus().equals(-1)) {
-                return new Result(CodeEnum.SUCCESS, inRecordMapper.queryByVipIdAndShopIdExpire(ids, param.getShopId()));
-            } else if (param.getStatus().equals(2)) {
-                return new Result(CodeEnum.SUCCESS, outRecordMapper.queryByVipIdAndShopId(ids, param.getShopId()));
+            if(CollectionUtil.isNotEmpty(tbShopUser)){
+                List<Integer> ids = tbShopUser.stream().map(TbShopUser::getId).map(Integer::valueOf).collect(Collectors.toList());
+                if (param.getStatus().equals(1)) {
+                    return new Result(CodeEnum.SUCCESS, inRecordMapper.queryByVipIdAndShopId(ids, param.getShopId()));
+                } else if (param.getStatus().equals(-1)) {
+                    return new Result(CodeEnum.SUCCESS, inRecordMapper.queryByVipIdAndShopIdExpire(ids, param.getShopId()));
+                } else if (param.getStatus().equals(2)) {
+                    return new Result(CodeEnum.SUCCESS, outRecordMapper.queryByVipIdAndShopId(ids, param.getShopId()));
+                }
             }
         }
         return new Result(CodeEnum.SUCCESS);

From 7a27968e6d8b33f86f2b3a4f01d23be9d3d99168 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= <tankaikai@aliyun.com>
Date: Tue, 12 Nov 2024 15:43:08 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E5=8F=B7=E7=A0=81=E9=9D=9E=E7=A9=BA=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TbPointsExchangeRecordServiceImpl.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbPointsExchangeRecordServiceImpl.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbPointsExchangeRecordServiceImpl.java
index c9374fb..7b0f1f2 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbPointsExchangeRecordServiceImpl.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbPointsExchangeRecordServiceImpl.java
@@ -148,7 +148,7 @@ public class TbPointsExchangeRecordServiceImpl extends ServiceImpl<TbPointsExcha
             Assert.notEmpty(record.getPickupMethod(), "{}({})不能为空", "领取方式", "pickupMethod");
             Assert.notNull(record.getMemberId(), "{}({})不能为空", "会员id", "memberId");
             Assert.notEmpty(record.getMemberName(), "{}({})不能为空", "会员名称", "memberName");
-            Assert.notEmpty(record.getMobile(), "{}({})不能为空", "手机号码", "mobile");
+            //Assert.notEmpty(record.getMobile(), "{}({})不能为空", "手机号码", "mobile");
         } catch (IllegalArgumentException e) {
             throw new MsgException(e.getMessage());
         }

From 3d66ba9e7a30a44c03f86e1e4e59eb1fa570ca5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= <tankaikai@aliyun.com>
Date: Tue, 12 Nov 2024 15:43:55 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=82=A8=E5=80=BC?=
 =?UTF-8?q?=E6=B6=88=E8=B4=B9=E9=80=81=E7=A7=AF=E5=88=86=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chaozhanggui/system/cashierservice/service/PayService.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
index c382b61..ec150af 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
@@ -651,7 +651,7 @@ public class PayService {
         }
 
         //消费送积分
-        tbMemberPointsService.consumeAwardPoints(Long.valueOf(orderInfo.getMemberId()), Long.valueOf(orderInfo.getId()));
+        //tbMemberPointsService.consumeAwardPoints(Long.valueOf(orderInfo.getMemberId()), Long.valueOf(orderInfo.getId()));
 
         mQUtils.printPlaceTicket(orderInfo.getId(), false);
 //        producer.printMechine(orderId);