From 3ed0363ef13fb087907017e816cf0d352f0ee7e3 Mon Sep 17 00:00:00 2001 From: Jack <46790855@qq.com> Date: Fri, 24 Oct 2025 15:57:01 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=AD=97=E6=AE=B5=E8=B5=B7=E5=90=8D?= =?UTF-8?q?=E9=94=99=E8=AF=AF=EF=BC=8C=E5=95=86=E5=AE=B6=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E4=BB=8Eorder=5Fid=20desc=20=E6=94=B9?= =?UTF-8?q?=E6=88=90=20=E4=B8=8B=E5=8D=95=E6=97=B6=E9=97=B4=E5=80=92?= =?UTF-8?q?=E5=BA=8F=E6=8E=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/order/dto/MchOrderInfoDTO.java | 12 ++ .../admin/ShopOrderBaseController.java | 1 + .../order/mapper/ShopOrderBaseMapper.java | 6 +- .../order/service/ShopOrderBaseService.java | 6 +- .../impl/ShopOrderBaseServiceImpl.java | 129 ++++-------------- .../mapper/order/ShopOrderBaseMapper.xml | 19 ++- 6 files changed, 59 insertions(+), 114 deletions(-) diff --git a/mall-common/src/main/java/com/suisung/mall/common/modules/order/dto/MchOrderInfoDTO.java b/mall-common/src/main/java/com/suisung/mall/common/modules/order/dto/MchOrderInfoDTO.java index 16d9451d..10666a79 100644 --- a/mall-common/src/main/java/com/suisung/mall/common/modules/order/dto/MchOrderInfoDTO.java +++ b/mall-common/src/main/java/com/suisung/mall/common/modules/order/dto/MchOrderInfoDTO.java @@ -95,4 +95,16 @@ public class MchOrderInfoDTO implements Serializable { private Integer is_deny_return; @ApiModelProperty(value = "异常订单操作流程,0-可操作自行发货，1-可操作订单完成，2-订单完成不可操作") private String operate_flag; + + @ApiModelProperty(value = "订单配送预约状态：1-立即配送；2-预约配送") + private Integer booking_state; + + @ApiModelProperty(value = "预约送达起始时间，格式如：yyyy-MM-dd HH:mm:ss") + private Date booking_begin_time; + + @ApiModelProperty(value = "预约送达截止时间，格式如：yyyy-MM-dd HH:mm:ss") + private Date booking_end_time; + + @ApiModelProperty(value = "预订单到达时间戳（秒）") + private Long booking_at; } diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/controller/admin/ShopOrderBaseController.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/controller/admin/ShopOrderBaseController.java index 5738c57a..42a18bbb 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/order/controller/admin/ShopOrderBaseController.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/controller/admin/ShopOrderBaseController.java @@ -342,6 +342,7 @@ public class ShopOrderBaseController extends BaseControllerImpl { params.getInt("delivery"), status, params.getInt("logistics_status"), + params.getInt("booking_state"), mchOrderExpireSeconds, params.getLong("begin_time"), params.getLong("end_time"), diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/mapper/ShopOrderBaseMapper.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/mapper/ShopOrderBaseMapper.java index cca3395f..e810443f 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/order/mapper/ShopOrderBaseMapper.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/mapper/ShopOrderBaseMapper.java @@ -71,13 +71,14 @@ public interface ShopOrderBaseMapper extends BaseMapper { * @param delivery 配送方式：1-同城配送；2-物流配送 * @param status 同城配送订单状态（delivery=1时才生效）：无值 or 0-全部订单；1-进行中订单；2-异常（超时）订单；3-退款订单；9-已完成订单 * @param logisticsStatus 普通快递订单状态（delivery=2时才生效）：无值 or 0-全部订单；1-待支付订单；2-待发货订单；3-待接收订单；9-已完成订单 + * @param bookingState 订单配送预约状态：1-立即配送；2-预约配送 * @param expireSeconds 配送超时的秒数，单位秒 * @param beginTime 开始时间戳（13位毫秒级别） * @param endTime 截止时间戳（13位毫秒级别） * @param page 分页参数 * @return */ - IPage selectMchOrderPageList(@Param("storeId") Integer storeId, @Param("keyword") String keyword, @Param("delivery") Integer delivery, @Param("status") Integer status, @Param("logisticsStatus") Integer logisticsStatus, @Param("expireSeconds") Long expireSeconds, @Param("beginTime") Long beginTime, @Param("endTime") Long endTime, IPage page); + IPage selectMchOrderPageList(@Param("storeId") Integer storeId, @Param("keyword") String keyword, @Param("delivery") Integer delivery, @Param("status") Integer status, @Param("logisticsStatus") Integer logisticsStatus, @Param("bookingState") Integer bookingState, @Param("expireSeconds") Long expireSeconds, @Param("beginTime") Long beginTime, @Param("endTime") Long endTime, IPage page); /** @@ -97,12 +98,13 @@ public interface ShopOrderBaseMapper extends BaseMapper { * @param delivery 配送方式：1-同城配送；2-物流配送 * @param status 同城配送订单状态（delivery=1时才生效）：无值 or 0-全部订单；1-进行中订单；2-异常（超时）订单；3-退款订单；9-已完成订单 * @param logisticsStatus 普通快递订单状态（delivery=2时才生效）：无值 or 0-全部订单；1-待支付订单；2-待发货订单；3-待接收订单；9-已完成订单 + * @param bookingState 订单配送预约状态：1-立即配送；2-预约配送 * @param expireSeconds 配送超时的秒数，单位秒 * @param beginTime 开始时间戳（13位毫秒级别） * @param endTime 截止时间戳（13位毫秒级别） * @return */ - Long countMchOrderByCondition(@Param("storeId") Integer storeId, @Param("keyword") String keyword, @Param("delivery") Integer delivery, @Param("status") Integer status, @Param("logisticsStatus") Integer logisticsStatus, @Param("expireSeconds") Long expireSeconds, @Param("beginTime") Long beginTime, @Param("endTime") Long endTime); + Long countMchOrderByCondition(@Param("storeId") Integer storeId, @Param("keyword") String keyword, @Param("delivery") Integer delivery, @Param("status") Integer status, @Param("logisticsStatus") Integer logisticsStatus, @Param("bookingState") Integer bookingState, @Param("expireSeconds") Long expireSeconds, @Param("beginTime") Long beginTime, @Param("endTime") Long endTime); /** diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/ShopOrderBaseService.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/ShopOrderBaseService.java index 544ea9d8..d3b7965d 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/ShopOrderBaseService.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/ShopOrderBaseService.java @@ -544,6 +544,7 @@ public interface ShopOrderBaseService extends IBaseService { * @param delivery 配送方式：1-同城配送；2-物流配送 * @param status 同城配送订单状态（delivery=1时才生效）：无值 or 0-全部订单；1-进行中订单；2-异常（超时）订单；3-退款订单；9-已完成订单 * @param logisticsStatus 普通快递订单状态（delivery=2时才生效）：无值 or 0-全部订单；1-待支付订单；2-待发货订单；3-待接收订单；9-已完成订单 + * @param bookingState 订单配送预约状态：1-立即配送；2-预约配送 * @param expireSeconds 配送超时的秒数，单位秒 * @param beginTime 开始时间戳（13位毫秒级别） * @param endTime 截止时间戳（13位毫秒级别） @@ -551,7 +552,7 @@ public interface ShopOrderBaseService extends IBaseService { * @param pageSize 页大小 * @return */ - IPage selectMchOrderPageList(Integer storeId, String keyword, Integer delivery, Integer status, Integer logisticsStatus, Long expireSeconds, Long beginTime, Long endTime, Integer pageNum, Integer pageSize); + IPage selectMchOrderPageList(Integer storeId, String keyword, Integer delivery, Integer status, Integer logisticsStatus, Integer bookingState, Long expireSeconds, Long beginTime, Long endTime, Integer pageNum, Integer pageSize); /** * 商家版根据条件查询订单条数（新） @@ -561,12 +562,13 @@ public interface ShopOrderBaseService extends IBaseService { * @param delivery 配送方式：1-同城配送；2-物流配送 * @param status 同城配送订单状态（delivery=1时才生效）：无值 or 0-全部订单；1-进行中订单；2-异常（超时）订单；3-退款订单；9-已完成订单 * @param logisticsStatus 普通快递订单状态（delivery=2时才生效）：无值 or 0-全部订单；1-待支付订单；2-待发货订单；3-待接收订单；9-已完成订单 + * @param bookingState 订单配送预约状态：1-立即配送；2-预约配送 * @param expireSeconds 配送超时的秒数，单位秒 * @param beginTime 开始时间戳（13位毫秒级别） * @param endTime 截止时间戳（13位毫秒级别） * @return */ - Long countMchOrderByCondition(Integer storeId, String keyword, Integer delivery, Integer status, Integer logisticsStatus, Long expireSeconds, Long beginTime, Long endTime); + Long countMchOrderByCondition(Integer storeId, String keyword, Integer delivery, Integer status, Integer logisticsStatus, Integer bookingState, Long expireSeconds, Long beginTime, Long endTime); /** * 获取商家订单详情 diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java index 7b46bced..9e463def 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java @@ -573,10 +573,16 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl selectMchOrderPageList(Integer storeId, String keyword, Integer delivery, Integer status, Integer logisticsStatus, Long expireSeconds, Long beginTime, Long endTime, Integer pageNum, Integer pageSize) { + public IPage selectMchOrderPageList(Integer storeId, String keyword, Integer delivery, Integer status, Integer logisticsStatus, Integer bookingState, Long expireSeconds, Long beginTime, Long endTime, Integer pageNum, Integer pageSize) { try { // 初始化分页对象 Page page = new Page<>(pageNum, pageSize); // 查询订单基础数据 IPage pageList = shopOrderBaseMapper.selectMchOrderPageList( - storeId, keyword, delivery, status, logisticsStatus, expireSeconds, beginTime, endTime, page); + storeId, keyword, delivery, status, logisticsStatus, bookingState, expireSeconds, beginTime, endTime, page); if (CollUtil.isEmpty(pageList.getRecords())) { return pageList; @@ -9036,14 +9043,15 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl + + + + + @@ -752,6 +757,11 @@ AND oi.order_time #{end_time} + + + + AND oi.booking_state = #{bookingState} + @@ -788,6 +798,10 @@ 2013, 2014, 2020, 2030, 2040))>1,2,1) AS is_new_buyer, oi.payment_time, + oi.booking_state, + oi.booking_begin_time, + oi.booking_end_time, + oi.booking_at, od.order_shipping_fee, IFNULL(od.order_shipping_fee_inner, 0) as order_shipping_fee_inner, IFNULL(od.lkl_fee, 0) as lkl_fee, @@ -843,7 +857,6 @@ osf.feed -