From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/store/MerchantMemberServiceDaoImplMapper.xml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/store/MerchantMemberServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/store/MerchantMemberServiceDaoImplMapper.xml
index 1190078..fcd68cd 100755
--- a/java110-db/src/main/resources/mapper/store/MerchantMemberServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/store/MerchantMemberServiceDaoImplMapper.xml
@@ -6,7 +6,7 @@
<!--鏍规嵁瀹㈡埛ID 鏌ヨ瀹㈡埛淇℃伅锛屽叾涓寘鎷� merchant 鍜宮erchantAttr 鏁版嵁-->
- <select id="queryDataToMerchantMember" parameterType="com.java110.entity.merchant.MerchantMember" resultType="com.java110.entity.merchant.MerchantMember">
+ <select id="queryDataToMerchantMember" parameterType="com.java110.dto.store.MerchantMember" resultType="com.java110.dto.store.MerchantMember">
select mm.id,
mm.merchantId,
@@ -32,7 +32,7 @@
]]>
</select>
- <select id="queryBoMerchantMember" parameterType="com.java110.entity.merchant.BoMerchantMember" resultType="com.java110.entity.merchant.BoMerchantMember">
+ <select id="queryBoMerchantMember" parameterType="com.java110.dto.store.BoMerchantMember" resultType="com.java110.dto.store.BoMerchantMember">
select mm.boId,
mm.merchantId,
mm.memberId,
@@ -56,18 +56,18 @@
</select>
<!-- 淇濆瓨杩囩▼鏁版嵁 add by wuxw 2017-09-08 21:48 -->
- <insert id="saveDataToBoMerchantMember" parameterType="com.java110.entity.merchant.BoMerchantMember">
+ <insert id="saveDataToBoMerchantMember" parameterType="com.java110.dto.store.BoMerchantMember">
insert into bo_merchant_member(boId,merchantId,memberId,versionId,memberType,state,start_dt,end_dt)
values(#boId#,#merchantId#,#memberId#,#versionId#,#memberType#,#state#,#start_dt#,#end_dt#)
</insert>
<!-- 淇濆瓨瀹炰緥鏁版嵁 add by wuxw 2017-09-08 21:58 -->
- <insert id="saveDataToMerchant" parameterType="com.java110.entity.merchant.BoMerchantMember">
+ <insert id="saveDataToMerchant" parameterType="com.java110.dto.store.BoMerchantMember">
insert into merchant_member(merchantId,memberId,versionId,memberType,status_cd,start_dt,end_dt,version_dt)
values(#merchantId#,#memberId#,#versionId#,#memberType#,'0',#start_dt#,#end_dt#,now())
</insert>
<!-- 鍒犻櫎瀹炰緥鏁版嵁 add by wuxw 2017-09-08 22:02 -->
- <update id="deleteDataToMerchant" parameterType="com.java110.entity.merchant.BoMerchantMember">
+ <update id="deleteDataToMerchant" parameterType="com.java110.dto.store.BoMerchantMember">
update merchant_member mm set mm.status_cd = '1',mm.versionId = #versionId#,mm.version_dt = now() where mm.memberId = #memberId#
and mm.merchantId = #merchantId#
</update>
--
Gitblit v1.8.0