Merge branch 'fixbug-autoSendOrder' into feature-riderOrder

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

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

@@ -664,6 +664,9 @@ 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){
@@ -683,8 +686,6 @@ 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;
 
             // 设置订单类型拓展 1上门 2骑手配送 3商家配送
             if (autoSendOrder == 1) {
@@ -731,12 +732,13 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
             order.setAddress(addressJson);
             order.setAddressId(addressId);
 
-            // 设置是否自动派单
-            order.setAutoSendOrder(autoSendOrder);
         } else {
             // 订单类型拓展 1上门 2骑手配送 3商家配送
             order.setOrderTypeExtra(1);
         }
+
+        // 设置是否自动派单
+        order.setAutoSendOrder(autoSendOrder);
     }
 
     /**