无关风月
11 小时以前 4c9035836c18886883d3f69d8443c53d15b068fc
cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java
@@ -359,12 +359,15 @@
                    vipDetail.setCouponId(Integer.valueOf(id));
                    vipDetail.setUserCouponId(userCoupon.getId());
                    vipDetailService.save(vipDetail);
                    userCoupon.setVipDetailId(vipDetail.getId());
                    userCoupon.setUserId(null);
                    userCouponService.updateById(userCoupon);
                }
            }
        }
        String ticketJson = grantCoupon.getTicketJson();
        if (StringUtils.hasLength(ticketJson)) {
            // 赠送优惠券
            // 赠送门票
            JSONArray objects = JSON.parseArray(ticketJson);
            for (Object object : objects) {
                JSONObject jsonObject = (JSONObject) object;
@@ -387,7 +390,7 @@
                    vipDetail.setAppUserId(grantCoupon.getUserId());
                    vipDetail.setStatus(1);
                    vipDetail.setInsertTime(new Date());
                    vipDetail.setVipId(grantCoupon.getVipPaymentId());
                    vipDetail.setVipId(grantCoupon.getVipId());
                    vipDetail.setType(2);
                    vipDetail.setVipPaymentId(grantCoupon.getVipPaymentId());
                    vipDetailService.save(vipDetail);