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/2] 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 d6e668a5ea1ffcfc8888939665d2a78f62996bc2 Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Fri, 14 Jan 2022 18:29:31 +0800 Subject: [PATCH 2/2] remove msgNum on SMSscript --- .../smartadmin/module/system/royalcanin/SMS/SMSController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/SMS/SMSController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/SMS/SMSController.java index 356188de..59057ad7 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/SMS/SMSController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/SMS/SMSController.java @@ -41,7 +41,7 @@ public class SMSController { String hash = MD5Utils.getMD5Code(KEY + "@" + currentTime + "@" + randomNum);//生成MD5值 Map resultMap = new HashMap<>(); resultMap.put("hash", hash); - resultMap.put("msgNum",randomNum); +// resultMap.put("msgNum",randomNum); resultMap.put("tamp", currentTime); return resultMap; //将hash值和tamp时间返回给前端 }