From 3ba2d33c27aea91c14bbf34e04e72f3d758a5105 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期三, 22 十一月 2023 19:36:01 +0800
Subject: [PATCH] 11.21.2
---
cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java b/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java
index 83ca307..da5ad28 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java
+++ b/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);
--
Gitblit v1.7.1