| @@ -72,7 +72,7 @@ public class OrderExpiringSchedule { | |||||
| Date pressExpireDate = new Date(curDate.getTime() - PRESS_TIME_OUT ); | Date pressExpireDate = new Date(curDate.getTime() - PRESS_TIME_OUT ); | ||||
| dateMap.put("type", EnumOrderType.COUPON.getCode()); | dateMap.put("type", EnumOrderType.COUPON.getCode()); | ||||
| dateMap.put("endDate", pressExpireDate); | dateMap.put("endDate", pressExpireDate); | ||||
| List<WxOrder> orderPresss = wxOrderMapper.findListOfUnCompletePressOrderByDate(dateMap); | |||||
| List<WxOrder> orderPresss = wxOrderMapper.findListOfCompleteUnPaidPressOrderByDate(dateMap); | |||||
| orderPresss.stream().forEach( o -> { | orderPresss.stream().forEach( o -> { | ||||
| try { | try { | ||||
| orderPressExpired(o); | orderPressExpired(o); | ||||
| @@ -17,7 +17,7 @@ public interface WxOrderMapper extends CommonMapper<WxOrder, Long> { | |||||
| List<WxOrder> findListOfUnpaidOrderByDate(Map dateMap); | List<WxOrder> findListOfUnpaidOrderByDate(Map dateMap); | ||||
| List<WxOrder> findListOfUnpaidPressOrderByDate(Map dateMap); | List<WxOrder> findListOfUnpaidPressOrderByDate(Map dateMap); | ||||
| List<WxOrder> findListOfUnCompletePressOrderByDate(Map dateMap); | |||||
| List<WxOrder> findListOfCompleteUnPaidPressOrderByDate(Map dateMap); | |||||
| List<WxOrderCouponVo> findListOfCUser(WxOrder wxOrder); | List<WxOrderCouponVo> findListOfCUser(WxOrder wxOrder); | ||||
| WxOrderCouponVo selectDetailOfCUser(WxOrder wxOrder); | WxOrderCouponVo selectDetailOfCUser(WxOrder wxOrder); | ||||
| @@ -164,11 +164,11 @@ | |||||
| </if> | </if> | ||||
| </select> | </select> | ||||
| <select id="findListOfUnCompletePressOrderByDate" parameterType="map" resultMap="BaseResultMap"> | |||||
| <select id="findListOfCompleteUnPaidPressOrderByDate" parameterType="map" resultMap="BaseResultMap"> | |||||
| select | select | ||||
| <include refid="allColumns"/> | <include refid="allColumns"/> | ||||
| from wx_order | from wx_order | ||||
| where press_end_date is not null and order_status = 6 | |||||
| where press_end_date is not null and order_status = 7 | |||||
| <if test="type != null"> | <if test="type != null"> | ||||
| AND type = #{type,jdbcType=TINYINT} | AND type = #{type,jdbcType=TINYINT} | ||||
| </if> | </if> | ||||
| @@ -176,7 +176,7 @@ | |||||
| AND unix_timestamp(`create_date`) > unix_timestamp(#{startDate,jdbcType=TIMESTAMP}) | AND unix_timestamp(`create_date`) > unix_timestamp(#{startDate,jdbcType=TIMESTAMP}) | ||||
| </if> | </if> | ||||
| <if test="endDate != null"> | <if test="endDate != null"> | ||||
| AND unix_timestamp(`press_end_date`) < unix_timestamp(#{endDate,jdbcType=TIMESTAMP}) | |||||
| AND unix_timestamp(`update_date`) < unix_timestamp(#{endDate,jdbcType=TIMESTAMP}) | |||||
| </if> | </if> | ||||
| </select> | </select> | ||||