From cff456ae4453b09a8ef15a3169e401a6b37f2c07 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Fri, 16 Oct 2020 11:35:56 +0800 Subject: [PATCH] fix wx_c_user_basic_info --- .../com/iformall/mapper/WxCUserBasicInfoMapper.java | 6 +++--- .../iformall/service/WxCUserBasicInfoService.java | 2 +- .../service/impl/WxCUserBasicInfoServiceImpl.java | 8 +++++--- .../iformall/service/impl/WxOrderServiceImpl.java | 2 +- .../main/resources/mapper/WxCUserBasicInfoMapper.xml | 12 +++++++----- 5 files changed, 17 insertions(+), 13 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCUserBasicInfoMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCUserBasicInfoMapper.java index 161ce3d00..666cc494e 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCUserBasicInfoMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCUserBasicInfoMapper.java @@ -64,12 +64,12 @@ public interface WxCUserBasicInfoMapper extends CommonMapper selectNotCUserList(); - void cuserOldToNew(@Param(value = "oldCuserId")Long oldCuserId, @Param(value = "newCuserId")Long newCuserId); + void cuserOldToNew(@Param(value = "oldCuserId")Long oldCuserId, @Param(value = "newCuserId")Long newCuserId,@Param("tableIndex")Integer tableIndex); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java b/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java index 6d1b5d274..dc1ceb39c 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java @@ -169,6 +169,6 @@ public interface WxCUserBasicInfoService { List findBirthdayList(TenantEntity tenantEntity, String format, String format1); - void cuserOldToNew(Long oldCuserId, Long newCuserId); + void cuserOldToNew(Long oldCuserId, Long newCuserId,TenantEntity tenantinfo); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java index 7f22c015e..2cc40e83a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -1142,7 +1142,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc public long findGrowUserCount(TenantEntity tenantEntity) { if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){ //关联微信表查询 - return wxCUserBasicInfoMapper.findGrowUserCount1(tenantEntity.getTenantId(),tenantEntity.getParentTenantId()); + return wxCUserBasicInfoMapper.findGrowUserCount1(tenantEntity.getTenantId(),tenantEntity.getFinalTenantId()); }else{ //直接查询本表 String finalTenantId = tenantEntity.getTenantId(); @@ -1214,8 +1214,10 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc } @Override - public void cuserOldToNew(Long oldCuserId, Long newCuserId) { - wxCUserBasicInfoMapper.cuserOldToNew(oldCuserId,newCuserId); + public void cuserOldToNew(Long oldCuserId, Long newCuserId,TenantEntity tenantinfo) { + String finalTenantId = tenantinfo.getFinalTenantId(); + Integer tableIndex = Integer.parseInt(String.valueOf(Long.parseLong(finalTenantId)%100)); + wxCUserBasicInfoMapper.cuserOldToNew(oldCuserId,newCuserId,tableIndex); } @Override 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 c8b106552..40ad21f9b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -1416,7 +1416,7 @@ public class WxOrderServiceImpl implements WxOrderService { } if (jo != null) { if (jo.getIntValue("type") == EnumCouponConditionType.NEW_MEMBER.getCode()) { - wxCUserBasicInfoMapper.incActRecordById(basicUser.getId()); + wxCUserBasicInfoMapper.incActRecordById(basicUser.getId(),coupon.getFinalTenantId()); } } diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml index 2aaf22c39..93eb94e19 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -1021,8 +1021,9 @@ SELECT count(distinct cubi.id) FROM wx_c_user_basic_info cubi - left join wx_c_user cu on cubi.id=cu.user_id - where cu.id is not null + + where final_tenant_id = #{finalTenantId} and cubi.`tenant_id` like concat('%,', #{tenantId},',%') - UPDATE wx_c_user_basic_info set act_record = act_record +1 where id = #{id} + UPDATE wx_c_user_basic_info set act_record = act_record +1 where id = #{id} and final_tenant_id = #{finalTenantId}