diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxBusinessController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxBusinessController.java index 3f0d53b90..a486059cf 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxBusinessController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxBusinessController.java @@ -31,6 +31,7 @@ public class WxBusinessController extends BaseController @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) public ResultData list(@ModelAttribute WxBusiness wxBusiness,Integer pageNum, Integer pageSize) { if (null == wxBusiness) wxBusiness = new WxBusiness(); + wxBusiness.setTenantId(getTenantId()); final PageInfo page = wxBusinessService.listAsPage(wxBusiness, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkAdmin/src/main/java/com/simple/schedule/CouponExpiringSchedule.java b/mallinkAdmin/src/main/java/com/simple/schedule/CouponExpiringSchedule.java index 55d345ad0..f986577e6 100644 --- a/mallinkAdmin/src/main/java/com/simple/schedule/CouponExpiringSchedule.java +++ b/mallinkAdmin/src/main/java/com/simple/schedule/CouponExpiringSchedule.java @@ -25,18 +25,12 @@ public class CouponExpiringSchedule { private final Logger logger = Logger.getLogger(CouponExpiringSchedule.class); - @Autowired - private WxMallMapper wxMallMapper; - @Autowired private WxCouponChannelMapper wxCouponChannelMapper; - @Autowired - private WxCouponMapper wxCouponMapper; - - @Scheduled(cron = "0 30 0 * * ?") // 每天凌晨 + @Scheduled(cron = "0 5 0 * * ?") // 每天凌晨00:05 //@Scheduled(cron = "*/10 * * * * ?") // 测试10秒中一次 @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) public void couponExpiringSchedule() { @@ -45,11 +39,12 @@ public class CouponExpiringSchedule { } - @Scheduled(cron = "0 5 0 * * ?") // 每天凌晨 + @Scheduled(cron = "0 5 0 * * ?") // 每天凌晨00:05 //@Scheduled(cron = "*/10 * * * * ?") // 测试10秒中一次 public void couponChannelExpiringSchedule() { wxCouponChannelMapper.offExpiriedCouponChannelByEndTime(); wxCouponChannelMapper.offExpiriedCouponChannelByValidDate(); + wxCouponChannelMapper.offExpiriedCouponChannelByCouponStatus(); } } \ No newline at end of file diff --git a/mallinkAdmin/src/main/java/com/simple/schedule/CouponOrderExpiringSchedule.java b/mallinkAdmin/src/main/java/com/simple/schedule/CouponOrderExpiringSchedule.java new file mode 100644 index 000000000..8e5582231 --- /dev/null +++ b/mallinkAdmin/src/main/java/com/simple/schedule/CouponOrderExpiringSchedule.java @@ -0,0 +1,53 @@ +package com.simple.schedule; + +import com.simple.common.ErrorCode; +import com.simple.common.ResultData; +import com.simple.config.PayProperty; +import com.simple.domain.po.WxAppinfo; +import com.simple.domain.po.WxCouponOrder; +import com.simple.domain.po.WxMerchantBUser; +import com.simple.domain.vo.WxCouponOrderCVo; +import com.simple.enums.EnumPayWay; +import com.simple.exception.MallinkException; +import com.simple.mapper.WxCouponChannelMapper; +import com.simple.mapper.WxCouponMapper; +import com.simple.mapper.WxCouponOrderMapper; +import com.simple.mapper.WxMallMapper; +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Component +public class CouponOrderExpiringSchedule { + + private final Logger logger = Logger.getLogger(CouponOrderExpiringSchedule.class); + + + @Autowired + private WxCouponOrderMapper wxCouponOrderMapper; + + @Autowired + private PayProperty payProperty; + + @Scheduled(cron = "0 5 0 * * ?") // 每天凌晨00:05 + //@Scheduled(cron = "*/10 * * * * ?") // 测试10秒中一次 + @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) + public void couponOrderExpiringSchedule() { + wxCouponOrderMapper.offExpiredCouponOrderByValidDate(); + } + + @Scheduled(cron = "0 5 0 * * ?") // 每天凌晨00:05 + //@Scheduled(cron = "*/10 * * * * ?") // 测试10秒中一次 + @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) + public void couponOrderRefundSchedule() { + + List list = wxCouponOrderMapper.findExpiredCouponOrderByValidDate(); + + } + +} \ No newline at end of file diff --git a/mallinkAdmin/src/main/java/com/simple/schedule/OrderExpireSchedule.java b/mallinkAdmin/src/main/java/com/simple/schedule/OrderExpiringSchedule.java similarity index 78% rename from mallinkAdmin/src/main/java/com/simple/schedule/OrderExpireSchedule.java rename to mallinkAdmin/src/main/java/com/simple/schedule/OrderExpiringSchedule.java index 4b6b8a194..09b842666 100644 --- a/mallinkAdmin/src/main/java/com/simple/schedule/OrderExpireSchedule.java +++ b/mallinkAdmin/src/main/java/com/simple/schedule/OrderExpiringSchedule.java @@ -1,15 +1,8 @@ package com.simple.schedule; -import com.simple.domain.po.WxCouponOrder; -import com.simple.domain.po.WxMall; -import com.simple.domain.po.WxMerchant; import com.simple.domain.po.WxOrder; import com.simple.enums.EnumOrderStatus; -import com.simple.mapper.WxCouponOrderMapper; -import com.simple.mapper.WxMallMapper; -import com.simple.mapper.WxMerchantMapper; import com.simple.mapper.WxOrderMapper; -import com.simple.service.WxDateAmountRecordService; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; @@ -17,17 +10,15 @@ import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import java.text.ParseException; -import java.text.SimpleDateFormat; import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @Component -public class OrderExpireSchedule { +public class OrderExpiringSchedule { - private final Logger logger = Logger.getLogger(OrderExpireSchedule.class); + private final Logger logger = Logger.getLogger(OrderExpiringSchedule.class); private final int TIME_OUT_VALUE = 15 * 60 * 1000; //15分钟 diff --git a/mallinkService/src/main/java/com/simple/mapper/WxCouponChannelMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxCouponChannelMapper.java index 8e3cd641a..96e0ba4eb 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxCouponChannelMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxCouponChannelMapper.java @@ -17,6 +17,8 @@ public interface WxCouponChannelMapper extends CommonMapper { int queryPriceTotal(@Param("tenantId")String tenantId, @Param("startTime") Date startTime, @Param("endTime")Date endTime); + + void offExpiredCouponOrderByValidDate(); + List findExpiredCouponOrderByValidDate(); } diff --git a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml index e5c7c516d..605e32716 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml @@ -155,8 +155,12 @@ update wx_coupon_channel, wx_coupon c SET cc.status = 1, cc.update_date = now() - where cc.status = 0 and cc.coupon_id = c.id and c.valid_type = 1 and valid_end_date < now(); + where cc.status = 0 and cc.coupon_id = c.id and c.valid_type = 1 and valid_end_date < now() + + update wx_coupon_channel, wx_coupon c SET cc.status = 1, cc.update_date = now() + where cc.status = 0 and cc.coupon_id = c.id and c.status = 1 + diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 7af3ebad5..109f0aafe 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -432,6 +432,14 @@ + + update wx_coupon_order SET coupon_order_status = 2, update_date = now() + where expired_time < now() and coupon_price = 0 and coupon_order_status = 0 + + - + \ No newline at end of file