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

gongzuming

2024-09-19 a768dc3daa04d35fedfbe75c0a59b9b2545b85c4

 src/main/java/com/mzl/flower/service/payment/UserPaymentV3Service.java

@@ -15,6 +15,7 @@
import com.mzl.flower.mapper.payment.*;
import com.mzl.flower.mapper.system.UserWechatMapper;
import com.mzl.flower.service.BaseService;
import com.mzl.flower.service.coupon.CouponRecordService;
import com.mzl.flower.service.flower.FlowerService;
import com.mzl.flower.service.point.PointGoodsService;
import com.mzl.flower.utils.UUIDGenerator;
@@ -110,6 +111,9 @@

    @Autowired
    private PointGoodsService pointGoodsService;

    @Autowired
    private CouponRecordService couponRecordService;

    /**
     * 微信预支付
@@ -452,7 +456,11 @@
        //恢复积分商品兑换券
        revertPointGoodsRecord(order.getId());

        //TODO 恢复优惠券
        //恢复优惠券
        String memberCouponId = order.getMemberCouponId();
        if(StringUtils.isNotEmpty(memberCouponId)) {
            couponRecordService.cancelCouponUsage(order.getId());
        }
    }

    private void revertPointGoodsRecord(String orderId){