1.订单表新增orderTypeExtra订单类型拓展字段；

2.prepareOrder时设置订单类型拓展字段值；
3.商户端条件查询所有订单时订单状态改为查订单类型拓展字段；
4.商户端条件查询所有订单时新增骑手真实姓名返回；

src/main/java/com/sqx/modules/order/entity/TbOrder.java

@@ -78,6 +78,9 @@ public class TbOrder implements Serializable {
     @ApiModelProperty("订单类型 1上门 2外卖")
     private Integer orderType;
 
+    @ApiModelProperty("订单类型拓展 1上门 2骑手配送 3商家配送")
+    private Integer orderTypeExtra;
+
 
     @ApiModelProperty("订单父id")
     private Long parentId;

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

@@ -686,6 +686,13 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
             // 店铺是否开启自动派单 0开启 1关闭
             Integer autoSendOrder = goodsShop.getAutoSendOrder() == 0 ? 0 : 1;
 
+            // 设置订单类型拓展 1上门 2骑手配送 3商家配送
+            if (autoSendOrder == 1) {
+                order.setOrderTypeExtra(3);
+            } else {
+                order.setOrderTypeExtra(2);
+            }
+
             // 店铺开启了配送费满减
             if (enableFullReductionFlag == 0) {
                 if(shopErrandMoney.doubleValue() > 0
@@ -726,6 +733,9 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
 
             // 设置是否自动派单
             order.setAutoSendOrder(autoSendOrder);
+        } else {
+            // 订单类型拓展 1上门 2骑手配送 3商家配送
+            order.setOrderTypeExtra(1);
         }
     }
 

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

@@ -84,7 +84,7 @@
     <select id="selectAllOrderAdmin" resultType="com.sqx.modules.order.entity.TbOrder">
         select tor.*, tu.avatar as avatar, gs.shop_name as shopName, gs.detailed_address as detailedAddress, gs.phone as
         shopPhone,
-        tiu.nick_name as riderNickName,tiu.phone as riderPhone,ti.indent_id as indentId,ti.is_rider as isRider,
+        tiu.user_name as riderNickName,tiu.phone as riderPhone,ti.indent_id as indentId,ti.is_rider as isRider,
         ti.rider_user_id as riderUserId, tcu.money as couponMoney
         from tb_order tor
         left join tb_user tu on tor.user_id = tu.user_id
@@ -118,7 +118,7 @@
             and tor.shop_id = #{shopId}
         </if>
         <if test="orderType!=null">
-            and tor.order_type = #{orderType}
+            and tor.order_type_extra = #{orderType}
         </if>
         <if test="startTime!=null and startTime!=''">
             and date_format(tor.create_time,'%Y-%m-%d') >= date_format(#{startTime},'%Y-%m-%d')