Accept Merge Request #26: (dev-minio -> dev-lzl)

Merge Request: 合并

Created By: @刘子麟
Accepted By: @刘子麟
URL: https://chuanghaikeji.coding.net/p/moxuanyunshangwaimai/d/backend/git/merge/26?initial=true

src/main/java/com/sqx/modules/app/service/impl/UserMoneyDetailsServiceImpl.java

@@ -18,20 +18,16 @@ import com.sqx.modules.errand.entity.TbIndentSmsSendLog;
 import com.sqx.modules.errand.service.TbIndentService;
 import com.sqx.modules.errand.service.TbIndentSmsSendLogService;
 import com.sqx.modules.exportExecl.dto.AccountEntry;
-import com.sqx.modules.pay.controller.query.CashOutQueryDTO;
 import com.sqx.modules.pay.controller.query.WalletDetailQuery;
-import com.sqx.modules.pay.vo.CashOutVO;
 import com.sqx.modules.pay.vo.WalletDetailVO;
-import org.checkerframework.checker.units.qual.A;
-import org.springframework.beans.factory.annotation.Autowired;
 import com.sqx.modules.utils.excel.ExcelData;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.stream.Collectors;
 
 @Service
 public class UserMoneyDetailsServiceImpl extends ServiceImpl<UserMoneyDetailsDao, UserMoneyDetails> implements UserMoneyDetailsService {

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

@@ -2,6 +2,7 @@ package com.sqx.modules.order.controller;
 
 import com.sqx.common.utils.Result;
 import com.sqx.modules.order.dto.OrderFinishByShopDTO;
+import com.sqx.modules.order.dto.OrderQueryDto;
 import com.sqx.modules.order.entity.Evaluate;
 import com.sqx.modules.order.entity.TbOrder;
 import com.sqx.modules.order.service.AppOrderService;
@@ -44,11 +45,8 @@ 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 indentStatus, String reservationFlag,
-                                      @ApiParam("1上门 2骑手配送 3商家配送 不传查所有") Integer orderType,
-                                      String shopName, String riderPhone, String startTime, String endTime, String payStartTime, String payEndTime,Integer riderStationId) {
-        return appOrderService.selectAllOrderAdmin(page, limit, status, phone, shopId, userName, orderNumber, orderType, shopName, riderPhone, indentStatus, reservationFlag, startTime, endTime, payStartTime, payEndTime,riderStationId);
+    public Result selectAllOrderAdmin(OrderQueryDto queryDto) {
+        return appOrderService.selectAllOrderAdmin(queryDto);
     }
 
 //    @GetMapping("excelOrder")

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.sqx.datasource.annotation.DataSource;
 import com.sqx.modules.datacentre.query.DataCenterQuery;
+import com.sqx.modules.order.dto.OrderQueryDto;
 import com.sqx.modules.order.entity.TbOrder;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -26,10 +27,7 @@ public interface AppOrderDao extends BaseMapper<TbOrder> {
                                @Param("userName") String userName, @Param("orderNumber") String orderNumber,@Param("orderType") Integer orderType,@Param("shopName")String shopName);
 
     @DataSource("dynamic")
-    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("indentStatus") String indentStatus, @Param("reservationFlag") String reservationFlag,
-                                       @Param("startTime") String startTime,@Param("endTime") String endTime, @Param("payStartTime") String payStartTime, @Param("payEndTime") String payEndTime,@Param("riderStationId") Integer riderStationId);
+    IPage<TbOrder> selectAllOrderAdmin(Page<TbOrder> pages,@Param("query") OrderQueryDto queryDto);
     @DataSource("dynamic")
     List<TbOrder> excelAllOrderAdmin(@Param("status") Integer status,@Param("phone") String phone, @Param("shopId") Long shopId,
                                        @Param("userName") String userName, @Param("orderNumber") String orderNumber,

src/main/java/com/sqx/modules/order/dto/OrderQueryDto.java

@@ -0,0 +1,44 @@
+package com.sqx.modules.order.dto;
+
+import com.sqx.common.query.PageQuery;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+@Data
+public class OrderQueryDto extends PageQuery {
+
+    @ApiModelProperty("订单状态 0待结算 1待支付 2直接购买（未支付） 7商家待接单 8商家拒绝接单 6制作中  3待取餐/派送中 4已完成 5已取消 13外卖待接单")
+    private Integer status;
+    @ApiModelProperty("用户手机号")
+    private String phone;
+    @ApiModelProperty("商铺id")
+    private Long shopId;
+    @ApiModelProperty("用户姓名")
+    private String userName;
+    @ApiModelProperty("订单号")
+    private String orderNumber;
+    @ApiModelProperty("跑腿订单状态（0：已下单未支付1：超时关闭未支付订单2：已支付3：骑手已接单4：骑手已取货/购买6：订单已完成8：用户取消订单" +
+            "9：骑手取消订单10：平台下架订单 11：外卖订单下单后生成跑腿订单，只参与群聊，无法被接单")
+    private String indentStatus;
+    @ApiModelProperty("预约单标识;1是、0否")
+    private String reservationFlag;
+    @ApiModelProperty("订单类型 实际匹配的字段为order_type_extra 1上门 2骑手配送 3商家配送 不传查所有")
+    private Integer orderType;
+    @ApiModelProperty("商铺名称")
+    private String shopName;
+    @ApiModelProperty("骑手电话")
+    private String riderPhone;
+    @ApiModelProperty("订单创建开始时间")
+    private String startTime;
+    @ApiModelProperty("订单创建结束时间")
+    private String endTime;
+    @ApiModelProperty("订单支付开始时间")
+    private String payStartTime;
+    @ApiModelProperty("订单支付结束时间")
+    private String payEndTime;
+    @ApiModelProperty("骑手站点id")
+    private Integer riderStationId;
+    @ApiModelProperty("商铺类型id")
+    private String shopTypeId;
+}

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.sqx.common.utils.Result;
 import com.sqx.modules.order.dto.OrderFinishByShopDTO;
+import com.sqx.modules.order.dto.OrderQueryDto;
 import com.sqx.modules.order.entity.Evaluate;
 import com.sqx.modules.order.entity.OrderGoods;
 import com.sqx.modules.order.entity.TbOrder;
@@ -31,8 +32,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 indentStatus, String reservationFlag, String startTime, String endTime, String payStartTime, String payEndTime,Integer riderStationId);
+    Result selectAllOrderAdmin(OrderQueryDto queryDto);
 
     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

@@ -64,6 +64,7 @@ import com.sqx.modules.order.dao.AppOrderDao;
 import com.sqx.modules.order.dao.EvaluateDao;
 import com.sqx.modules.order.dao.OrderGoodsDao;
 import com.sqx.modules.order.dto.OrderFinishByShopDTO;
+import com.sqx.modules.order.dto.OrderQueryDto;
 import com.sqx.modules.order.entity.Evaluate;
 import com.sqx.modules.order.entity.OrderGoods;
 import com.sqx.modules.order.entity.TbOrder;
@@ -1297,12 +1298,9 @@ 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 indentStatus,
-                                      String reservationFlag, String startTime, String endTime, String payStartTime, String payEndTime,Integer riderStationId) {
-        Page<TbOrder> pages = new Page<>(page, limit);
-        IPage<TbOrder> tbOrderIPage = appOrderDao.selectAllOrderAdmin(pages, status, phone, shopId, userName, orderNumber,
-                orderType, shopName, riderPhone, indentStatus, reservationFlag, startTime,endTime, payStartTime, payEndTime,riderStationId);
+    public Result selectAllOrderAdmin(OrderQueryDto queryDto) {
+        Page<TbOrder> pages = new Page<>(queryDto.getPage(), queryDto.getLimit());
+        IPage<TbOrder> tbOrderIPage = appOrderDao.selectAllOrderAdmin(pages, queryDto);
         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/java/com/sqx/scheduler/order/OrderScheduler.java

@@ -1,7 +1,6 @@
 package com.sqx.scheduler.order;
 
 import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.sqx.modules.common.entity.CommonInfo;
@@ -182,13 +181,11 @@ public class OrderScheduler {
                     .isNotNull(TbOrder::getTimeOut);
             List<TbOrder> orderList = orderService.list(wrapper);
 
-
             if (orderList.size()==0) {
                 log.info("没有符合条件的超时订单，超时订单自动取消任务运行....");
                 return;
             }
 
-
             long time = new Date().getTime();
             ArrayList<TbOrder> orders = new ArrayList<>();
             for (TbOrder tbOrder : orderList) {

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

@@ -87,7 +87,8 @@
         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,
         apr.discount_amount as activityDiscountAmount, ai.title activityTitle,tiu.rider_station_id as riderStationId,
-        (select rs.station_name from rider_station rs where  rs.id =tiu.rider_station_id ) as stationName
+        (select rs.station_name from rider_station rs where  rs.id =tiu.rider_station_id ) as stationName,
+        (select st.shop_type_name from shop_type st where  st.id =gs.shop_type_id ) as shopTypeName
         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
@@ -97,53 +98,56 @@
         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}
+        <if test="query.riderPhone!=null and query.riderPhone!=''">
+            and tiu.phone =#{query.riderPhone}
         </if>
-        <if test="shopName!=null and shopName!=''">
-            and gs.shop_name like concat('%',#{shopName},'%')
+        <if test="query.shopName!=null and query.shopName!=''">
+            and gs.shop_name like concat('%',#{query.shopName},'%')
         </if>
-        <if test="userName!=null and userName!=''">
-            and tor.user_name like concat('%',#{userName},'%')
+        <if test="query.userName!=null and query.userName!=''">
+            and tor.user_name like concat('%',#{query.userName},'%')
         </if>
-        <if test="phone!=null and phone!=''">
-            and tor.phone like concat('%',#{phone},'%')
+        <if test="query.phone!=null and query.phone!=''">
+            and tor.phone like concat('%',#{query.phone},'%')
         </if>
-        <if test="orderNumber!=null and orderNumber!=''">
-            and tor.order_number = #{orderNumber}
+        <if test="query.orderNumber!=null and query.orderNumber!=''">
+            and tor.order_number = #{query.orderNumber}
         </if>
-        <if test="status!=null and status!=-1 and status!=1">
-            and tor.status = #{status}
+        <if test="query.status!=null and query.status!=-1 and query.status!=1">
+            and tor.status = #{query.status}
         </if>
-        <if test="status!=null and status==1">
+        <if test="query.status!=null and query.status==1">
             and tor.status in (1,2)
         </if>
-        <if test="shopId!=null">
-            and tor.shop_id = #{shopId}
+        <if test="query.shopId!=null">
+            and tor.shop_id = #{query.shopId}
         </if>
-        <if test="orderType!=null">
-            and tor.order_type_extra = #{orderType}
+        <if test="query.orderType!=null">
+            and tor.order_type_extra = #{query.orderType}
         </if>
-        <if test="indentStatus != null and indentStatus != ''">
-            and ti.indent_state = #{indentStatus}
+        <if test="query.indentStatus != null and query.indentStatus != ''">
+            and ti.indent_state = #{query.indentStatus}
         </if>
-        <if test="reservationFlag != null and reservationFlag !=''">
-            and tor.reservation_flag = #{reservationFlag}
+        <if test="query.reservationFlag != null and query.reservationFlag !=''">
+            and tor.reservation_flag = #{query.reservationFlag}
         </if>
-        <if test="startTime!=null and startTime!=''">
-            and date_format(tor.create_time,'%Y-%m-%d') >= date_format(#{startTime},'%Y-%m-%d')
+        <if test="query.startTime!=null and query.startTime!=''">
+            and date_format(tor.create_time,'%Y-%m-%d') >= date_format(#{query.startTime},'%Y-%m-%d')
         </if>
-        <if test="endTime!=null and endTime!='' ">
-            and date_format(tor.create_time,'%Y-%m-%d') &lt;= date_format(#{endTime},'%Y-%m-%d')
+        <if test="query.endTime!=null and query.endTime!='' ">
+            and date_format(tor.create_time,'%Y-%m-%d') &lt;= date_format(#{query.endTime},'%Y-%m-%d')
         </if>
-        <if test="payStartTime != null and payStartTime != ''">
-            and date_format(tor.pay_time,'%Y-%m-%d') >= date_format(#{payStartTime},'%Y-%m-%d')
+        <if test="query.payStartTime != null and query.payStartTime != ''">
+            and date_format(tor.pay_time,'%Y-%m-%d') >= date_format(#{query.payStartTime},'%Y-%m-%d')
         </if>
-        <if test="payEndTime != null and payEndTime != '' ">
-            and date_format(tor.pay_time,'%Y-%m-%d') &lt;= date_format(#{payEndTime},'%Y-%m-%d')
+        <if test="query.payEndTime != null and query.payEndTime != '' ">
+            and date_format(tor.pay_time,'%Y-%m-%d') &lt;= date_format(#{query.payEndTime},'%Y-%m-%d')
         </if>
-        <if test="riderStationId!=null and riderStationId!=''">
-            and tiu.rider_station_id=#{riderStationId}
+        <if test="query.riderStationId!=null and query.riderStationId!=''">
+            and tiu.rider_station_id=#{query.riderStationId}
+        </if>
+        <if test="query.shopTypeId!=null and query.shopTypeId!=''">
+            and gs.shop_type_id=#{query.shopTypeId}
         </if>
         order by tor.pay_time desc, tor.create_time desc
     </select>