修复店铺状态修改时判断有无未完成订单逻辑

src/main/java/com/sqx/modules/order/dao/AppOrderDao.java

@@ -95,5 +95,5 @@ public interface AppOrderDao extends BaseMapper<TbOrder> {
      * @param shopId 店铺id
      * @return 未完成订单数
      */
-    int countUnFinishNumByShopId(@Param("shopId") Long shopId);
+    int countUnFinishByShopId(@Param("shopId") Long shopId);
 }

src/main/java/com/sqx/modules/shop/service/impl/ShopMessageServiceImpl.java

@@ -298,9 +298,9 @@ public class ShopMessageServiceImpl extends ServiceImpl<ShopMessageDao, GoodsSho
 
         // 如果修改店铺下线，需要判断当前订单有无未完成订单，如有则不允许下线
         if (Integer.valueOf(Constant.YES).equals(goodsShop.getPutawayFlag())) {
-            int num = appOrderDao.countUnFinishNumByShopId(goodsShop.getShopId());
+            int num = appOrderDao.countUnFinishByShopId(goodsShop.getShopId());
             if (num > 0) {
-                Result.error("当前订单存在未完成订单，请完成所有订单后再修改店铺状态");
+                return Result.error("当前店铺存在未完成订单，请完成所有订单后再修改店铺状态");
             }
         }
 

src/main/resources/mapper/order/OrderMapper.xml

@@ -440,7 +440,7 @@
                 and expect_delivery_time <![CDATA[ <= ]]> adddate(now(),interval 30 minute)
     </select>
 
-    <select id="countUnFinishNumByShopId" resultType="java.lang.Integer">
+    <select id="countUnFinishByShopId" resultType="java.lang.Integer">
         select count(order_id)
         from tb_order
         where shop_id = #{shopId} and status in (6, 3)