From abb0d631ffed8b67b0a78205ba127b46a4cb546b Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Tue, 10 Sep 2024 16:29:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/dao/mapper/xml/PaAccountMapper.xml |   29 ++++++++++++++++++++++++++---
 1 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/dao/mapper/xml/PaAccountMapper.xml b/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/dao/mapper/xml/PaAccountMapper.xml
index cb2ce84..37b4b9d 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/dao/mapper/xml/PaAccountMapper.xml
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/dao/mapper/xml/PaAccountMapper.xml
@@ -5,7 +5,7 @@
  * @description: 自定义sql,请自行实现业务逻辑
  * @company: hugeinfo
  * @author: liyj
- * @time:2024-08-17 15:33:41
+ * @time:2024-08-19 20:04:19
  * @version 1.0.0
 -->
 <mapper namespace="cn.huge.module.pauser.dao.mapper.PaAccountMapper">
@@ -89,8 +89,8 @@
                 <if test="terms.limitTime != null and terms.limitTime !=''">
                     and limit_time = #{terms.limitTime}
                 </if>
-                <if test="terms.deleteStatus = null and terms.deleteStatus =''">
-                    and delete_status = '1'
+                <if test="terms.deleteStatus != null and terms.deleteStatus !=''">
+                    and delete_status = 0
                 </if>
                 <if test="terms.deleteStatus != null and terms.deleteStatus !=''">
                     and delete_status = #{terms.deleteStatus}
@@ -175,4 +175,27 @@
         limit #{page.offset}, #{page.size}
     </select>
 
+    <!-- SeCustWechatDTO结果集 -->
+    <resultMap id="seCustWechatDTO" type="cn.huge.module.oper.dto.SeCustWechatDTO">
+        <result property="id" column="id"/>
+        <result property="custId" column="cust_id"/>
+        <result property="mainId" column="main_id"/>
+        <result property="mainName" column="main_name"/>
+        <result property="mainAcc" column="main_acc"/>
+        <result property="mainPower" column="main_power"/>
+        <result property="appid" column="appid"/>
+        <result property="secret" column="secret"/>
+        <result property="token" column="token"/>
+        <result property="aeskey" column="aeskey"/>
+        <result property="msgDataFormat" column="msg_data_format"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+    <!-- 根据appid查询小程序配置 -->
+    <select id="getSeCustWechatByAppid" resultMap="seCustWechatDTO">
+        SELECT
+            *
+        FROM dyh_se_cust_wechat
+        WHERE appid = #{appid}
+    </select>
 </mapper> 
\ No newline at end of file

--
Gitblit v1.8.0