From 1f9d05fd255fbd21356dad37527c7d33fda4fb8b Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期五, 04 八月 2023 17:03:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 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 8f8376f..081772c 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
@@ -11,6 +11,7 @@
import com.dsh.other.feignclient.activity.CouponClient;
import com.dsh.other.feignclient.activity.UserCouponClient;
import com.dsh.other.feignclient.activity.model.Coupon;
+import com.dsh.other.feignclient.activity.model.QueryUserCouponByIdAndUserId;
import com.dsh.other.feignclient.activity.model.UserCoupon;
import com.dsh.other.mapper.SiteMapper;
import com.dsh.other.model.*;
@@ -210,7 +211,7 @@
//校验优惠券
Long couponId = reservationSite.getCouponId();
if(null != couponId && reservationSite.getPayType() != 3){
- UserCoupon userCoupon = userCouponClient.queryUserCouponById(couponId);
+ UserCoupon userCoupon = userCouponClient.queryUserCouponById(new QueryUserCouponByIdAndUserId(reservationSite.getCouponId(),uid));
if(userCoupon.getStatus() == 2){
return ResultUtil.error("优惠券已被核销");
}
@@ -276,11 +277,7 @@
return ResultUtil.success();
}
- public static void main(String[] args) {
- String a ="2023-07-28 10:30-15:30";
- String substring = a.substring(0,a.lastIndexOf("-"));
- System.out.println(substring);
- }
+
/**
* 课程微信支付
* @param paymentPrice
@@ -490,7 +487,7 @@
siteBooking.setRefundOrderNo(trade_no);
siteBookingService.updateById(siteBooking);
if(null != siteBooking.getUserCouponId()){
- UserCoupon userCoupon = userCouponClient.queryUserCouponById(siteBooking.getUserCouponId());
+ UserCoupon userCoupon = userCouponClient.queryUserCouponById(new QueryUserCouponByIdAndUserId(siteBooking.getUserCouponId(),siteBooking.getAppUserId()));
userCoupon.setStatus(1);
userCouponClient.updateUserCoupon(userCoupon);
}
@@ -506,7 +503,7 @@
siteBooking.setCancelTime(new Date());
siteBookingService.updateById(siteBooking);
if(null != siteBooking.getUserCouponId()){
- UserCoupon userCoupon = userCouponClient.queryUserCouponById(siteBooking.getUserCouponId());
+ UserCoupon userCoupon = userCouponClient.queryUserCouponById(new QueryUserCouponByIdAndUserId(siteBooking.getUserCouponId(),appUser.getId()));
userCoupon.setStatus(1);
userCouponClient.updateUserCoupon(userCoupon);
}
@@ -545,7 +542,7 @@
//校验优惠券
Long couponId = siteBooking.getUserCouponId();
if(null != couponId && payType != 3){
- UserCoupon userCoupon = userCouponClient.queryUserCouponById(couponId);
+ UserCoupon userCoupon = userCouponClient.queryUserCouponById(new QueryUserCouponByIdAndUserId(siteBooking.getUserCouponId(),appUser.getId()));
Coupon coupon = couponClient.queryCouponById(userCoupon.getCouponId());
if(coupon.getType() == 1){//满减
JSONObject jsonObject = JSON.parseObject(coupon.getContent());
@@ -562,7 +559,7 @@
userCouponClient.updateUserCoupon(userCoupon);
}
if(null != couponId && payType == 3){
- UserCoupon userCoupon = userCouponClient.queryUserCouponById(couponId);
+ UserCoupon userCoupon = userCouponClient.queryUserCouponById(new QueryUserCouponByIdAndUserId(siteBooking.getUserCouponId(),appUser.getId()));
userCoupon.setStatus(1);
userCouponClient.updateUserCoupon(userCoupon);
}
@@ -610,7 +607,7 @@
//校验优惠券
Long couponId = siteBooking.getUserCouponId();
if(null != couponId){
- UserCoupon userCoupon = userCouponClient.queryUserCouponById(couponId);
+ UserCoupon userCoupon = userCouponClient.queryUserCouponById(new QueryUserCouponByIdAndUserId(siteBooking.getUserCouponId(),siteBooking.getAppUserId()));
Coupon coupon = couponClient.queryCouponById(userCoupon.getCouponId());
if(coupon.getType() == 1){//满减
JSONObject jsonObject = JSON.parseObject(coupon.getContent());
--
Gitblit v1.7.1