From 5a2639a0f3caf6343137c1da1aef5363e4770a42 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 01 十一月 2024 18:46:32 +0800
Subject: [PATCH] bug修改

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java
index f8ebd3d..debf036 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java
@@ -174,6 +174,16 @@
                     tChargingOrder.setTerminalName(data1.getName()+data2.getName());
                     tChargingOrder.setTerminalCode(data2.getCode());
                 }
+                if (tChargingOrder.getRechargePaymentType()!=null && tChargingOrder.getRechargePaymentType()==1){
+                    chargingBillListVO.setPayTypeName("微信商户");
+                }
+                if (tChargingOrder.getRechargePaymentType()!=null && tChargingOrder.getRechargePaymentType()==2){
+                    if (StringUtils.hasLength(chargingBillListVO.getPayTypeName())){
+                        chargingBillListVO.setPayTypeName("微信商户+支付宝商户");
+                    }else{
+                        chargingBillListVO.setPayTypeName("支付宝商户");
+                    }
+                }
                 tChargingOrder.setOrderClassification1("线上订单");
                 tChargingOrder.setRechargePaymentType1("预付");
                 tChargingOrder.setChargingType("充电桩接口充电服务");

--
Gitblit v1.7.1