From 98cceb14b47189a2506786482a04f7a10b24849f Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Mon, 5 Aug 2019 16:55:40 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BC=9A=E5=91=98ID][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E4=BC=9A=E5=91=98ID=E4=BF=AE=E6=94=B9=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=EF=BC=8C=E6=88=90=E9=95=BF=E5=80=BC=E5=8E=86=E5=8F=B2=E8=A1=A8?= =?UTF-8?q?=E3=80=81=E4=BC=9A=E5=91=98=E5=8E=86=E5=8F=B2=E8=A1=A8=E5=90=8C?= =?UTF-8?q?=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{CUserTagVo.java => CUserTagNewIdVo.java} | 6 ++++- .../domain/vo/WxCreditHistoryNewIdVo.java | 19 +++++++++++++ .../domain/vo/WxScoreHistoryNewIdVo.java | 17 ++++++++++++ .../iformall/mapper/WxCUserTagsMapper.java | 4 +-- .../mapper/WxCreditHistoryMapper.java | 4 ++- .../iformall/mapper/WxScoreHistoryMapper.java | 3 +++ .../impl/WxCUserBasicInfoServiceImpl.java | 27 ++++++++++++++++--- .../resources/mapper/WxCUserTagsMapper.xml | 2 +- .../mapper/WxCreditHistoryMapper.xml | 7 +++++ .../resources/mapper/WxScoreHistoryMapper.xml | 7 +++++ 10 files changed, 88 insertions(+), 8 deletions(-) rename mallinkService/src/main/java/com/iformall/domain/vo/{CUserTagVo.java => CUserTagNewIdVo.java} (61%) create mode 100644 mallinkService/src/main/java/com/iformall/domain/vo/WxCreditHistoryNewIdVo.java create mode 100644 mallinkService/src/main/java/com/iformall/domain/vo/WxScoreHistoryNewIdVo.java diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/CUserTagVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/CUserTagNewIdVo.java similarity index 61% rename from mallinkService/src/main/java/com/iformall/domain/vo/CUserTagVo.java rename to mallinkService/src/main/java/com/iformall/domain/vo/CUserTagNewIdVo.java index 0fce01079..f2961a48f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/CUserTagVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/CUserTagNewIdVo.java @@ -5,13 +5,17 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; +import javax.persistence.Transient; + /** * Created by syf on 2018/8/30. */ @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class CUserTagVo extends WxCUserTags { +public class CUserTagNewIdVo extends WxCUserTags { + @Transient + @io.swagger.annotations.ApiModelProperty(value="用户新的ID",name="newUserId") private Long newUserId; } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCreditHistoryNewIdVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCreditHistoryNewIdVo.java new file mode 100644 index 000000000..757f6593a --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCreditHistoryNewIdVo.java @@ -0,0 +1,19 @@ +package com.iformall.domain.vo; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import com.iformall.domain.po.WxCreditHistory; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.persistence.Transient; +import java.util.Date; + +@Data +@EqualsAndHashCode(callSuper = true) +public class WxCreditHistoryNewIdVo extends WxCreditHistory { + + @Transient + @io.swagger.annotations.ApiModelProperty(value="用户新的ID",name="newUserId") + private Long newUserId; + +} diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxScoreHistoryNewIdVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxScoreHistoryNewIdVo.java new file mode 100644 index 000000000..7704ae20c --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxScoreHistoryNewIdVo.java @@ -0,0 +1,17 @@ +package com.iformall.domain.vo; + +import com.iformall.domain.po.WxScoreHistory; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.persistence.Transient; + +@Data +@EqualsAndHashCode(callSuper = true) +public class WxScoreHistoryNewIdVo extends WxScoreHistory { + + @Transient + @io.swagger.annotations.ApiModelProperty(value="用户新的ID",name="newUserId") + private Long newUserId; + +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCUserTagsMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCUserTagsMapper.java index 58bef4b85..98c0a668d 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCUserTagsMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCUserTagsMapper.java @@ -5,7 +5,7 @@ import java.util.List; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxCUserTags; -import com.iformall.domain.vo.CUserTagVo; +import com.iformall.domain.vo.CUserTagNewIdVo; import org.apache.ibatis.annotations.Param; public interface WxCUserTagsMapper extends CommonMapper { @@ -15,5 +15,5 @@ public interface WxCUserTagsMapper extends CommonMapper { long countUser(@Param("tagIds")String tagIds,@Param("tenantId")String tenantId, @Param("startTime")Date startTime,@Param("endTime")Date endTime); - void updateNewId(CUserTagVo record); + void updateNewId(CUserTagNewIdVo record); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCreditHistoryMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCreditHistoryMapper.java index a6c101581..5fb277662 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCreditHistoryMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCreditHistoryMapper.java @@ -2,7 +2,7 @@ package com.iformall.mapper; import java.util.*; import com.iformall.common.CommonMapper; -import com.iformall.domain.po.WxScoreHistory; +import com.iformall.domain.vo.WxCreditHistoryNewIdVo; import com.iformall.domain.vo.WxCreditHistoryVo; import com.iformall.domain.po.WxCreditHistory; @@ -18,4 +18,6 @@ public interface WxCreditHistoryMapper extends CommonMapper { @@ -12,5 +13,7 @@ public interface WxScoreHistoryMapper extends CommonMapper - + update wx_c_user_tags set user_id=#{newUserId} where tenant_id=#{tenantId} diff --git a/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml b/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml index 77da884ae..788127472 100644 --- a/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml @@ -199,4 +199,11 @@ and `credit_type` = #{creditType} + + + update wx_credit_history + set c_user_id=#{newUserId} + where tenant_id=#{tenantId} + and c_user_id = #{userId} + diff --git a/mallinkService/src/main/resources/mapper/WxScoreHistoryMapper.xml b/mallinkService/src/main/resources/mapper/WxScoreHistoryMapper.xml index 08ffb697e..8378192cf 100644 --- a/mallinkService/src/main/resources/mapper/WxScoreHistoryMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxScoreHistoryMapper.xml @@ -114,4 +114,11 @@ + + update wx_score_history + set c_user_id=#{newUserId} + where tenant_id=#{tenantId} + and c_user_id = #{userId} + +