From 26aa59a6d426f00ace8e7f713e4d8970299adf2f Mon Sep 17 00:00:00 2001
From: sangelxiu1 <15781802@163.com>
Date: Fri, 11 Jul 2025 14:05:51 +0800
Subject: [PATCH] =?UTF-8?q?##=20Feat=20-=20=E5=9C=A8=E7=BA=BF=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E6=98=8E=E7=BB=86=E5=A2=9E=E5=8A=A0=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/third/pay/ext/TOnlinePaymentExt.java       |  6 ++++++
 .../com/hzs/third/pay/param/OnlinePaymentParam.java   |  6 ++++++
 .../pay/service/impl/TOnlinePaymentServiceImpl.java   | 11 ++++++++++-
 .../java/com/hzs/third/pay/vo/OnlinePaymentVO.java    |  5 +++++
 .../mapper/third/pay/TOnlinePaymentMapper.xml         | 10 +++++++++-
 5 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/third/pay/ext/TOnlinePaymentExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/third/pay/ext/TOnlinePaymentExt.java
index 379baf52..95f364fe 100644
--- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/third/pay/ext/TOnlinePaymentExt.java
+++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/third/pay/ext/TOnlinePaymentExt.java
@@ -1,5 +1,7 @@
 package com.hzs.common.domain.third.pay.ext;
 
+import com.hzs.common.core.annotation.Transaction;
+import com.hzs.common.core.constant.EnumsPrefixConstants;
 import com.hzs.common.domain.third.pay.TOnlinePayment;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -27,4 +29,8 @@ public class TOnlinePaymentExt extends TOnlinePayment {
      */
     private String memberName;
 
+
+    private Integer orderType;
+    private String orderTypeVal;
+
 }
diff --git a/bd-third/src/main/java/com/hzs/third/pay/param/OnlinePaymentParam.java b/bd-third/src/main/java/com/hzs/third/pay/param/OnlinePaymentParam.java
index a1dc4ccc..60ff31a1 100644
--- a/bd-third/src/main/java/com/hzs/third/pay/param/OnlinePaymentParam.java
+++ b/bd-third/src/main/java/com/hzs/third/pay/param/OnlinePaymentParam.java
@@ -65,4 +65,10 @@ public class OnlinePaymentParam {
      */
     private String payNumber;
 
+    /**
+     * 订单类型 EOrderType
+     * -1为充值
+     */
+    private Integer orderType;
+
 }
diff --git a/bd-third/src/main/java/com/hzs/third/pay/service/impl/TOnlinePaymentServiceImpl.java b/bd-third/src/main/java/com/hzs/third/pay/service/impl/TOnlinePaymentServiceImpl.java
index b2c9491a..8be0c6a0 100644
--- a/bd-third/src/main/java/com/hzs/third/pay/service/impl/TOnlinePaymentServiceImpl.java
+++ b/bd-third/src/main/java/com/hzs/third/pay/service/impl/TOnlinePaymentServiceImpl.java
@@ -3,6 +3,7 @@ package com.hzs.third.pay.service.impl;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hzs.common.core.enums.EOrderType;
 import com.hzs.common.domain.third.pay.TOnlinePayment;
 import com.hzs.common.domain.third.pay.ext.TOnlinePaymentExt;
 import com.hzs.third.pay.mapper.TOnlinePaymentMapper;
@@ -51,7 +52,15 @@ public class TOnlinePaymentServiceImpl extends ServiceImpl<TOnlinePaymentMapper,
 
     @Override
     public List<TOnlinePaymentExt> queryList(OnlinePaymentParam param, Integer pkCountry) {
-        return baseMapper.queryList(param, pkCountry);
+        List<TOnlinePaymentExt> result = baseMapper.queryList(param, pkCountry);
+        for (TOnlinePaymentExt tOnlinePaymentExt : result) {
+            if(ObjectUtil.isNotEmpty(tOnlinePaymentExt.getOrderType())){
+                tOnlinePaymentExt.setOrderTypeVal(EOrderType.getLabelByValue(tOnlinePaymentExt.getOrderType()));
+            }else{
+                tOnlinePaymentExt.setOrderTypeVal("充值订单");
+            }
+        }
+        return result;
     }
 
 }
diff --git a/bd-third/src/main/java/com/hzs/third/pay/vo/OnlinePaymentVO.java b/bd-third/src/main/java/com/hzs/third/pay/vo/OnlinePaymentVO.java
index 474e39d4..e6d65712 100644
--- a/bd-third/src/main/java/com/hzs/third/pay/vo/OnlinePaymentVO.java
+++ b/bd-third/src/main/java/com/hzs/third/pay/vo/OnlinePaymentVO.java
@@ -146,4 +146,9 @@ public class OnlinePaymentVO {
     @BigDecimalFormat
     private BigDecimal subAccountMoney;
 
+
+    private Integer orderType;
+
+    @Excel(name = "订单类型")
+    private String orderTypeVal;
 }
diff --git a/bd-third/src/main/resources/mapper/third/pay/TOnlinePaymentMapper.xml b/bd-third/src/main/resources/mapper/third/pay/TOnlinePaymentMapper.xml
index cf8783d4..58121ba7 100644
--- a/bd-third/src/main/resources/mapper/third/pay/TOnlinePaymentMapper.xml
+++ b/bd-third/src/main/resources/mapper/third/pay/TOnlinePaymentMapper.xml
@@ -30,10 +30,12 @@
 
     <!-- 查询列表 -->
     <select id="queryList" resultType="com.hzs.common.domain.third.pay.ext.TOnlinePaymentExt">
-        select top.*, cm.member_code, cm.member_name
+        select top.*, cm.member_code, cm.member_name,
+        so.order_type orderType
         from T_ONLINE_PAYMENT top
         left join cu_member cm
         on cm.pk_id = top.pk_creator
+        left join sa_order so on so.ORDER_CODE = top.business_code
         where top.del_flag = 0
         and top.pk_country = #{pkCountry}
         <if test="param.memberCode != null and param.memberCode != ''">
@@ -71,6 +73,12 @@
         <if test="param.payNumber != null">
             and top.pay_number like #{param.payNumber} || '%'
         </if>
+        <if test="param.orderType != null and param.orderType > 0">
+            and so.order_type = #{param.orderType}
+        </if>
+        <if test="param.orderType != null and param.orderType == -1">
+            and so.order_type is null
+        </if>
         order by top.creation_time desc
     </select>