add：订单导出添加字段

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/excel/UserOrderExport.java

@@ -40,6 +40,10 @@ public class UserOrderExport {
     private String userNote;
     @ExcelProperty(value = "机构名称", index = 12)
     private String tenantName;
+    @ExcelProperty(value = "支付厂商", index = 13)
+    private String paymentProvider;
+    @ExcelProperty(value = "支付渠道", index = 14)
+    private String paymentChannel;
 
 
     public String getTenantName() {
@@ -145,4 +149,20 @@ public class UserOrderExport {
     public void setUserNote(String userNote) {
         this.userNote = userNote;
     }
+
+	public String getPaymentProvider() {
+		return paymentProvider;
+	}
+
+	public void setPaymentProvider(String paymentProvider) {
+		this.paymentProvider = paymentProvider;
+	}
+
+	public String getPaymentChannel() {
+		return paymentChannel;
+	}
+
+	public void setPaymentChannel(String paymentChannel) {
+		this.paymentChannel = paymentChannel;
+	}
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/UserOrderVo.java

@@ -1,21 +1,19 @@
 package com.yonge.cooleshow.biz.dal.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
 import com.yonge.cooleshow.biz.dal.entity.UserOrder;
-import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.wrapper.UserPaymentOrderWrapper;
 import com.yonge.cooleshow.common.enums.ActivityTypeEnum;
 import com.yonge.toolset.payment.base.enums.OpenEnum;
 import com.yonge.toolset.payment.base.enums.PayChannelEnum;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
 /**
  * @Author: liweifan
  * @Data: 2022-03-30 13:53:51
@@ -52,6 +50,12 @@ public class UserOrderVo extends UserOrder {
 
     @ApiModelProperty("机构名称")
     private String tenantName;
+    
+    @ApiModelProperty("支付厂商")
+    private String paymentProvider;
+    
+    @ApiModelProperty("支付渠道")
+    private String paymentChannel;
 
     @ApiModelProperty("支付配置")
     private  UserPaymentOrderWrapper.PaymentConfig paymentConfig;

cooleshow-user/user-biz/src/main/resources/config/mybatis/UserOrderMapper.xml

@@ -119,6 +119,8 @@
             p.open_type_ as openType,
             p.payment_client_ as paymentClient,
             p.pay_channel_ as payChannel,
+            case ifnull(p.open_type_,p.payment_vendor_) when 'yeepay' then '易宝' when 'adapay' then '汇付' else '原生支付' end paymentProvider,
+            case IFNULL(p.pay_channel_,t.payment_channel_) when 'wx_app' then '微信' when 'wx_pub' then '微信' when 'wx_lite' then '微信' when 'ali_app' then '支付宝' when 'alipay_qr' then '支付宝' end paymentChannel,
             p.trans_no_ as transNo,
             p.payment_no_ as paymentNo,
             p.fee_amt_ as feeAmt,