Procházet zdrojové kódy

修复到店取餐到店点击完成显示请等待骑手送达bug;

codingliang před 2 roky
rodič
revize
d14c783bae

+ 8 - 6
src/main/java/com/sqx/modules/order/service/impl/AppAppOrderServiceImpl.java

@@ -664,9 +664,6 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
      * @param goodsShop 店铺信息
      */
     private void checkAddress(TbOrder order, Long addressId, GoodsShop goodsShop) {
-        // 店铺是否开启自动派单 0开启 1关闭
-        Integer autoSendOrder = goodsShop.getAutoSendOrder() == 0 ? 0 : 1;
-
         // 如果时外卖订单
         if (order.getOrderType() == 2) {
             if(addressId == null){
@@ -686,6 +683,8 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
             BigDecimal shopErrandMoney = goodsShop.getErrandMoney() != null ? goodsShop.getErrandMoney() : BigDecimal.ZERO;
             // 减免配送费最小订单金额
             BigDecimal exemptMinMoney = goodsShop.getExemptMinMoney() != null ? goodsShop.getExemptMinMoney() : BigDecimal.ZERO;
+            // 店铺是否开启自动派单 0开启 1关闭
+            Integer autoSendOrder = goodsShop.getAutoSendOrder() == 0 ? 0 : 1;
 
             // 店铺开启了配送费满减
             if (enableFullReductionFlag == 0) {
@@ -724,10 +723,13 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
             String addressJson = JSONObject.toJSONString(address);
             order.setAddress(addressJson);
             order.setAddressId(addressId);
-        }
 
-        // 设置是否自动派单
-        order.setAutoSendOrder(autoSendOrder);
+            // 设置是否自动派单
+            order.setAutoSendOrder(autoSendOrder);
+        } else {
+            // 设置是否自动派单 自取订单autoSendOrder设置为1
+            order.setAutoSendOrder(1);
+        }
     }
 
     /**