diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserCheckSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserCheckSchedule.java index 509c1d6a9..401c5915e 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserCheckSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserCheckSchedule.java @@ -28,7 +28,7 @@ public class WxCUserCheckSchedule { @Autowired private WxCUserMapper cUserMapper; - @Scheduled(cron = "0 0 8 * * ?") // 每天凌晨08:00对c_user扫描查重 + //@Scheduled(cron = "0 0 8 * * ?") // 每天凌晨08:00对c_user扫描查重 // @Scheduled(cron = "0 */1 * * * ?") // 测试1分钟一次 public void cuserCheckDuplicate() { diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml index 56b7c9dc0..659df49d5 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -26,10 +26,10 @@ - cub.`id`,cub.`phone`,cub.`birthdate`,cub.`education`,cub.`sex`,cub.`email`,cub.`address`,cub.`poins`,cub.`tag_id`, - cub.`create_date`,cub.`update_date`,cub.`tenant_id`,cub.`name`,cub.`nick_name`,cub.`credit`,cub.`active_time`,cub.`act_record` + `id`,`phone`,`birthdate`,`education`,`sex`,`email`,`address`,`poins`,`tag_id`, + `create_date`,`update_date`,`tenant_id`,`name`,`nick_name`,`credit`,`active_time`,`act_record` ,(select level from wx_level_config - where poins >= points and tenant_id=cub.tenant_id + where poins >= points and tenant_id=#{tenantId} order by points desc limit 1 ) level,status @@ -37,77 +37,74 @@ where 1 = 1 - and cub.`id` = #{id} + and `id` = #{id} - - and cub.`tenant_id` = #{tenantId} - - - and cu.`parent_tenant_id` = #{parentTenantId} + + and `tenant_id` = #{tenantId} - and cub.`phone` like concat('%', #{phone},'%') + and `phone` like concat('%', #{phone},'%') - and cub.`birthdate` = #{birthdate} + and `birthdate` = #{birthdate} - and cub.`education` like concat('%', #{education},'%') + and `education` like concat('%', #{education},'%') - and cub.`sex` = #{sex} + and `sex` = #{sex} - and cub.`email` like concat('%', #{email},'%') + and `email` like concat('%', #{email},'%') - and cub.`address` like concat('%', #{address},'%') + and `address` like concat('%', #{address},'%') - and cub.`poins` = #{poins} + and `poins` = #{poins} - and cub.`credit` = #{credit} + and `credit` = #{credit} - and cub.`tag_id` = #{tagId} + and `tag_id` = #{tagId} - and cub.`create_date` = #{createDate} + and `create_date` = #{createDate} - and cub.`update_date` = #{updateDate} + and `update_date` = #{updateDate} - and cub.`act_record` = #{actRecord} + and `act_record` = #{actRecord} - and cub.`name` like concat('%', #{name},'%') + and `name` like concat('%', #{name},'%') - and cub.`create_date` between #{startTime} and #{endTime} + and `create_date` between #{startTime} and #{endTime} - and cub.`status` = #{status} + and `status` = #{status} - and cub.id in + and id in #{idItem} @@ -119,8 +116,7 @@ select r.* from ( select - from wx_c_user_basic_info cub - inner join wx_c_user cu on cu.id = cub.id + from wx_c_user_basic_info ) r where 1=1 @@ -136,95 +132,81 @@ update wx_c_user_basic_info set poins=#{poins} - where phone=#{phone} + where phone=#{phone} and tenant_id=#{tenantId} and id=#{id} update wx_c_user_basic_info set id=#{newId} , credit=#{credit} , poins=#{poins} - where id = #{id} + where tenant_id=#{tenantId} + and id = #{id} @@ -253,11 +235,8 @@ and cub.poins is null - - and cub.`tenant_id` = #{tenantId} - - - and cu.`parent_tenant_id` = #{parentTenantId} + + and cub.tenant_id =#{tenantId} @@ -269,83 +248,66 @@ where cub.status = 0 and cu.phone is not null AND DATE_FORMAT(cub.birthdate,'%m-%d') >= #{begin} AND DATE_FORMAT(cub.birthdate,'%m-%d') <= #{end} - - and cub.`tenant_id` = #{tenantId} - - - and cu.`parent_tenant_id` = #{parentTenantId} + + and cub.tenant_id = #{tenantId} @@ -465,7 +423,6 @@ select count(*) from wx_c_user_basic_info cu - inner join wx_c_user c on c.id = cu.id left join wx_c_user_tags cut on cut.`id` = cu.`tag_id` @@ -477,12 +434,8 @@ where 1=1 - - - and cu.`tenant_id` = #{tenantId} - - - and c.`parent_tenant_id` = #{parentTenantId} + + and cu.tenant_id =#{tenantId} @@ -550,7 +503,6 @@ select from wx_c_user_basic_info cu - inner join wx_c_user c on c.id = cu.id join wx_c_user_tags cut on cut.`id` = cu.`tag_id` @@ -570,22 +521,15 @@ @@ -596,5 +540,4 @@ - - + \ No newline at end of file