From a1d261d6c92c38d9e496e11d1bc224ecc1d34798 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期二, 14 十一月 2023 09:14:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoursePackagePaymentController.java | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoursePackagePaymentController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoursePackagePaymentController.java
index 6ec1b96..fbac453 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoursePackagePaymentController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoursePackagePaymentController.java
@@ -199,7 +199,6 @@
SimpleDateFormat format = new SimpleDateFormat(timeFrameStart);
SimpleDateFormat format1 = new SimpleDateFormat(timeFrameEnd);
try {
-
// 判断当日时间是否能享受到折扣
String startTime = jsonObject.getString("startTime");
String endTime = jsonObject.getString("endTime");
@@ -239,7 +238,6 @@
}
// 判断三个折扣 谁所需支付金额最少
double minValue = 0.00;
-
if (c1 != 0.00 && (c2 == 0.00 || c1 < c2) && (c3 == 0.00 || c1 < c3)) {
minValue = c1;
} else if (c2 != 0.00 && (c3 == 0.00 || c2 < c3)) {
--
Gitblit v1.7.1