Merge remote-tracking branch 'origin/2.0' into 2.0

无关风月

2025-08-22 f38d69d70e3e126d2f58971d0b4854f2aa144fc1

 cloud-server-account/src/main/java/com/dsh/account/service/impl/VipPaymentServiceImpl.java

@@ -273,6 +273,7 @@
        if (StringUtils.hasLength(couponJson)) {
            grantCoupon.setCouponJson(couponJson);
        }
        grantCoupon.setVipId(vipPayment1.getVipId());
        grantCoupon.setUserId(vipPayment1.getAppUserId());
        grantCoupon.setVipPaymentId(vipPayment1.getId());
        String ticketJson = vipPayment1.getTicketJson();