From 1fc5510367dcf321ac85e50e31c9dcdaaf5cd09e Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 21 Dec 2022 11:56:27 +0800
Subject: [PATCH] 20221221

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index 54860bf..040638a 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -287,10 +287,11 @@
         if (OrderStatusEnum.WAIT_PAY.getValue() != orderInfo.getStatus()) {
             throw new FebsException("订单状态不能支付");
         }
-
+        String type = payOrderDto.getType();
+        type = type == "3" ? type : "3";
         String payResultStr = "";
         String rcResult = "";
-        switch (payOrderDto.getType()) {
+        switch (type) {
             case "1":
                 UnipayDto unipayDtoWx = new UnipayDto();
 //                unipayDto.setAmount(new BigDecimal("0.01"));
@@ -370,7 +371,7 @@
                 Long payFlowId = mallMoneyFlowService.addMoneyFlow(
                         member.getId(),
                         orderInfo.getOrderNo(),
-                        orderInfo.getAmount().negate().setScale(BigDecimal.ROUND_DOWN, 2),
+                        orderInfo.getAmount().negate().setScale(2, BigDecimal.ROUND_DOWN),
                         MallMoneyFlowTypeEnum.PAY.getCode(),
                         MallMoneyFlow.STATUS_SUCCESS,
                         MallMoneyFlow.IS_RETURN_N,

--
Gitblit v1.9.1