From 98cceb14b47189a2506786482a04f7a10b24849f Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Mon, 5 Aug 2019 16:55:40 +0800 Subject: [PATCH 1/5] =?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} + + From b104c359a81e91b74643d174c6ca5c68c17f89ed Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 5 Aug 2019 17:07:11 +0800 Subject: [PATCH 2/5] =?UTF-8?q?[C=E7=AB=AF=E6=B6=88=E8=B4=B9=E5=8D=A1][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=94=AF=E4=BB=98=E6=97=B6=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E6=98=AF=E5=90=A6=E5=B7=B2=E4=B8=8B=E6=9E=B6=EF=BC=8C?= =?UTF-8?q?=E4=B8=8B=E6=9E=B6=E5=90=8E=E5=8D=A1=E4=B8=8D=E5=8F=AF=E8=BD=AC?= =?UTF-8?q?=E8=B5=A0]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxOrderServiceImpl.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index 5dcb28107..4db7b3630 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -599,6 +599,16 @@ public class WxOrderServiceImpl implements WxOrderService { cardInfo.setCreateDate(curr); cardInfo.setUpdateDate(curr); cardInfo.setSupportTransfer(coupon.getSupportTransfer()); + + //检查卡是否下架,如果是,不可转赠 + WxCouponChannel couponChannel = new WxCouponChannel(); + couponChannel.setCouponId(coupon.getId()); + couponChannel.setTenantId(user.getTenantId()); + couponChannel.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_CARD.getCode()); + WxCouponChannel wxCouponChannel = wxCouponChannelMapper.selectOne(couponChannel); + if (wxCouponChannel != null && wxCouponChannel.getStatus().equals(EnumCouponChannelStatus.STATUS_TAKE_OFFF.getCode())) { + cardInfo.setSupportTransfer(EnumCouponTransfer.NO.getCode()); + } wxCardInfoMapper.insertSelective(cardInfo); } return couponOrder; From 8b1c4c5c8d5b1a22cdae108e44d9c84de8b788ee Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Mon, 5 Aug 2019 17:08:41 +0800 Subject: [PATCH 3/5] =?UTF-8?q?[=E6=8E=88=E6=9D=83=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E5=8F=B7][=E4=BF=AE=E6=94=B9]:=E7=AC=AC=E4=B8=80=E6=AC=A1?= =?UTF-8?q?=E6=8E=88=E6=9D=83=E6=89=8B=E6=9C=BA=E5=8F=B7=EF=BC=8C=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E7=A7=AF=E5=88=86=E8=A1=A5=E5=BD=95=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/WxUserGrantController.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index fae354d30..63ef3f549 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -518,10 +518,6 @@ public class WxUserGrantController extends BaseController { int score = user.getScore() == null ? 0 : user.getScore(); int memScore = basicInfo.getPoins() == null ? 0 : basicInfo.getPoins(); int memCredit = basicInfo.getCredit() == null ? 0 : basicInfo.getCredit(); - if (memCredit > 0) { - user.setCredit(memCredit); - wxCUserService.addCredit(user, EnumScoreType.MEM_IMPORT); - } user.setCredit(memCredit + credit); user.setScore(memScore + score); } From eec7629137aa6aef98011f0d72f6df7c71292bed Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 5 Aug 2019 19:08:15 +0800 Subject: [PATCH 4/5] =?UTF-8?q?[C=E7=AB=AF=E6=B6=88=E8=B4=B9=E5=8D=A1][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=94=AF=E4=BB=98=E6=97=B6=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E6=98=AF=E5=90=A6=E5=B7=B2=E4=B8=8B=E6=9E=B6=EF=BC=8C?= =?UTF-8?q?=E4=B8=8B=E6=9E=B6=E5=90=8E=E5=8D=A1=E4=B8=8D=E5=8F=AF=E8=BD=AC?= =?UTF-8?q?=E8=B5=A0]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxOrderServiceImpl.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index 4db7b3630..126ddd808 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -601,11 +601,7 @@ public class WxOrderServiceImpl implements WxOrderService { cardInfo.setSupportTransfer(coupon.getSupportTransfer()); //检查卡是否下架,如果是,不可转赠 - WxCouponChannel couponChannel = new WxCouponChannel(); - couponChannel.setCouponId(coupon.getId()); - couponChannel.setTenantId(user.getTenantId()); - couponChannel.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_CARD.getCode()); - WxCouponChannel wxCouponChannel = wxCouponChannelMapper.selectOne(couponChannel); + WxCouponChannel wxCouponChannel = wxCouponChannelMapper.selectByPrimaryKey(order.getCouponChannelId()); if (wxCouponChannel != null && wxCouponChannel.getStatus().equals(EnumCouponChannelStatus.STATUS_TAKE_OFFF.getCode())) { cardInfo.setSupportTransfer(EnumCouponTransfer.NO.getCode()); } From a39615b06a8bbb8c8c5d379f1fbf3cbd4b204e6b Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Mon, 5 Aug 2019 19:15:41 +0800 Subject: [PATCH 5/5] =?UTF-8?q?[=E6=8E=88=E6=9D=83=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E5=8F=B7][=E4=BF=AE=E6=94=B9]:=E6=9B=B4=E6=96=B0=E6=88=90?= =?UTF-8?q?=E9=95=BF=E5=80=BC=E5=92=8C=E7=A7=AF=E5=88=86=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxCreditHistoryMapper.xml | 2 +- .../src/main/resources/mapper/WxScoreHistoryMapper.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml b/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml index 788127472..cf08e5116 100644 --- a/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml @@ -204,6 +204,6 @@ update wx_credit_history set c_user_id=#{newUserId} where tenant_id=#{tenantId} - and c_user_id = #{userId} + and c_user_id = #{cUserId} diff --git a/mallinkService/src/main/resources/mapper/WxScoreHistoryMapper.xml b/mallinkService/src/main/resources/mapper/WxScoreHistoryMapper.xml index 8378192cf..85162b0ff 100644 --- a/mallinkService/src/main/resources/mapper/WxScoreHistoryMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxScoreHistoryMapper.xml @@ -118,7 +118,7 @@ update wx_score_history set c_user_id=#{newUserId} where tenant_id=#{tenantId} - and c_user_id = #{userId} + and c_user_id = #{cUserId}