| @@ -64,12 +64,12 @@ public interface WxCUserBasicInfoMapper extends CommonMapper<WxCUserBasicInfo, S | |||||
| long findGrowUserCount(@Param("finalTenantId")String finalTenantId); | long findGrowUserCount(@Param("finalTenantId")String finalTenantId); | ||||
| long findGrowUserCount1(@Param("tenantId")String tenantId,@Param("parentTenantId")String parentTenantId); | |||||
| long findGrowUserCount1(@Param("tenantId")String tenantId,@Param("finalTenantId")String finalTenantId); | |||||
| //long findImportUserCount(@Param("finalTenantId")String finalTenantId); | //long findImportUserCount(@Param("finalTenantId")String finalTenantId); | ||||
| //long findImportUserCount1(@Param("tenantId")String tenantId,@Param("parentTenantId")String parentTenantId); | //long findImportUserCount1(@Param("tenantId")String tenantId,@Param("parentTenantId")String parentTenantId); | ||||
| void incActRecordById(Long id); | |||||
| void incActRecordById(@Param("id")Long id,@Param("finalTenantId")String finalTenantId); | |||||
| /** | /** | ||||
| * 查找wx_c_user中不存在的用户 | * 查找wx_c_user中不存在的用户 | ||||
| @@ -77,7 +77,7 @@ public interface WxCUserBasicInfoMapper extends CommonMapper<WxCUserBasicInfo, S | |||||
| */ | */ | ||||
| // List<WxCUserBasicInfo> selectNotCUserList(); | // List<WxCUserBasicInfo> 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); | |||||
| } | } | ||||
| @@ -169,6 +169,6 @@ public interface WxCUserBasicInfoService { | |||||
| List<WxCUserBasicInfo> findBirthdayList(TenantEntity tenantEntity, String format, String format1); | List<WxCUserBasicInfo> findBirthdayList(TenantEntity tenantEntity, String format, String format1); | ||||
| void cuserOldToNew(Long oldCuserId, Long newCuserId); | |||||
| void cuserOldToNew(Long oldCuserId, Long newCuserId,TenantEntity tenantinfo); | |||||
| } | } | ||||
| @@ -1142,7 +1142,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc | |||||
| public long findGrowUserCount(TenantEntity tenantEntity) { | public long findGrowUserCount(TenantEntity tenantEntity) { | ||||
| if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){ | if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){ | ||||
| //关联微信表查询 | //关联微信表查询 | ||||
| return wxCUserBasicInfoMapper.findGrowUserCount1(tenantEntity.getTenantId(),tenantEntity.getParentTenantId()); | |||||
| return wxCUserBasicInfoMapper.findGrowUserCount1(tenantEntity.getTenantId(),tenantEntity.getFinalTenantId()); | |||||
| }else{ | }else{ | ||||
| //直接查询本表 | //直接查询本表 | ||||
| String finalTenantId = tenantEntity.getTenantId(); | String finalTenantId = tenantEntity.getTenantId(); | ||||
| @@ -1214,8 +1214,10 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc | |||||
| } | } | ||||
| @Override | @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 | @Override | ||||
| @@ -1416,7 +1416,7 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| } | } | ||||
| if (jo != null) { | if (jo != null) { | ||||
| if (jo.getIntValue("type") == EnumCouponConditionType.NEW_MEMBER.getCode()) { | if (jo.getIntValue("type") == EnumCouponConditionType.NEW_MEMBER.getCode()) { | ||||
| wxCUserBasicInfoMapper.incActRecordById(basicUser.getId()); | |||||
| wxCUserBasicInfoMapper.incActRecordById(basicUser.getId(),coupon.getFinalTenantId()); | |||||
| } | } | ||||
| } | } | ||||
| @@ -1021,8 +1021,9 @@ | |||||
| <select id="findGrowUserCount" resultType="java.lang.Long"> | <select id="findGrowUserCount" resultType="java.lang.Long"> | ||||
| SELECT count(distinct cubi.id) FROM wx_c_user_basic_info cubi | 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 | |||||
| <!-- left join wx_c_user cu on cubi.id=cu.user_id | |||||
| where cu.id is not null --> | |||||
| where 1 =1 | |||||
| <if test=" null != finalTenantId and '' != finalTenantId"> | <if test=" null != finalTenantId and '' != finalTenantId"> | ||||
| and cubi.`final_tenant_id` = #{finalTenantId} | and cubi.`final_tenant_id` = #{finalTenantId} | ||||
| </if> | </if> | ||||
| @@ -1030,15 +1031,16 @@ | |||||
| <select id="findGrowUserCount1" resultType="java.lang.Long"> | <select id="findGrowUserCount1" resultType="java.lang.Long"> | ||||
| SELECT count(distinct cubi.id) FROM wx_c_user_basic_info cubi | 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 | |||||
| <!-- left join wx_c_user cu on cubi.id=cu.user_id | |||||
| where cu.id is not null --> | |||||
| where final_tenant_id = #{finalTenantId} | |||||
| <if test=" null != tenantId and '' != tenantId"> | <if test=" null != tenantId and '' != tenantId"> | ||||
| and cubi.`tenant_id` like concat('%,', #{tenantId},',%') | and cubi.`tenant_id` like concat('%,', #{tenantId},',%') | ||||
| </if> | </if> | ||||
| </select> | </select> | ||||
| <update id="incActRecordById" parameterType="java.lang.Long"> | <update id="incActRecordById" parameterType="java.lang.Long"> | ||||
| 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} | |||||
| </update> | </update> | ||||
| <!--<select id="selectNotCUserList" resultMap="BaseResultMap"> | <!--<select id="selectNotCUserList" resultMap="BaseResultMap"> | ||||