From 69266af1fdef30b874995acd856fe94e5e0f793e Mon Sep 17 00:00:00 2001
From: "2265829957@qq.com" <YU930814yang>
Date: Wed, 1 Dec 2021 09:41:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=A2=E5=8D=95=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E8=AE=A2=E5=8D=95=E6=9D=A5=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/service/impl/XhpcRealTimeOrderServiceImpl.java | 9 +++++++++
 .../main/resources/mapper/XhpcRealTimeOrderMapper.xml    | 1 +
 2 files changed, 10 insertions(+)

diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java
index f4e0836e..45649003 100644
--- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java
+++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java
@@ -355,6 +355,9 @@ public class XhpcRealTimeOrderServiceImpl implements IXhpcRealTimeOrderService {
                 if(operatorIdEvcs.get("operatorIdEvcs")!=null && operatorIdEvcs.get("commissionType")!=null && operatorIdEvcs.get("commissionRate")!=null){
                     BigDecimal commissionRate = new BigDecimal(operatorIdEvcs.get("commissionRate").toString()).divide(new BigDecimal(100));
                     String commissionType = operatorIdEvcs.get("commissionType").toString();
+                    if(operatorIdEvcs.get("internetUserId") !=null){
+                        xhpcHistoryOrder.setChargingMode(operatorIdEvcs.get("internetUserId").toString());
+                    }
                     //0总金额提成 1服务费提成
                     if(new BigDecimal(0).compareTo(commissionRate)==-1){
                         if("0".equals(commissionType) || "1".equals(commissionType)){
@@ -466,6 +469,12 @@ public class XhpcRealTimeOrderServiceImpl implements IXhpcRealTimeOrderService {
                     //剩下的钱
                     surplusServicePrice = surplusServicePrice.subtract(multiply2);
                 }
+                if("微信".equals(xhpcChargeOrder.getChargingMode())){
+                    xhpcHistoryOrder.setChargingMode("微信");
+                }
+                if("支付宝".equals(xhpcChargeOrder.getChargingMode())){
+                    xhpcHistoryOrder.setChargingMode("支付宝");
+                }
             }else{
                 //订单异常
                 xhpcChargeOrder.setStatus(2);
diff --git a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcRealTimeOrderMapper.xml b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcRealTimeOrderMapper.xml
index 680850cf..60e36a5d 100644
--- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcRealTimeOrderMapper.xml
+++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcRealTimeOrderMapper.xml
@@ -615,6 +615,7 @@
 
     <select id="getOperatorIdEvcs" resultType="map">
         select
+         internet_user_id as internetUserId,
          operator_id_evcs as operatorIdEvcs,
          commission_type as commissionType,
          commission_rate as commissionRate