Accept Merge Request #7: (dev-wxl -> dev-feat)

Merge Request: 修改订单类型为订单类型拓展

Created By: @万新亮
Accepted By: @万新亮
URL: https://chuanghaikeji.coding.net/p/moxuanyunshangwaimai/d/backend/git/merge/7?initial=true

src/main/java/com/sqx/modules/exportExecl/controller/ExportExeclController.java

@@ -51,7 +51,7 @@ public class ExportExeclController {
     private final SftpUtil sftpUtil;
 
     @GetMapping("excelOrder")
-    @ApiOperation("导出卡密列表")
+    @ApiOperation("导出订单列表")
     public Result excelOrder(Integer status, String phone, Long shopId, String userName,
                              String orderNumber, Integer orderType, String shopName, String riderPhone,
                              String startTime, String endTime, String userId, String payStartTime, String payEndTime) throws Exception{
@@ -71,7 +71,7 @@ public class ExportExeclController {
 //        if(shopId!=null){stringBuffer.append("："+shopId+";");}
         if(userName!=null&&!userName.trim().equals("")){stringBuffer.append("昵称："+userName+";");}
         if(orderNumber!=null&&!orderNumber.trim().equals("")){stringBuffer.append("订单号："+orderNumber+";");}
-        if(orderType!=null){stringBuffer.append("订单类型："+(orderType==1?"上门":"外卖")+";");}
+        if(orderType!=null){stringBuffer.append("订单类型："+(orderType==1?"到店取餐":(orderType==2?"骑手配送":"商家配送"))+";");}
         if(shopName!=null&&!shopName.trim().equals("")){stringBuffer.append("商铺名称："+shopName+";");}
         if(riderPhone!=null&&!riderPhone.trim().equals("")){stringBuffer.append("骑手手机号："+riderPhone+";");}
         if(startTime!=null&&!startTime.trim().equals("")){stringBuffer.append("开始时间："+startTime+";");}

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

@@ -1322,10 +1322,12 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
                     .append("\n").append("店铺电话：").append(StringUtils.isNotBlank(order.getShopPhone())?order.getShopPhone():"")
                     .append("\n").append("店铺地址：").append(StringUtils.isNotBlank(order.getDetailedAddress())?order.getDetailedAddress():"");
             row.add(stringBuffer.toString());
-            if(order.getOrderType()!=null && order.getOrderType()==1){
+            if(order.getOrderTypeExtra()!=null && order.getOrderTypeExtra()==1){
                 row.add("到店取餐");
-            }else if(order.getOrderType()!=null && order.getOrderType()==2){
+            }else if(order.getOrderTypeExtra()!=null && order.getOrderTypeExtra()==2){
                 row.add("外卖配送");
+            }else if(order.getOrderTypeExtra()!=null && order.getOrderTypeExtra()==3){
+                row.add("商家配送");
             }else{
                 row.add("");
             }

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

@@ -186,7 +186,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')
@@ -235,7 +235,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')