From 879f3676da8eee14d239884f9ae1d4036f5b0e19 Mon Sep 17 00:00:00 2001
From: yuanye <418471657@qq.com>
Date: Sun, 14 Nov 2021 10:24:09 +0800
Subject: [PATCH] 1

---
 .../src/main/java/com/hai/dao/OutRechargeOrderMapperExt.java   | 3 ++-
 .../java/com/hai/service/impl/OutRechargeOrderServiceImpl.java | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapperExt.java b/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapperExt.java
index a2ac284d..e68fef05 100644
--- a/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapperExt.java
+++ b/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapperExt.java
@@ -69,7 +69,7 @@ public interface OutRechargeOrderMapperExt {
                    " a.recharge_name rechargeName," +
                    " a.id_card rechargeIdCard," +
                    " a.remarks remarks," +
-                   " case a.pay_type when 1 then '微信' when 2 then '工会卡' when 3 then '积分' end payTypeName," +
+                   " case a.pay_type when 1 then '微信' when 2 then '工会卡' when 3 then '积分' when 4 then '银联' end payTypeName," +
                    " a.order_price orderPrice," +
                    " a.pay_price payPrice," +
                    " a.pay_real_price payRealPrice," +
@@ -86,6 +86,7 @@ public interface OutRechargeOrderMapperExt {
                    " FROM" +
                    " out_recharge_order a join high_user_card b on a.user_id = b.user_id where 1 = 1 " +
                    "<if test='map.status != null'> and a.`status` = #{map.status} </if>",
+                   "<if test='map.payType != null'> and a.`pay_type` = #{map.status} </if>",
                    "<if test='map.code != null'> and a.`Identification_code` = #{map.code} </if>",
                    "<if test='map.orderNo != null'> and a.`order_no` = #{map.orderNo} </if>",
                    "<if test='map.rechargeModel != null'> and a.`recharge_model` = #{map.rechargeModel} </if>",
diff --git a/hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java
index 09b9dbdb..302c696f 100644
--- a/hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java
+++ b/hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java
@@ -164,6 +164,7 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService {
             map.put("payTimeS", DateUtil.date2String(new Date(MapUtils.getLong(map, "payTimeS")), "yyyy-MM-dd HH:mm:ss"));
         }
 
+
         if(MapUtils.getLong(map, "payTimeE") != null) {
             map.put("payTimeE", DateUtil.date2String(new Date(MapUtils.getLong(map, "payTimeE")), "yyyy-MM-dd HH:mm:ss"));
         }