From a3d1c02c707a26ed7c13393631c1f4b222fe0d0c Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Sat, 17 Oct 2020 11:00:59 +0800 Subject: [PATCH] fix bug --- .../java/com/iformall/config/RedisConfig.java | 2 + .../java/com/iformall/config/RedisConfig.java | 2 + .../java/com/iformall/config/RedisConfig.java | 13 +++ .../java/com/iformall/config/RedisConfig.java | 2 + .../java/com/iformall/config/RedisConfig.java | 2 + .../java/com/iformall/config/RedisConfig.java | 2 + .../java/com/iformall/config/RedisConfig.java | 2 + .../controller/UserTagsController.java | 34 +++---- .../schedule/WxCUserTagsSchedule.java | 3 +- .../iformall/domain/vo/WxCUserBasicTagVo.java | 15 +++ .../service/impl/WxCUserServiceImpl.java | 4 +- .../service/impl/WxCUserTagsServiceImpl.java | 92 ++++++++++--------- .../impl/WxCreditHistoryServiceImpl.java | 1 + .../main/resources/mapper/WxMallMapper.xml | 2 +- .../java/com/iformall/config/RedisConfig.java | 2 + 15 files changed, 115 insertions(+), 63 deletions(-) create mode 100644 mallinkService/src/main/java/com/iformall/domain/vo/WxCUserBasicTagVo.java diff --git a/mallinkAdmin/src/main/java/com/iformall/config/RedisConfig.java b/mallinkAdmin/src/main/java/com/iformall/config/RedisConfig.java index 46616ae3b..2209698a7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/config/RedisConfig.java +++ b/mallinkAdmin/src/main/java/com/iformall/config/RedisConfig.java @@ -2,6 +2,7 @@ package com.iformall.config; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.PropertyAccessor; +import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.*; @@ -271,6 +272,7 @@ public class RedisConfig extends CachingConfigurerSupport { Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(Object.class); ObjectMapper om = new ObjectMapper(); om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + om.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); j.setObjectMapper(om); // value值的序列化 diff --git a/mallinkBApi/src/main/java/com/iformall/config/RedisConfig.java b/mallinkBApi/src/main/java/com/iformall/config/RedisConfig.java index 5b092435a..ba613bdbd 100644 --- a/mallinkBApi/src/main/java/com/iformall/config/RedisConfig.java +++ b/mallinkBApi/src/main/java/com/iformall/config/RedisConfig.java @@ -2,6 +2,7 @@ package com.iformall.config; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.PropertyAccessor; +import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.*; @@ -246,6 +247,7 @@ public class RedisConfig extends CachingConfigurerSupport { Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(Object.class); ObjectMapper om = new ObjectMapper(); om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + om.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); j.setObjectMapper(om); // value值的序列化 diff --git a/mallinkCApi/src/main/java/com/iformall/config/RedisConfig.java b/mallinkCApi/src/main/java/com/iformall/config/RedisConfig.java index c3d6eeb38..02e61114a 100644 --- a/mallinkCApi/src/main/java/com/iformall/config/RedisConfig.java +++ b/mallinkCApi/src/main/java/com/iformall/config/RedisConfig.java @@ -2,6 +2,7 @@ package com.iformall.config; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.PropertyAccessor; +import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.*; @@ -69,6 +70,7 @@ public class RedisConfig extends CachingConfigurerSupport { Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(PushLimit.class); ObjectMapper om = new ObjectMapper(); om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + om.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); j.setObjectMapper(om); // value值的序列化 template.setValueSerializer(j); @@ -89,6 +91,7 @@ public class RedisConfig extends CachingConfigurerSupport { Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(WxScoreRules.class); ObjectMapper om = new ObjectMapper(); om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + om.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); j.setObjectMapper(om); // value值的序列化 template.setValueSerializer(j); @@ -110,6 +113,7 @@ public class RedisConfig extends CachingConfigurerSupport { ObjectMapper om = new ObjectMapper(); om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + om.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); j.setObjectMapper(om); // value值的序列化 @@ -133,6 +137,7 @@ public class RedisConfig extends CachingConfigurerSupport { ObjectMapper om = new ObjectMapper(); om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + om.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); j.setObjectMapper(om); // value值的序列化 @@ -155,6 +160,7 @@ public class RedisConfig extends CachingConfigurerSupport { ObjectMapper om = new ObjectMapper(); om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + om.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); j.setObjectMapper(om); // value值的序列化 template.setValueSerializer(j); @@ -176,6 +182,7 @@ public class RedisConfig extends CachingConfigurerSupport { ObjectMapper om = new ObjectMapper(); om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + om.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); j.setObjectMapper(om); // value值的序列化 template.setValueSerializer(j); @@ -196,6 +203,7 @@ public class RedisConfig extends CachingConfigurerSupport { Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(List.class); ObjectMapper om = new ObjectMapper(); om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + om.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); j.setObjectMapper(om); // value值的序列化 template.setValueSerializer(j); @@ -216,6 +224,7 @@ public class RedisConfig extends CachingConfigurerSupport { Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(WxCouponCVo.class); ObjectMapper om = new ObjectMapper(); om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + om.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); j.setObjectMapper(om); // value值的序列化 template.setValueSerializer(j); @@ -236,6 +245,7 @@ public class RedisConfig extends CachingConfigurerSupport { Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(PageInfo.class); ObjectMapper om = new ObjectMapper(); om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + om.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); j.setObjectMapper(om); // value值的序列化 @@ -257,6 +267,7 @@ public class RedisConfig extends CachingConfigurerSupport { Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(WxBuser.class); ObjectMapper om = new ObjectMapper(); om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + om.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); j.setObjectMapper(om); // value值的序列化 @@ -278,6 +289,7 @@ public class RedisConfig extends CachingConfigurerSupport { Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(WxOrder.class); ObjectMapper om = new ObjectMapper(); om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + om.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); j.setObjectMapper(om); // value值的序列化 @@ -307,6 +319,7 @@ public class RedisConfig extends CachingConfigurerSupport { Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(Object.class); ObjectMapper om = new ObjectMapper(); om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + om.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); j.setObjectMapper(om); // value值的序列化 diff --git a/mallinkCallback/src/main/java/com/iformall/config/RedisConfig.java b/mallinkCallback/src/main/java/com/iformall/config/RedisConfig.java index ae4ab7b33..d246d027c 100644 --- a/mallinkCallback/src/main/java/com/iformall/config/RedisConfig.java +++ b/mallinkCallback/src/main/java/com/iformall/config/RedisConfig.java @@ -2,6 +2,7 @@ package com.iformall.config; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.PropertyAccessor; +import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.*; @@ -270,6 +271,7 @@ public class RedisConfig extends CachingConfigurerSupport { Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(Object.class); ObjectMapper om = new ObjectMapper(); om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + om.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); j.setObjectMapper(om); // value值的序列化 diff --git a/mallinkMQConsumer/src/main/java/com/iformall/config/RedisConfig.java b/mallinkMQConsumer/src/main/java/com/iformall/config/RedisConfig.java index 266b1eeb7..134101e77 100644 --- a/mallinkMQConsumer/src/main/java/com/iformall/config/RedisConfig.java +++ b/mallinkMQConsumer/src/main/java/com/iformall/config/RedisConfig.java @@ -2,6 +2,7 @@ package com.iformall.config; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.PropertyAccessor; +import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.*; @@ -256,6 +257,7 @@ public class RedisConfig extends CachingConfigurerSupport { Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(Object.class); ObjectMapper om = new ObjectMapper(); om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + om.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); j.setObjectMapper(om); // value值的序列化 diff --git a/mallinkPosApi/src/main/java/com/iformall/config/RedisConfig.java b/mallinkPosApi/src/main/java/com/iformall/config/RedisConfig.java index 04f667935..ea5936826 100644 --- a/mallinkPosApi/src/main/java/com/iformall/config/RedisConfig.java +++ b/mallinkPosApi/src/main/java/com/iformall/config/RedisConfig.java @@ -2,6 +2,7 @@ package com.iformall.config; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.PropertyAccessor; +import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.*; @@ -238,6 +239,7 @@ public class RedisConfig extends CachingConfigurerSupport { Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(Object.class); ObjectMapper om = new ObjectMapper(); om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + om.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); j.setObjectMapper(om); // value值的序列化 diff --git a/mallinkSchedule/src/main/java/com/iformall/config/RedisConfig.java b/mallinkSchedule/src/main/java/com/iformall/config/RedisConfig.java index b8006da26..2c027a7af 100644 --- a/mallinkSchedule/src/main/java/com/iformall/config/RedisConfig.java +++ b/mallinkSchedule/src/main/java/com/iformall/config/RedisConfig.java @@ -2,6 +2,7 @@ package com.iformall.config; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.PropertyAccessor; +import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.*; @@ -256,6 +257,7 @@ public class RedisConfig extends CachingConfigurerSupport { Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(Object.class); ObjectMapper om = new ObjectMapper(); om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + om.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); j.setObjectMapper(om); // value值的序列化 diff --git a/mallinkSchedule/src/main/java/com/iformall/controller/UserTagsController.java b/mallinkSchedule/src/main/java/com/iformall/controller/UserTagsController.java index 63864d432..e33c7ecb1 100644 --- a/mallinkSchedule/src/main/java/com/iformall/controller/UserTagsController.java +++ b/mallinkSchedule/src/main/java/com/iformall/controller/UserTagsController.java @@ -30,21 +30,21 @@ public class UserTagsController { @Autowired WxCUserBasicInfoService wxCUserBasicInfoService; - @GetMapping("/userTag") - public void mqtest() { - WxCUserBasicInfo wxCUserBasicInfo = new WxCUserBasicInfo(); - - int pageIndex = 1; - final int pageSize = 1000; - - PageInfo page; - do{ - page = wxCUserBasicInfoService.listAsPage(wxCUserBasicInfo, pageIndex++, pageSize); - page.getList().stream().forEach(cubi -> { - long lStart = System.currentTimeMillis(); - wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_SCAN, cubi); - logger.info("user tag cost time: {}", System.currentTimeMillis() - lStart); - }); - } while ((page.isHasNextPage())); - } +// @GetMapping("/userTag") +// public void mqtest() { +// WxCUserBasicInfo wxCUserBasicInfo = new WxCUserBasicInfo(); +// +// int pageIndex = 1; +// final int pageSize = 1000; +// +// PageInfo page; +// do{ +// page = wxCUserBasicInfoService.listAsPage(wxCUserBasicInfo, pageIndex++, pageSize); +// page.getList().stream().forEach(cubi -> { +// long lStart = System.currentTimeMillis(); +// wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_SCAN, cubi); +// logger.info("user tag cost time: {}", System.currentTimeMillis() - lStart); +// }); +// } while ((page.isHasNextPage())); +// } } \ No newline at end of file diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserTagsSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserTagsSchedule.java index 3fe9303ff..8e0f6c4ba 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserTagsSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserTagsSchedule.java @@ -14,6 +14,7 @@ import org.springframework.stereotype.Component; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxCUserBasicInfo; import com.iformall.domain.po.WxMall; +import com.iformall.domain.vo.WxCUserBasicTagVo; import com.iformall.enums.EnumAssignTagsTrigger; import com.iformall.service.WxCUserBasicInfoService; import com.iformall.service.WxCUserTagsService; @@ -62,7 +63,7 @@ public class WxCUserTagsSchedule { page = wxCUserBasicInfoService.listAsPage(wxCUserBasicInfo, pageIndex++, pageSize); page.getList().stream().forEach(cubi -> { try { - wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_SCAN, cubi); + wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_SCAN, new WxCUserBasicTagVo((WxCUserBasicInfo)cubi,mall.getTenantId())); }catch(Exception e) { logger.error("wxCUserTagsSchedule error."+cubi.toString(),e); } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCUserBasicTagVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCUserBasicTagVo.java new file mode 100644 index 000000000..4caf02df3 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCUserBasicTagVo.java @@ -0,0 +1,15 @@ +package com.iformall.domain.vo; + +import com.iformall.domain.po.WxCUserBasicInfo; + +import lombok.AllArgsConstructor; +import lombok.Data; + +@Data +@AllArgsConstructor +public class WxCUserBasicTagVo { + + private WxCUserBasicInfo basicInfo; + private String tenantId; + +} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java index 18cc1c12a..b38a8678e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java @@ -285,6 +285,7 @@ public class WxCUserServiceImpl implements WxCUserService { loingcount = Integer.parseInt(wxCUserBasicInfo.getLoginCount().toString()); }catch(Exception e) { } + basicInfo.setFinalTenantId(user.getFinalTenantId()); basicInfo.setLoginCount(loingcount+1); wxCUserBasicInfoService.update(basicInfo); } @@ -293,6 +294,7 @@ public class WxCUserServiceImpl implements WxCUserService { WxCUser cUser = new WxCUser(); cUser.setId(user.getId()); cUser.setActiveTime(new Date()); + cUser.setTenantId(user.getTenantId()); saveOrUpdate(cUser); } wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_LOGIN, wxCUser); @@ -328,7 +330,7 @@ public class WxCUserServiceImpl implements WxCUserService { } WxCreditHistory wxCreditHistory = new WxCreditHistory(); wxCreditHistory.setCUserId(user.getUserId()); - wxCreditHistory.updateTenantInfo(user); + wxCreditHistory.setTenantId(user.getFinalTenantId()); wxCreditHistory.setCreateDate(new Date()); wxCreditHistory.setCreditType(enumScoreType.getCode()); wxCreditHistory.setOperatorType(EnumUserType.CUSERBASIC.getCode()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java index 3bc7af76e..f5e3d0efb 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java @@ -8,6 +8,7 @@ import com.github.pagehelper.PageInfo; import com.iformall.common.IdWorker; import com.iformall.domain.po.*; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.domain.vo.WxCUserBasicTagVo; import com.iformall.enums.*; import com.iformall.mapper.*; import com.iformall.service.WxCUserTagsService; @@ -551,7 +552,7 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { return resList; } - private List assignTypeId21(WxCUserBasicInfo user) { + private List assignTypeId21(WxCUserBasicInfo user,String tenantId) { List resList = null; Calendar startC = Calendar.getInstance(); startC.setTime(new Date()); @@ -561,6 +562,7 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { wxCouponOrder.setCUserId(user.getId()); wxCouponOrder.setStartTime(startC.getTime()); wxCouponOrder.setEndTime(new Date()); + wxCouponOrder.setTenantId(tenantId); int count = wxCouponOrderMapper.findCount(wxCouponOrder); @@ -695,52 +697,56 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { resList = assignTypeId7(user, param.getPhone()); } //活跃 - resList = assignTypeId21(user); + resList = assignTypeId21(user,param.getTenantId()); } } break; case ASSIGN_TAGS_TRIGGER_SCAN: { - WxCUserBasicInfo user = (WxCUserBasicInfo) obj; - if (user != null) { - - if (user.getSex() != null) { - //性别 - resList = assignTypeId1(user, user.getSex()); - } - if (user.getBirthdate() != null) { - //X0后 - resList = assignTypeId2(user, user.getBirthdate()); - //生肖 - resList = assignTypeId3(user, user.getBirthdate()); - //星座 - resList = assignTypeId4(user, user.getBirthdate()); - } - if (user.getPhone() != null) { - //运营商 - resList = assignTypeId7(user, user.getPhone()); - } - if (user.getEducation() != null) { - //学历 - resList = assignTypeId6(user, user.getEducation()); - } - - //消费类别 - resList = assignTypeId14(user); - //饮食偏好 - resList = assignTypeId17(user); - - //消费时段 - resList = assignTypeId18(user); - //消费频度 - resList = assignTypeId22(user); - //活跃 - resList = assignTypeId21(user); - - //车 - WxCUserCar wxCUserCar = new WxCUserCar(); - wxCUserCar.setCUserId(user.getId()); - if (wxCUserCarMapper.countList(wxCUserCar) > 0) { - resList = assignTypeId11(user); + WxCUserBasicTagVo suser = (WxCUserBasicTagVo) obj; + if (suser != null) { + + WxCUserBasicInfo user = suser.getBasicInfo(); + if ( user != null) { + + if (user.getSex() != null) { + //性别 + resList = assignTypeId1(user, user.getSex()); + } + if (user.getBirthdate() != null) { + //X0后 + resList = assignTypeId2(user, user.getBirthdate()); + //生肖 + resList = assignTypeId3(user, user.getBirthdate()); + //星座 + resList = assignTypeId4(user, user.getBirthdate()); + } + if (user.getPhone() != null) { + //运营商 + resList = assignTypeId7(user, user.getPhone()); + } + if (user.getEducation() != null) { + //学历 + resList = assignTypeId6(user, user.getEducation()); + } + + //消费类别 + resList = assignTypeId14(user); + //饮食偏好 + resList = assignTypeId17(user); + + //消费时段 + resList = assignTypeId18(user); + //消费频度 + resList = assignTypeId22(user); + //活跃 + resList = assignTypeId21(user,suser.getTenantId()); + + //车 + WxCUserCar wxCUserCar = new WxCUserCar(); + wxCUserCar.setCUserId(user.getId()); + if (wxCUserCarMapper.countList(wxCUserCar) > 0) { + resList = assignTypeId11(user); + } } } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java index 0d262696c..192d8ed60 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java @@ -264,6 +264,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { if (hasBirthDateCredit) { wxCUserBasicInfoNew.setScoreDate(new Date()); } + wxCUserBasicInfoNew.setFinalTenantId(wxCUserBasicInfo.getFinalTenantId()); wxCUserBasicInfoMapper.updateById(wxCUserBasicInfoNew); } diff --git a/mallinkService/src/main/resources/mapper/WxMallMapper.xml b/mallinkService/src/main/resources/mapper/WxMallMapper.xml index e58559212..3c02442b1 100644 --- a/mallinkService/src/main/resources/mapper/WxMallMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMallMapper.xml @@ -165,7 +165,7 @@ select from wx_mall - where 1=1 and `tenant_id` = #{value} + where `tenant_id` = #{value}