| @@ -16,6 +16,7 @@ public enum EnumOrderStatus { | |||||
| ORDER_STATUS_PRESSING(6, "砍价中"), | ORDER_STATUS_PRESSING(6, "砍价中"), | ||||
| ORDER_STATUS_PRESS_COMPLETE(7, "砍价完成"), | ORDER_STATUS_PRESS_COMPLETE(7, "砍价完成"), | ||||
| ORDER_STATUS_PRESS_OVERTIME(8, "砍价已过期"), | ORDER_STATUS_PRESS_OVERTIME(8, "砍价已过期"), | ||||
| ORDER_STATUS_PRESS_CANCEL(9, "砍价已取消") | |||||
| ; | ; | ||||
| public static EnumOrderStatus getEnum(Integer code) { | public static EnumOrderStatus getEnum(Integer code) { | ||||
| @@ -42,5 +42,6 @@ public interface WxOrderMapper extends CommonMapper<WxOrder, Long> { | |||||
| /**砍价*/ | /**砍价*/ | ||||
| List<WxOrderCouponPressVo> findListOfPress(WxOrder wxOrder); | List<WxOrderCouponPressVo> findListOfPress(WxOrder wxOrder); | ||||
| WxOrderCouponPressVo selectDetailOfPress(WxOrder wxOrder); | WxOrderCouponPressVo selectDetailOfPress(WxOrder wxOrder); | ||||
| void updateStatusByPressCouponId(WxOrder wxOrder); | |||||
| } | } | ||||
| @@ -155,4 +155,6 @@ public interface WxOrderService { | |||||
| PageInfo<WxOrderCouponPressVo> listPressVoAsPage(WxOrder record, Integer pageIndex, Integer pageSize); | PageInfo<WxOrderCouponPressVo> listPressVoAsPage(WxOrder record, Integer pageIndex, Integer pageSize); | ||||
| WxOrderCouponPressVo detailPressVo(WxOrder record); | WxOrderCouponPressVo detailPressVo(WxOrder record); | ||||
| void updateStatusByPressCouponId(Long couponId,String tenantId,int orderStatus); | |||||
| } | } | ||||
| @@ -17,6 +17,7 @@ import com.iformall.mapper.WxMerchantMapper; | |||||
| import com.iformall.service.WxCouponChannelService; | import com.iformall.service.WxCouponChannelService; | ||||
| import com.iformall.service.WxCouponSendService; | import com.iformall.service.WxCouponSendService; | ||||
| import com.iformall.service.WxCouponService; | import com.iformall.service.WxCouponService; | ||||
| import com.iformall.service.WxOrderService; | |||||
| import org.apache.commons.lang3.StringUtils; | import org.apache.commons.lang3.StringUtils; | ||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| @@ -46,6 +47,9 @@ public class WxCouponServiceImpl implements WxCouponService { | |||||
| @Autowired | @Autowired | ||||
| WxCouponSendService wxCouponSendService; | WxCouponSendService wxCouponSendService; | ||||
| @Autowired | |||||
| WxOrderService wxOrderService; | |||||
| @Override | @Override | ||||
| public PageInfo<WxCoupon> listAsPage(WxCoupon record, Integer pageIndex, Integer pageSize, Integer type) { | public PageInfo<WxCoupon> listAsPage(WxCoupon record, Integer pageIndex, Integer pageSize, Integer type) { | ||||
| @@ -226,6 +230,9 @@ public class WxCouponServiceImpl implements WxCouponService { | |||||
| .updateStatusByCouponId(record.getId(), record.getTenantId(), EnumCouponChannelStatus.STATUS_TAKE_OFFF.getCode()); | .updateStatusByCouponId(record.getId(), record.getTenantId(), EnumCouponChannelStatus.STATUS_TAKE_OFFF.getCode()); | ||||
| wxCouponSendService | wxCouponSendService | ||||
| .updateStatusByCouponId(record.getId(), record.getTenantId(), EnumCouponSendStatus.INVALID.getCode()); | .updateStatusByCouponId(record.getId(), record.getTenantId(), EnumCouponSendStatus.INVALID.getCode()); | ||||
| //下架所有已砍价券 | |||||
| wxOrderService.updateStatusByPressCouponId(record.getId(), record.getTenantId(), EnumOrderStatus.ORDER_STATUS_PRESS_CANCEL.getCode()); | |||||
| } | } | ||||
| record.setUpdateDate(new Date()); | record.setUpdateDate(new Date()); | ||||
| @@ -1145,4 +1145,14 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| return wxOrderMapper.selectDetailOfPress(record); | return wxOrderMapper.selectDetailOfPress(record); | ||||
| } | } | ||||
| @Override | |||||
| public void updateStatusByPressCouponId(Long couponId, String tenantId, int orderStatus) { | |||||
| WxOrder updateOrder = new WxOrder(); | |||||
| updateOrder.setTenantId(tenantId); | |||||
| updateOrder.setOrderStatus(orderStatus); | |||||
| updateOrder.setProductId(couponId); | |||||
| updateOrder.setUpdateDate(new Date()); | |||||
| wxOrderMapper.updateStatusByPressCouponId(updateOrder); | |||||
| } | |||||
| } | } | ||||
| @@ -185,6 +185,10 @@ | |||||
| co.id as coupon_order_id,co.coupon_order_status | co.id as coupon_order_id,co.coupon_order_status | ||||
| </sql> | </sql> | ||||
| <update id="updateStatusByPressCouponId" parameterType="com.iformall.domain.po.WxOrder"> | |||||
| update wx_order set order_status=#{orderStatus} where tenant_id=#{tenantId} and product_id=#{productId} and press_end_date is not null | |||||
| </update> | |||||
| <resultMap id="CVoResultMap" type="com.iformall.domain.vo.WxOrderCouponVo"> | <resultMap id="CVoResultMap" type="com.iformall.domain.vo.WxOrderCouponVo"> | ||||
| <id column="id" jdbcType="BIGINT" property="id"/> | <id column="id" jdbcType="BIGINT" property="id"/> | ||||