From 1863e6353f0de84082a21738f5d0a28f3cfeadc0 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 22 十一月 2023 19:33:49 +0800
Subject: [PATCH] 后台bug修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java
index ac14fe1..d488504 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java
@@ -452,21 +452,23 @@
String startTime,String text,Integer sort,String name,Integer useScope,String cityIds,String storeIds,Integer cardType
) throws ParseException {
// 判断当前选择的课包 是不是假期课 然后判断选择的有效期是否在假期课有效期内
- TCoursePackage tCoursePackage = coursePackageClient.queryById(coursePackageId);
- if (tCoursePackage.getType()==2){
- // 如果是假期课 获取到当前课包的开始时间和结束时间
- Date endTime = tCoursePackage.getEndTime();
- Date startTime1 = tCoursePackage.getStartTime();
- SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
- Date s = format.parse(startTime.split(" - ")[0]);
- Date e = format.parse(startTime.split(" - ")[1]);
- if (s.before(startTime1)){
- // 有效期开始时间小于假期课开始时间
- return 5009;
- }
- if (e.after(endTime)){
- // 有效期结束时间大于假期课结束时间
- return 5008;
+ if (coursePackageId!=null){
+ TCoursePackage tCoursePackage = coursePackageClient.queryById(coursePackageId);
+ if (tCoursePackage.getType()==2){
+ // 如果是假期课 获取到当前课包的开始时间和结束时间
+ Date endTime = tCoursePackage.getEndTime();
+ Date startTime1 = tCoursePackage.getStartTime();
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ Date s = format.parse(startTime.split(" - ")[0]);
+ Date e = format.parse(startTime.split(" - ")[1]);
+ if (s.before(startTime1)){
+ // 有效期开始时间小于假期课开始时间
+ return 5009;
+ }
+ if (e.after(endTime)){
+ // 有效期结束时间大于假期课结束时间
+ return 5008;
+ }
}
}
PointsMerchandise pointsMerchandise = new PointsMerchandise();
--
Gitblit v1.7.1