From a709bf04d33967b7ee215fd0b042dbf831e84576 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 26 Jul 2023 17:58:32 +0800
Subject: [PATCH] 组合支付

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

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
index 6c23aad..d9b0057 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
@@ -388,7 +388,7 @@
             if(ObjectUtil.isEmpty(mallGoods)){
                 break;
             }
-            if(1 == mallGoods.getIsUnreal() && ObjectUtil.isNotEmpty(mallGoods.getIsUnreal())){
+            if(ObjectUtil.isNotEmpty(mallGoods.getIsUnreal()) && 1 == mallGoods.getIsUnreal()){
                 mallOrderInfo.setStatus(OrderStatusEnum.FINISH.getValue());
                 mallOrderInfoMapper.updateById(mallOrderInfo);
             }
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 894bc7c..8494349 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
@@ -505,6 +505,7 @@
                 amountActualMsg = amountActualTwo.toString();
                 break;
             default:
+                throw new FebsException("请选择正确的支付方式");
 
         }
         if(ObjectUtil.isNotEmpty(payOrderDto.getUseTime())){

--
Gitblit v1.9.1