From 00efed62586f91588135e5fcffbaa8a76f2b1372 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=97=AD?= <2795210596@qq.com>
Date: Sun, 20 Apr 2025 16:47:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manager/CreateOrderManager.java           | 26 +++++++------------
 .../cloud/cuerecycle/model/vo/CueOrderVO.java |  8 ++++++
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/manager/CreateOrderManager.java b/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/manager/CreateOrderManager.java
index fdb4a44..875daac 100644
--- a/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/manager/CreateOrderManager.java
+++ b/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/manager/CreateOrderManager.java
@@ -144,30 +144,24 @@ public class CreateOrderManager {
             case 1:
                 // 回收
                 cueOrder.setPayType(1);
-                break;
-            case 2:
-                // 置换
-                cueOrder.setPayType(2);
-                break;
-            case 3:
-                // 寄售
-                cueOrder.setPayType(1);
-                break;
-            default:
-                throw new LuckException("订单类型错误,请检查!");
-        }
-        // 根据支付方式进行不同操作
-        switch (cueOrder.getPayType()) {
-            case 1:
                 // 余额支付 直接向用户账户打款
                 userBalanceLogFeignClient.sellCueUpdateBalance(cueOrderVO.getUserId(), cueOrderVO.getActualAmount());
                 break;
             case 2:
+                // 置换
+                cueOrder.setPayType(2);
                 // 代金卷支付
                 couponFeignClient.sendUserCoupon(cueOrderVO.getShopId(), cueOrderVO.getUserId(), cueOrderVO.getVoucherAmount());
                 break;
+            case 3:
+                // 寄售
+                cueOrder.setPayType(1);
+                // 余额支付 直接向用户账户打款
+                Long actualAmount = cueOrderVO.getActualAmount() - cueOrderVO.getBrokerage() - cueOrderVO.getServiceCharge();
+                userBalanceLogFeignClient.sellCueUpdateBalance(cueOrderVO.getUserId(), actualAmount);
+                break;
             default:
-                throw new LuckException("支付方式错误,请检查!");
+                throw new LuckException("订单类型错误,请检查!");
         }
         cueOrderMapper.update(cueOrder);
         this.updateOrderMall(cueOrderVO.getShopId(), cueOrderVO.getMallOrderId(), CueOrderStatus.EVALUATION_FAIL.value());
diff --git a/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/vo/CueOrderVO.java b/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/vo/CueOrderVO.java
index c9856b3..6c94b3b 100644
--- a/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/vo/CueOrderVO.java
+++ b/tmerclub-local/src/main/java/com/tmerclub/cloud/cuerecycle/model/vo/CueOrderVO.java
@@ -102,6 +102,14 @@ public class CueOrderVO extends BaseVO implements Serializable {
      */
     @Schema(description = "代金卷金额")
     private Long voucherAmount;
+    /**
+     * 寄售佣金
+     */
+    private Long brokerage;
+    /**
+     * 服务费
+     */
+    private Long serviceCharge;
     /**
      * 是否已支付，1.已支付0.未支付
      */