From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
java110-db/src/main/resources/mapper/store/SmallWeChatServiceDaoImplMapper.xml | 74 ++++++++++++++++++++++++++++++-------
1 files changed, 60 insertions(+), 14 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 e4ba144..6013b59
--- a/java110-db/src/main/resources/mapper/store/SmallWeChatServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/store/SmallWeChatServiceDaoImplMapper.xml
@@ -8,9 +8,9 @@
<insert id="saveBusinessSmallWeChatInfo" parameterType="Map">
insert into
buiness_small_wechat
- (operate,appId,name,appSecret,weChat_id,b_id,store_Id,pay_password,remarks)
+ (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})
+ (#{operate},#{appId},#{name},#{appSecret},#{weChatId},#{bId},#{storeId},#{payPassword},#{remarks},#{objId},#{objType},#{mchId},#{weChatType})
</insert>
@@ -22,11 +22,15 @@
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,
- t.remarks
+ t.remarks,
+ t.obj_id,t.obj_id objId,
+ t.obj_type,t.obj_type objType,
+ t.mch_id,t.mch_id mchId,
+ t.wechat_type,t.wechat_type weChatType
from
buiness_small_wechat t
where 1 =1
@@ -42,11 +46,14 @@
<if test="name !=null and name != ''">
and t.name= #{name}
</if>
+ <if test="weChatType !=null and weChatType != ''">
+ and t.wechat_type= #{weChatType}
+ </if>
<if test="appSecret !=null and appSecret != ''">
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}
@@ -68,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)
+ (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.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}
@@ -86,7 +93,10 @@
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}
</if>
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
@@ -112,12 +122,18 @@
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,
- t.remarks
- from small_wechat t
+ t.remarks,
+ 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'
where 1 =1
<if test="createTime !=null and createTime != ''">
and t.create_time= #{createTime}
@@ -134,8 +150,11 @@
<if test="statusCd !=null and statusCd != ''">
and t.status_cd= #{statusCd}
</if>
+ <if test="weChatType !=null and weChatType != ''">
+ 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}
@@ -148,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 ">
@@ -184,9 +212,18 @@
<if test="remarks !=null and remarks != ''">
, t.remarks= #{remarks}
</if>
+ <if test="objId !=null and objId != ''">
+ , t.obj_id= #{objId}
+ </if>
+ <if test="objType !=null and objType != ''">
+ , t.obj_type= #{objType}
+ </if>
+ <if test="mchId !=null and mchId != ''">
+ , t.mch_id= #{mchId}
+ </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}
@@ -211,11 +248,14 @@
<if test="appSecret !=null and appSecret != ''">
and t.appSecret= #{appSecret}
</if>
+ <if test="weChatType !=null and weChatType != ''">
+ and t.wechat_type= #{weChatType}
+ </if>
<if test="statusCd !=null and statusCd != ''">
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}
@@ -229,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