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

src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java

@@ -1299,6 +1299,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");

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);