From 08078a2c37c0682739875915362100d4c2f50805 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 26 Aug 2022 15:51:56 +0800
Subject: [PATCH] 20220822
---
src/main/java/cc/mrbird/febs/common/enumerates/OrderPayMethodEnum.java | 3 ++-
src/main/java/cc/mrbird/febs/system/controller/LoginController.java | 2 +-
src/test/java/cc/mrbird/febs/ProfitTest.java | 8 ++++----
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/common/enumerates/OrderPayMethodEnum.java b/src/main/java/cc/mrbird/febs/common/enumerates/OrderPayMethodEnum.java
index b9172d2..d828378 100644
--- a/src/main/java/cc/mrbird/febs/common/enumerates/OrderPayMethodEnum.java
+++ b/src/main/java/cc/mrbird/febs/common/enumerates/OrderPayMethodEnum.java
@@ -8,7 +8,8 @@
WECHAT("微信支付"),
ALIPAY("支付宝支付"),
SCORE("积分支付"),
- BALANCE("余额支付");
+ BALANCE("余额支付"),
+ BANK("快捷协议支付");
private String name;
diff --git a/src/main/java/cc/mrbird/febs/system/controller/LoginController.java b/src/main/java/cc/mrbird/febs/system/controller/LoginController.java
index 8d407b9..c99e8d9 100644
--- a/src/main/java/cc/mrbird/febs/system/controller/LoginController.java
+++ b/src/main/java/cc/mrbird/febs/system/controller/LoginController.java
@@ -109,7 +109,7 @@
// data.put("alipayPay",mallOrderInfoMapper.selectSumAmountByPayMethodAndStatue(OrderPayMethodEnum.ALIPAY.getName(), OrderStatusEnum.FINISH.getValue()));
data.put("alipayPay",mallOrderInfoMapper.selectSumAmountByPayMethodAndSomeStatue(OrderPayMethodEnum.ALIPAY.getName(), states));
// data.put("scorePay",mallOrderInfoMapper.selectSumAmountByPayMethodAndStatue(OrderPayMethodEnum.SCORE.getName(), OrderStatusEnum.FINISH.getValue()));
- data.put("scorePay",mallOrderInfoMapper.selectSumAmountByPayMethodAndSomeStatue(OrderPayMethodEnum.SCORE.getName(), states));
+ data.put("scorePay",mallOrderInfoMapper.selectSumAmountByPayMethodAndSomeStatue(OrderPayMethodEnum.BANK.getName(), states));
// data.put("balancePay",mallOrderInfoMapper.selectSumAmountByPayMethodAndStatue(OrderPayMethodEnum.BALANCE.getName(), OrderStatusEnum.FINISH.getValue()));
data.put("balancePay",mallOrderInfoMapper.selectSumAmountByPayMethodAndSomeStatue(OrderPayMethodEnum.BALANCE.getName(), states));
diff --git a/src/test/java/cc/mrbird/febs/ProfitTest.java b/src/test/java/cc/mrbird/febs/ProfitTest.java
index 0656a84..e32b774 100644
--- a/src/test/java/cc/mrbird/febs/ProfitTest.java
+++ b/src/test/java/cc/mrbird/febs/ProfitTest.java
@@ -138,7 +138,7 @@
@Test
public void getAgreeMentPaySms(){
AgreeMentPaySmsDto agreeMentPaySmsDto = new AgreeMentPaySmsDto();
- agreeMentPaySmsDto.setOrderNo("NO_2022082514435329133");
+ agreeMentPaySmsDto.setOrderNo("2022082614465345250");
BigDecimal value = new BigDecimal("0.1").setScale(2, BigDecimal.ROUND_DOWN);
DecimalFormat decimalFormat = new DecimalFormat("0.00#");
@@ -156,15 +156,15 @@
@Test
public void agreementSign(){
AgreementSignDto agreementSignDto = new AgreementSignDto();
- agreementSignDto.setOrderNo("NO_2022082514435329133");
- agreementSignDto.setSmsCode("464439");
+ agreementSignDto.setOrderNo("2022082614465345250");
+ agreementSignDto.setSmsCode("841243");
unipayService.agreementSign(agreementSignDto);
}
@Test
public void agreementPay(){
AgreementPayDto agreementPayDto = new AgreementPayDto();
- agreementPayDto.setOrderNo("2022082514435329133");
+ agreementPayDto.setOrderNo("2022082614465345250");
BigDecimal value = new BigDecimal("0.1").setScale(2, BigDecimal.ROUND_DOWN);
DecimalFormat decimalFormat = new DecimalFormat("0.00#");
--
Gitblit v1.9.1