From 754c2aff36ac37dfed003b8c3cec8a029a5545b8 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 21 Apr 2023 11:18:15 +0800
Subject: [PATCH] 拉卡拉支付
---
src/test/java/cc/mrbird/febs/ProfitTest.java | 6 +++---
src/main/java/cc/mrbird/febs/mall/service/impl/CommonService.java | 5 ++++-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/CommonService.java b/src/main/java/cc/mrbird/febs/mall/service/impl/CommonService.java
index 811d271..7cb9d65 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/CommonService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/CommonService.java
@@ -156,7 +156,10 @@
* 目前紧急修改成按照商品名称
*/
BigDecimal basePercent = new BigDecimal("3");
- if(goodsName.equals("礼包一") || goodsName.equals("礼包二")){
+ if(goodsName.equals("礼包一")){
+ basePercent = new BigDecimal("1.5");
+ }
+ if(goodsName.equals("礼包二")){
basePercent = new BigDecimal("2.5");
}
if(goodsName.equals("礼包三") || goodsName.equals("礼包四")){
diff --git a/src/test/java/cc/mrbird/febs/ProfitTest.java b/src/test/java/cc/mrbird/febs/ProfitTest.java
index e3dd62e..71c386a 100644
--- a/src/test/java/cc/mrbird/febs/ProfitTest.java
+++ b/src/test/java/cc/mrbird/febs/ProfitTest.java
@@ -100,10 +100,10 @@
// }
LaKaLaCreateOrderReqDate laKaLaCreateOrderReqDate = new LaKaLaCreateOrderReqDate();
//订单编号
- laKaLaCreateOrderReqDate.setOut_order_no("HLMSDDSDS65656613");
+ laKaLaCreateOrderReqDate.setOut_order_no("2023041918302032901");
//订单金额，分计
- laKaLaCreateOrderReqDate.setTotal_amount(1);
- laKaLaCreateOrderReqDate.setOrder_info("商品");
+ laKaLaCreateOrderReqDate.setTotal_amount(new BigDecimal(1).longValue());
+ laKaLaCreateOrderReqDate.setOrder_info("礼品一");
laKaLaService.verifyCreateOrder(laKaLaCreateOrderReqDate);
}
//
--
Gitblit v1.9.1