| @@ -140,14 +140,26 @@ public class OrderExpiringSchedule { | |||||
| // 拼团取消 | // 拼团取消 | ||||
| WxOrder order = new WxOrder(); | WxOrder order = new WxOrder(); | ||||
| order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_UNPAID.getCode()); | |||||
| wxOrderMapper.selectList(new QueryWrapper(order)).stream().forEach(o -> { | |||||
| // order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_UNPAID.getCode()); | |||||
| // wxOrderMapper.selectList(new QueryWrapper(order)).stream().forEach(o -> { | |||||
| // try { | |||||
| // proxy.orderGroupExpired((WxOrder) o,true,true,payWay); | |||||
| // } catch (Exception e) { | |||||
| // logger.error("拼团取消失败" + e.getMessage()); | |||||
| // } | |||||
| // }); | |||||
| Date groupExpireDate = new Date(curDate.getTime() - NORMAL_TIME_OUT ); | |||||
| dateMap.put("type", EnumOrderType.COUPON.getCode()); | |||||
| dateMap.put("endDate", groupExpireDate); | |||||
| List<WxOrder> orderGroups = wxOrderMapper.findListOfUnpaidGroupOrderByDate(dateMap); | |||||
| orderGroups.stream().forEach( o -> { | |||||
| try { | try { | ||||
| proxy.orderGroupExpired((WxOrder) o,true,true,payWay); | |||||
| proxy.orderGroupExpired(o,true,true,payWay); | |||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| logger.error("拼团取消失败" + e.getMessage()); | |||||
| logger.error("砍价券支付过期失败" + e.getMessage()); | |||||
| } | } | ||||
| }); | }); | ||||
| //更新拼团过期状态 | //更新拼团过期状态 | ||||
| wxOrderMapper.updateOrderStatusForGroup(); | wxOrderMapper.updateOrderStatusForGroup(); | ||||
| @@ -21,6 +21,8 @@ public interface WxOrderMapper extends CommonMapper<WxOrder, Long> { | |||||
| List<WxOrder> findListOfUnpaidPressOrderByDate(Map dateMap); | List<WxOrder> findListOfUnpaidPressOrderByDate(Map dateMap); | ||||
| List<WxOrder> findListOfCompleteUnPaidPressOrderByDate(Map dateMap); | List<WxOrder> findListOfCompleteUnPaidPressOrderByDate(Map dateMap); | ||||
| List<WxOrder> findListOfUnpaidGroupOrderByDate(Map dateMap); | |||||
| List<WxOrderCouponVo> findListOfCUser(WxOrder wxOrder); | List<WxOrderCouponVo> findListOfCUser(WxOrder wxOrder); | ||||
| List<WxOrderCouponVo> selectDetailOfCUser(WxOrder wxOrder); | List<WxOrderCouponVo> selectDetailOfCUser(WxOrder wxOrder); | ||||
| @@ -218,6 +218,22 @@ | |||||
| AND unix_timestamp(`update_date`) < unix_timestamp(#{endDate,jdbcType=TIMESTAMP}) | AND unix_timestamp(`update_date`) < unix_timestamp(#{endDate,jdbcType=TIMESTAMP}) | ||||
| </if> | </if> | ||||
| </select> | </select> | ||||
| <select id="findListOfUnpaidGroupOrderByDate" parameterType="map" resultMap="BaseResultMap"> | |||||
| select | |||||
| <include refid="allColumns"/> | |||||
| from wx_order | |||||
| where order_status = 15 and press_end_date is null | |||||
| <if test="type != null"> | |||||
| AND type = #{type,jdbcType=TINYINT} | |||||
| </if> | |||||
| <if test="startDate != null"> | |||||
| AND unix_timestamp(`create_date`) > unix_timestamp(#{startDate,jdbcType=TIMESTAMP}) | |||||
| </if> | |||||
| <if test="endDate != null"> | |||||
| AND unix_timestamp(`create_date`) < unix_timestamp(#{endDate,jdbcType=TIMESTAMP}) | |||||
| </if> | |||||
| </select> | |||||
| <sql id="allCUserOrderDetailColumns"> | <sql id="allCUserOrderDetailColumns"> | ||||