From acad524bfb7f376c09ff8e6600fab207780156e1 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期四, 23 十一月 2023 18:46:05 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
index ecd2b5c..b1032f1 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
@@ -870,7 +870,7 @@
if(null != couponId && paymentCourseVo.getPayType() != 3){
UserCoupon userCoupon = userCouponClient.queryUserCouponById(couponId);
if(userCoupon.getStatus() == 2){
- return ResultUtil.error("优惠券已被核销");
+ return ResultUtil.error("优惠券已被使用");
}
Coupon coupon = couponClient.queryCouponById(userCoupon.getCouponId());
long time = coupon.getEndTime().getTime();
@@ -1155,7 +1155,7 @@
// coursePackagePaymentServiceOne.setLaveClassHours(coursePackagePaymentServiceOne.getLaveClassHours()+coursePackagePaymentConfig.getClassHours());
coursePackagePaymentServiceOne.setCode(code);
//
- coursePackagePaymentServiceOne.setPayStatus(2);
+// coursePackagePaymentServiceOne.setPayStatus(2);
coursePackagePaymentServiceOne.setSalesName("续课");
coursePackagePaymentServiceOne.setAppUserId(null);
// coursePackagePaymentServiceOne.setPayStatus(2);
@@ -1671,6 +1671,9 @@
break;
}
int wei = DateUtil.dayOfWeek(date)-1;
+ if (wei == 0){
+ wei = 7;
+ }
if (week.contains(wei)) {
for (int i1 = 0; i1 < split.length; i1++) {
if (count == can) {
--
Gitblit v1.7.1