From 927bef9602e99506f5d889ba96f731426532aa70 Mon Sep 17 00:00:00 2001
From: Tankaikai <tankaikai@aliyun.com>
Date: Tue, 19 Nov 2024 10:11:37 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B6=88=E8=B4=B9=E9=80=81=E7=A7=AF?=
 =?UTF-8?q?=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chaozhanggui/system/cashierservice/service/PayService.java | 3 +++
 1 file changed, 3 insertions(+)

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 a79c260..d81d89d 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
@@ -1291,6 +1291,9 @@ public class PayService {
         orderInfo.setPaidTime(System.currentTimeMillis());
         tbOrderInfoMapper.updateByPrimaryKeySelective(orderInfo);
 
+        // 消费送积分
+        tbMemberPointsService.consumeAwardPoints(Long.valueOf(orderInfo.getMemberId()), Long.valueOf(orderInfo.getId()));
+
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("token", 0);
         jsonObject.put("type", "wxcreate");

From 55adcacc4c884f5b72be3fe1dfbe1b96227ed4e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Tue, 19 Nov 2024 10:30:14 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E7=83=AD=E9=94=80=E5=88=86=E7=BB=84?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E4=B8=BA=E7=A9=BA=E6=8A=A5=E9=94=99=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/service/ProductService.java      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
index db90810..e5fce3f 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
@@ -257,7 +257,12 @@ public class ProductService {
             //热销
             TbProductGroup hot = new TbProductGroup();
             hot.setName("热销");
-            List<TbProduct> hots = tbProductMapper.selectHot(shopId,proSets);
+            List<TbProduct> hots  = null;
+            if (proSets.isEmpty()) {
+                hots = new ArrayList<>();
+            }else {
+                hots = tbProductMapper.selectHot(shopId,proSets);
+            }
             hot.setProducts(handleDate(hots,true,1,false, shopInfo));
             groupList.add(0, hot);