Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

44323

2023-11-23 acad524bfb7f376c09ff8e6600fab207780156e1

 cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java

@@ -665,6 +665,14 @@
//            return ResultUtil.error("请先进行支付");
            siteBooking.setStatus(5);
            siteBookingService.updateById(siteBooking);
            AppUser appUser = appUserClient.queryAppUser(siteBooking.getAppUserId());

            if(null != siteBooking.getUserCouponId()&&siteBooking.getUserCouponId()!=0){
                UserCoupon userCoupon = userCouponClient.queryUserCouponById(new QueryUserCouponByIdAndUserId(siteBooking.getUserCouponId(),appUser.getId()));
                userCoupon.setStatus(1);
                userCouponClient.updateUserCoupon(userCoupon);
            }

            return ResultUtil.success();
        }
        if(siteBooking.getStatus() != 1 && siteBooking.getStatus() != 2){
@@ -704,7 +712,7 @@
            siteBooking.setCancelTime(new Date());
            siteBooking.setRefundOrderNo(trade_no);
            siteBookingService.updateById(siteBooking);
            if(null != siteBooking.getUserCouponId()){
            if(null != siteBooking.getUserCouponId()&&siteBooking.getUserCouponId()!=0){
                UserCoupon userCoupon = userCouponClient.queryUserCouponById(new QueryUserCouponByIdAndUserId(siteBooking.getUserCouponId(),siteBooking.getAppUserId()));
                userCoupon.setStatus(1);
                userCouponClient.updateUserCoupon(userCoupon);
@@ -727,7 +735,7 @@
            siteBooking.setCancelUserId(uid);
            siteBooking.setCancelTime(new Date());
            siteBookingService.updateById(siteBooking);
            if(null != siteBooking.getUserCouponId()){
            if(null != siteBooking.getUserCouponId()&&siteBooking.getUserCouponId()!=0){
                UserCoupon userCoupon = userCouponClient.queryUserCouponById(new QueryUserCouponByIdAndUserId(siteBooking.getUserCouponId(),appUser.getId()));
                userCoupon.setStatus(1);
                userCouponClient.updateUserCoupon(userCoupon);