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

gongzuming

2024-09-19 a768dc3daa04d35fedfbe75c0a59b9b2545b85c4

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

@@ -457,7 +457,10 @@
        revertPointGoodsRecord(order.getId());

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

    private void revertPointGoodsRecord(String orderId){