diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java index 0052426ce..8f65f763d 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java @@ -46,6 +46,14 @@ public class OrderExpiringSchedule { orderCoupons.parallelStream().forEach( o -> { orderExpired(o); }); + + // 砍价相关订单 + dateMap.put("type", EnumOrderType.COUPON.getCode()); + dateMap.put("endDate", curDate); + List orderPresss = wxOrderMapper.findListOfUnpaidPressOrderByDate(dateMap); + orderPresss.parallelStream().forEach( o -> { + orderExpired(o); + }); } @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java index 7a5dca95c..5d5685357 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java @@ -17,6 +17,7 @@ public interface WxOrderMapper extends CommonMapper { Integer dayCountList(WxOrder wxOrder); List findListOfUnpaidOrderByDate(Map dateMap); + List findListOfUnpaidPressOrderByDate(Map dateMap); List findListOfCUser(WxOrder wxOrder); WxOrderCouponVo selectDetailOfCUser(WxOrder wxOrder); diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index 2917a3be5..d9119b28d 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -118,7 +118,7 @@ select from wx_order - where order_status = '0' + where order_status = '0' and press_end_date is null AND type = #{type,jdbcType=TINYINT} @@ -130,6 +130,22 @@ + + o.id,o.order_number,o.tenant_id,o.c_user_id,o.product_id,o.payment_type,o.payment,o.payment_time,o.order_status,o.create_date,o.update_date,