管理端订单列表新增活动优惠金额、活动名称等字段返回、新增跑腿订单状态入参

src/main/java/com/sqx/modules/order/controller/OrderController.java

@@ -45,10 +45,10 @@ public class OrderController extends AbstractController {
     @ApiOperation("条件查询所有订单(管理端)")
     @GetMapping(value = "selectAllOrderAdmin")
     public Result selectAllOrderAdmin(Integer page, Integer limit, Integer status, String phone, Long shopId, String userName,
-                                      String orderNumber,
+                                      String orderNumber, String indentStatus,
                                       @ApiParam("1上门 2骑手配送 3商家配送 不传查所有") Integer orderType,
                                       String shopName, String riderPhone, String startTime, String endTime, String payStartTime, String payEndTime){
-        return appOrderService.selectAllOrderAdmin(page, limit, status, phone, shopId, userName, orderNumber, orderType, shopName, riderPhone, startTime, endTime, payStartTime, payEndTime);
+        return appOrderService.selectAllOrderAdmin(page, limit, status, phone, shopId, userName, orderNumber, orderType, shopName, riderPhone, indentStatus, startTime, endTime, payStartTime, payEndTime);
     }
 
     @GetMapping("excelOrder")

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

@@ -26,7 +26,7 @@ public interface AppOrderDao extends BaseMapper<TbOrder> {
 
     IPage<TbOrder> selectAllOrderAdmin(Page<TbOrder> pages,@Param("status") Integer status,@Param("phone") String phone, @Param("shopId") Long shopId,
                                @Param("userName") String userName, @Param("orderNumber") String orderNumber,@Param("orderType") Integer orderType,
-                                       @Param("shopName")String shopName,@Param("riderPhone") String riderPhone,
+                                       @Param("shopName")String shopName,@Param("riderPhone") String riderPhone, @Param("indentStatus") String indentStatus,
                                        @Param("startTime") String startTime,@Param("endTime") String endTime, @Param("payStartTime") String payStartTime, @Param("payEndTime") String payEndTime);
 
     List<TbOrder> excelAllOrderAdmin(@Param("status") Integer status,@Param("phone") String phone, @Param("shopId") Long shopId,

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

@@ -206,6 +206,15 @@ public class TbOrder implements Serializable {
     private String indentNumber;
 
     @TableField(exist = false)
+    private String indentState;
+
+    @TableField(exist = false)
+    private BigDecimal activityDiscountAmount;
+
+    @TableField(exist = false)
+    private String activityTitle;
+
+    @TableField(exist = false)
     private Long riderUserId;
 
     @TableField(exist = false)

src/main/java/com/sqx/modules/order/service/AppOrderService.java

@@ -29,7 +29,7 @@ public interface AppOrderService extends IService<TbOrder> {
     Result selectAllOrder(Integer page, Integer limit, Integer status, String phone, Long shopId, String userName, String orderNumber, Integer orderType,String shopName);
 
     Result selectAllOrderAdmin(Integer page, Integer limit, Integer status, String phone, Long shopId, String userName,
-                               String orderNumber, Integer orderType,String shopName,String riderPhone, String startTime, String endTime, String payStartTime, String payEndTime);
+                               String orderNumber, Integer orderType,String shopName,String riderPhone, String indentStatus, String startTime, String endTime, String payStartTime, String payEndTime);
 
     ExcelData excelAllOrderAdmin(Integer status, String phone, Long shopId,
                                  String userName, String orderNumber, Integer orderType, String shopName,

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

@@ -1233,10 +1233,11 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
 
     @Override
     public Result selectAllOrderAdmin(Integer page, Integer limit, Integer status, String phone, Long shopId, String userName,
-                                      String orderNumber, Integer orderType, String shopName, String riderPhone, String startTime, String endTime, String payStartTime, String payEndTime) {
+                                      String orderNumber, Integer orderType, String shopName, String riderPhone, String indentStatus,
+                                      String startTime, String endTime, String payStartTime, String payEndTime) {
         Page<TbOrder> pages = new Page<>(page, limit);
         IPage<TbOrder> tbOrderIPage = appOrderDao.selectAllOrderAdmin(pages, status, phone, shopId, userName, orderNumber,
-                orderType, shopName, riderPhone,startTime,endTime, payStartTime, payEndTime);
+                orderType, shopName, riderPhone, indentStatus, startTime,endTime, payStartTime, payEndTime);
         for (int i = 0; i < tbOrderIPage.getRecords().size(); i++) {
             List<OrderGoods> orderGoodsList = orderGoodsDao.selectList(new QueryWrapper<OrderGoods>()
                     .eq("order_id", tbOrderIPage.getRecords().get(i).getOrderId()));

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

@@ -85,13 +85,16 @@
         select tor.*, tu.avatar as avatar, gs.shop_name as shopName, gs.detailed_address as detailedAddress, gs.phone as
         shopPhone,
         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
+        ti.rider_user_id as riderUserId, tcu.money as couponMoney,
+        apr.discount_amount as activityDiscountAmount, ai.title activityTitle
         from tb_order tor
         left join tb_user tu on tor.user_id = tu.user_id
         left join goods_shop gs on tor.shop_id = gs.shop_id
         left join tb_indent ti on tor.order_id = ti.order_id
         left join tb_user tiu on tiu.user_id = ti.rider_user_id
         left join tb_coupon_user tcu on tor.coupon_id = tcu.id
+        left join activity_part_record apr on apr.order_id = tor.order_id
+        left join activity ai on ai.id = apr.activity_id
         where 1 = 1
         <if test="riderPhone!=null and riderPhone!=''">
             and tiu.phone =#{riderPhone}
@@ -120,6 +123,9 @@
         <if test="orderType!=null">
             and tor.order_type_extra = #{orderType}
         </if>
+        <if test="indentStatus != null and indentStatus != ''">
+            ti.indent_state = #{indentStatus}
+        </if>
         <if test="startTime!=null and startTime!=''">
             and date_format(tor.create_time,'%Y-%m-%d') >= date_format(#{startTime},'%Y-%m-%d')
         </if>