Procházet zdrojové kódy

Merge branch 'release_toaliyun_real' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real

release_toaliyun_real
zhengfangyuan před 3 roky
rodič
revize
f8cf9a5bc1
1 změnil soubory, kde provedl 4 přidání a 3 odebrání
  1. +4
    -3
      mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java

+ 4
- 3
mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java Zobrazit soubor

@@ -87,8 +87,8 @@ public class CouponOrderExpiringSchedule {


} }


@Scheduled(cron = "0 0 5 * * ?") // 每天凌晨00:05
//@Scheduled(cron = "0 */10 * * * ?") // 测试10秒中一次
// @Scheduled(cron = "0 0 5 * * ?") // 每天凌晨00:05
@Scheduled(cron = "0 */10 * * * ?") // 测试10秒中一次
public void couponOrderRefundSchedule() { public void couponOrderRefundSchedule() {
CouponOrderExpiringSchedule proxy = (CouponOrderExpiringSchedule) AopContext.currentProxy(); CouponOrderExpiringSchedule proxy = (CouponOrderExpiringSchedule) AopContext.currentProxy();
List<WxMall> malls = getMalls(); List<WxMall> malls = getMalls();
@@ -205,7 +205,8 @@ public class CouponOrderExpiringSchedule {
wxPayOrder.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); wxPayOrder.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode());
wxPayOrder = wxPayOrderMapper.selectOne(new QueryWrapper(wxPayOrder)); wxPayOrder = wxPayOrderMapper.selectOne(new QueryWrapper(wxPayOrder));


if (wxPayOrder != null) {
//todo EnumPayShare.YES.getCode().equals(wxPayOrder.getShare()) 临时判断只有分账的才去分账
if (wxPayOrder != null && EnumPayShare.YES.getCode().equals(wxPayOrder.getShare())) {
WxSharingOrderDto wxSharingOrderDto = new WxSharingOrderDto(); WxSharingOrderDto wxSharingOrderDto = new WxSharingOrderDto();
wxSharingOrderDto.setCUserId(wxPayOrder.getCUserId()); wxSharingOrderDto.setCUserId(wxPayOrder.getCUserId());
wxSharingOrderDto.setMerchantId(0L); wxSharingOrderDto.setMerchantId(0L);


Načítá se…
Zrušit
Uložit