From 4e53691ef5c5d32572f73bfa89eba7e27ec3d989 Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Wed, 12 Jan 2022 17:29:24 +0800 Subject: [PATCH 1/5] adding 2 more coupon type ID calculation --- .../system/royalcanin/good/service/OrderService.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java index 706fbecb..19ad8bbf 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java @@ -216,14 +216,21 @@ public class OrderService { royalcaninOperateLogEntity.setAcceptTime(dateformat.format(acceptTime)); royalcaninOperateLogService.add(royalcaninOperateLogEntity); return ResponseDTO.succ(); + } public double couponTotal(String couponTypeId,double discount,double total,int buyCount){ double endTotal = 0; switch (couponTypeId) { - case "5" : - endTotal = (total * (buyCount-1)) + (total * discount); +// case "5" : +// endTotal = (total * (buyCount-1)) + (total * discount); +// break; + case "2": + endTotal = total * buyCount - discount; + break; + case "3": + endTotal = (total * buyCount) * discount; break; case "1" : endTotal = total * buyCount - discount; From 151ad0235eec860f31a00d33223d53cb5cce14fb Mon Sep 17 00:00:00 2001 From: "952108534@qq.com" <952108534@qq.com> Date: Thu, 13 Jan 2022 18:27:31 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E4=BF=AE=E6=94=B9=E5=BA=95=E9=83=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rc-busness/pages/productdetails/producted.vue | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/rc-busness/pages/productdetails/producted.vue b/rc-busness/pages/productdetails/producted.vue index 76b021e4..cad9f780 100644 --- a/rc-busness/pages/productdetails/producted.vue +++ b/rc-busness/pages/productdetails/producted.vue @@ -4,7 +4,7 @@ -
+
@@ -12,7 +11,7 @@ - +
+
-
+
+
+
+
- {{ item.couponDesc }} + {{ item.couponName }} -
- 有效期{{item.validFrom}}至 +
+ 有效期 + {{item.validFrom}}至 {{ item.validTo }}
- - @@ -49,18 +55,17 @@
-