From f14c50cb0036d3ddd655ce4e34732ba396a836c4 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 30 五月 2023 12:42:03 +0800
Subject: [PATCH] optimize 统计

---
 java110-db/src/main/resources/mapper/store/SmallWeChatServiceDaoImplMapper.xml |   36 ++++++++++++++++++++++++++----------
 1 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/store/SmallWeChatServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/store/SmallWeChatServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index 5e00d76..6013b59
--- a/java110-db/src/main/resources/mapper/store/SmallWeChatServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/store/SmallWeChatServiceDaoImplMapper.xml
@@ -8,7 +8,7 @@
     <insert id="saveBusinessSmallWeChatInfo" parameterType="Map">
         insert into
             buiness_small_wechat
-            (operate,appId,name,appSecret,weChat_id,b_id,store_Id,pay_password,remarks,obj_id,obj_type,mch_id,wechat_type)
+            (operate,appId,name,appSecret,wechat_id,b_id,store_Id,pay_password,remarks,obj_id,obj_type,mch_id,wechat_type)
         values
             (#{operate},#{appId},#{name},#{appSecret},#{weChatId},#{bId},#{storeId},#{payPassword},#{remarks},#{objId},#{objType},#{mchId},#{weChatType})
        </insert>
@@ -22,7 +22,7 @@
             t.appId,
             t.name,
             t.appSecret,
-            t.weChat_id,t.weChat_id weChatId,
+            t.wechat_id,t.wechat_id weChatId,
             t.b_id,t.b_id bId,
             t.store_Id,t.store_Id storeId,
             t.pay_password,t.pay_password payPassword,
@@ -53,7 +53,7 @@
             and t.appSecret= #{appSecret}
         </if>
         <if test="weChatId !=null and weChatId != ''">
-            and t.weChat_id= #{weChatId}
+            and t.wechat_id= #{weChatId}
         </if>
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
@@ -75,10 +75,10 @@
     <insert id="saveSmallWeChatInfoInstance" parameterType="Map">
         insert into
             small_wechat
-                (create_time,appId,name,appSecret,status_cd,weChat_id,b_id,store_Id,pay_password,remarks,obj_id,obj_type,mch_id,wechat_type)
+                (create_time,appId,name,appSecret,status_cd,wechat_id,b_id,store_Id,pay_password,remarks,obj_id,obj_type,mch_id,wechat_type)
                 select
                     t.create_time,t.appId,t.name,t.appSecret,'0',
-                    t.weChat_id,t.b_id,t.store_Id,t.pay_password,t.remarks,t.obj_id,t.obj_type,t.mch_id,t.wechat_type
+                    t.wechat_id,t.b_id,t.store_Id,t.pay_password,t.remarks,t.obj_id,t.obj_type,t.mch_id,t.wechat_type
                 from buiness_small_wechat t where 1=1 and t.operate= 'ADD'
         <if test="createTime !=null and createTime != ''">
             and t.create_time= #{createTime}
@@ -93,7 +93,7 @@
             and t.appSecret= #{appSecret}
         </if>
         <if test="weChatId !=null and weChatId != ''">
-            and t.weChat_id= #{weChatId}
+            and t.wechat_id= #{weChatId}
         </if>
         <if test="weChatType !=null and weChatType != ''">
             and t.wechat_type= #{weChatType}
@@ -122,7 +122,7 @@
             t.name,
             t.appSecret,
             t.status_cd,t.status_cd statusCd,
-            t.weChat_id,t.weChat_id weChatId,
+            t.wechat_id,t.wechat_id weChatId,
             t.b_id,t.b_id bId,
             t.store_Id,t.store_Id storeId,
             t.pay_password,t.pay_password payPassword,
@@ -130,6 +130,7 @@
             t.obj_id,t.obj_id objId,
             t.obj_type,t.obj_type objType,
             t.mch_id,t.mch_id mchId,
+        t.mch_name mchName,
             t.wechat_type, t.wechat_type weChatType,
             d.name objTypeName
         from small_wechat t left join t_dict d on t.obj_type = d.status_cd and d.table_name = 'small_wechat' and d.table_columns = 'obj_type'
@@ -153,7 +154,7 @@
             and t.wechat_type= #{weChatType}
         </if>
         <if test="weChatId !=null and weChatId != ''">
-            and t.weChat_id= #{weChatId}
+            and t.wechat_id= #{weChatId}
         </if>
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
@@ -166,6 +167,15 @@
         </if>
         <if test="remarks !=null and remarks != ''">
             and t.remarks= #{remarks}
+        </if>
+        <if test="objType !=null and objType != ''">
+            and t.obj_type= #{objType}
+        </if>
+        <if test="objId !=null and objId != ''">
+            and t.obj_id= #{objId}
+        </if>
+        <if test="mchId !=null and mchId != ''">
+            and t.mch_id= #{mchId}
         </if>
         order by t.create_time desc
         <if test="page != -1 and page != null ">
@@ -213,7 +223,7 @@
         </if>
         where 1=1
         <if test="weChatId !=null and weChatId != ''">
-            and t.weChat_id= #{weChatId}
+            and t.wechat_id= #{weChatId}
         </if>
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
@@ -245,7 +255,7 @@
             and t.status_cd= #{statusCd}
         </if>
         <if test="weChatId !=null and weChatId != ''">
-            and t.weChat_id= #{weChatId}
+            and t.wechat_id= #{weChatId}
         </if>
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
@@ -259,6 +269,12 @@
         <if test="remarks !=null and remarks != ''">
             and t.remarks= #{remarks}
         </if>
+        <if test="objType !=null and objType != ''">
+            and t.obj_type= #{objType}
+        </if>
+        <if test="objId !=null and objId != ''">
+            and t.obj_id= #{objId}
+        </if>
 
 
     </select>

--
Gitblit v1.8.0