修复满减优惠异常问题

src/main/java/com/sqx/modules/activity/service/impl/ActivityShopServiceImpl.java

@@ -1,5 +1,6 @@
 package com.sqx.modules.activity.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -107,11 +108,13 @@ public class ActivityShopServiceImpl extends ServiceImpl<ActivityShopDao, Activi
                 // 查询店铺所有商品
                 List<Long> goodsIds = goodsService.getByAllGoodsIdByShopId(activityShop.getShopId());
 
-                ActivityGoodsDTO activityGoodsDTO = new ActivityGoodsDTO();
-                activityGoodsDTO.setActivityShopId(activityShop.getId());
-                activityGoodsDTO.setGoodsIds(goodsIds);
+                if (CollUtil.isNotEmpty(goodsIds)) {
+                    ActivityGoodsDTO activityGoodsDTO = new ActivityGoodsDTO();
+                    activityGoodsDTO.setActivityShopId(activityShop.getId());
+                    activityGoodsDTO.setGoodsIds(goodsIds);
 
-                activityGoodsService.updateActivityGoods(activityGoodsDTO);
+                    activityGoodsService.updateActivityGoods(activityGoodsDTO);
+                }
             }
         }
 

src/main/java/com/sqx/modules/order/service/impl/AppAppOrderServiceImpl.java

@@ -530,8 +530,7 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
         if (ObjectUtil.isNull(order)) {
             throw new SqxException("无效的订单id");
         }
-
-        if(order.getAutoSendOrder()!=null && order.getAutoSendOrder()==1){
+        if(order.getAutoSendOrder() != null && order.getAutoSendOrder() == 0){
             throw new SqxException("当前订单为自动派单，不能手动完成！");
         }