Merge remote-tracking branch 'origin/master-v2'

gongzuming

2024-09-19 a768dc3daa04d35fedfbe75c0a59b9b2545b85c4

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

@@ -2,11 +2,13 @@

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.mzl.flower.constant.Constants;
import com.mzl.flower.dto.response.member.MemberGrowthRecordVO;
import com.mzl.flower.entity.flower.FlowerCategory;
import com.mzl.flower.entity.partner.Partner;
import com.mzl.flower.entity.payment.Order;
import com.mzl.flower.entity.payment.Transfer;
import com.mzl.flower.mapper.flower.FlowerCategoryMapper;
import com.mzl.flower.mapper.member.MemberGrowthRecordMapper;
import com.mzl.flower.mapper.partner.PartnerMapper;
import com.mzl.flower.mapper.payment.OrderMapper;
import com.mzl.flower.service.coupon.CouponRecordService;
@@ -65,6 +67,9 @@

    @Autowired
    private CouponRecordService couponRecordService;

    @Autowired
    private MemberGrowthRecordMapper memberGrowthRecordMapper;

    @Scheduled(cron = "1 0/30 * * * ?")
    public void calculateAvePrice() {
@@ -204,7 +209,12 @@
        if(!CollectionUtils.isEmpty(orderList)){
            orderList.forEach(o->{
                try {
                    growthValueDealService.deductionGrowthValue(o);
                    LocalDateTime now = LocalDateTime.now();
                    LocalDate nowDate = now.toLocalDate();
                    List<MemberGrowthRecordVO> memberGrowthRecordVOS = memberGrowthRecordMapper.selectDowngradingByUserId(o.getCreateBy(), nowDate);
                    if (CollectionUtils.isEmpty(memberGrowthRecordVOS)) {
                        growthValueDealService.deductionGrowthValue(o);
                    }
                } catch (Exception e) {
                    // 记录错误信息，例如将错误信息写入日志
                    log.info("处理订单 " + o.getId() + " 时出错： " + e.getMessage());