取消订单验证

Cui Zhi Feng

2024-10-09 cf405b8a592db661c189644e45b928f18abd96c7

 src/main/java/com/mzl/flower/schedule/ScheduleService.java

@@ -14,9 +14,9 @@
import com.mzl.flower.service.coupon.CouponRecordService;
import com.mzl.flower.service.coupon.CouponTemplateService2;
import com.mzl.flower.service.flower.FlowerCategoryService;
import com.mzl.flower.service.flower.FlowerService;
import com.mzl.flower.service.menber.impl.GrowthValueDealService;
import com.mzl.flower.service.payment.*;
import com.mzl.flower.thread.FlowerCategoryPriceThread;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -40,13 +40,13 @@
    private PartnerMapper partnerMapper;

    @Autowired
    private FlowerService flowerService;

    @Autowired
    private OrderMapper orderMapper;

    @Autowired
    private UserPaymentV3Service paymentV3Service;

    @Autowired
    private UserPaymentSybService paymentSybService;

    @Autowired
    private OrderService orderService;
@@ -75,23 +75,13 @@
    @Autowired
    private CouponTemplateService2 couponTemplateService2;

    @Scheduled(cron = "1 0/30 * * * ?")
    @Autowired
    private FlowerCategoryPriceThread thread;

    @Scheduled(cron = "1 1 0/2 * * ?")
    public void calculateAvePrice() {
        log.info("均价计算开始：" + DateFormatUtils.format(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
        List<FlowerCategory> cLs = categoryMapper.selectList(new QueryWrapper<FlowerCategory>()
                .isNotNull("parent_id"));
        if(cLs != null && cLs.size() > 0){
            List<Partner> ls = partnerMapper.selectList(new QueryWrapper<Partner>().eq("status", "P"));
            for(FlowerCategory c : cLs){
                flowerService.calculateCategoryDaily(c.getId(), null);

                if(ls != null && ls.size() > 0){
                    for(Partner p : ls){
                        flowerService.calculateCategoryDaily(c.getId(), p.getId());
                    }
                }
            }
        }
        thread.run();
        log.info("均价计算结束：" + DateFormatUtils.format(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
    }

@@ -127,10 +117,11 @@
                try {
                    LocalDateTime createdTime = o.getCreateTime().plusMinutes(5);
                    if (createdTime.isBefore(LocalDateTime.now())) {
                        boolean f = paymentV3Service.checkOrderStatus(o.getId());
                        /*boolean f = paymentV3Service.checkOrderStatus(o.getId());
                        if(!f){
                            paymentV3Service.cancelOrder(o.getId());
                        }
                        }*/
                        paymentSybService.cancelOrder(o.getId());
                    }
                } catch (Exception e) {
                    log.error(e.getMessage(), e);