Merge remote-tracking branch 'origin/master'

cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopActivateServiceImpl.java

@@ -1,6 +1,7 @@
 package com.czg.service.account.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -163,6 +164,9 @@ public class ShopActivateServiceImpl extends ServiceImpl<ShopActivateMapper, Sho
     private List<ShopCoupon> getCoupons(String couponJson) {
         Map<String, Integer> couponMap = JSONObject.parseObject(couponJson, new TypeReference<>() {
         });
+        if (couponMap.isEmpty()) {
+            return new ArrayList<>();
+        }
         List<ShopCoupon> list = couponService.queryChain()
                 .select(ShopCoupon::getId, ShopCoupon::getTitle, ShopCoupon::getLeftNumber)
                 .in(ShopCoupon::getId, couponMap.keySet())

cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterHandler.java

@@ -238,7 +238,7 @@ public abstract class PrinterHandler {
         // 判断订单是否是先付费或者已结算
         if (!"after-pay".equals(orderInfo.getPayMode()) && (OrderStatusEnums.UNPAID.getCode().equals(orderInfo.getStatus()) || OrderStatusEnums.CANCELLED.getCode().equals(orderInfo.getStatus()))) {
             log.warn("此订单未支付, 订单信息: {}", orderInfo);
-            return;
+//            return;
         }
 
         List<?> categoryIds = JSONObject.parseObject(StrUtil.emptyToDefault(machine.getCategoryIds(), "[]"), List.class);