xhxu 5 лет назад
Родитель
Сommit
3ba2ec5c0c
6 измененных файлов: 35 добавлений и 29 удалений
  1. +2
    -2
      mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java
  2. +5
    -2
      mallinkService/src/main/java/com/iformall/domain/po/msg/FmInsideCLoginMsg.java
  3. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java
  4. +2
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java
  5. +22
    -21
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java
  6. +3
    -3
      mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCLoginMsgServiceImpl.java

+ 2
- 2
mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java Просмотреть файл

@@ -299,7 +299,7 @@ public class WxUserGrantController extends BaseController {


updateCacheCUser(token, oldUser); updateCacheCUser(token, oldUser);
// 登录后处理 // 登录后处理
wxCUserService.actionAfterLogin(oldUser);
wxCUserService.actionMsgAfterLogin(oldUser);


} else { } else {
// 新用户 // 新用户
@@ -339,7 +339,7 @@ public class WxUserGrantController extends BaseController {


updateCacheCUser(token, newUser); updateCacheCUser(token, newUser);
// 登录后处理 // 登录后处理
wxCUserService.actionAfterLogin(newUser);
wxCUserService.actionMsgAfterLogin(newUser);


} }


+ 5
- 2
mallinkService/src/main/java/com/iformall/domain/po/msg/FmInsideCLoginMsg.java Просмотреть файл

@@ -11,12 +11,15 @@ public class FmInsideCLoginMsg extends BaseMsg{


private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;


@io.swagger.annotations.ApiModelProperty(value = "id", name = "id")
private Long id;

@io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId")
private String tenantId; private String tenantId;
@io.swagger.annotations.ApiModelProperty(value="父租户id",name="parentTenantId") @io.swagger.annotations.ApiModelProperty(value="父租户id",name="parentTenantId")
private String parentTenantId; private String parentTenantId;
@io.swagger.annotations.ApiModelProperty(value = "用户ID", name = "cUserId")
private Long cUserId;
@io.swagger.annotations.ApiModelProperty(value = "用户ID", name = "userId")
private Long userId;




} }

+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java Просмотреть файл

@@ -653,6 +653,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc
List<WxCUserBasicChild> childrenList = record.getChildrenList(); List<WxCUserBasicChild> childrenList = record.getChildrenList();
if(childrenList != null && childrenList.size() > 0){ if(childrenList != null && childrenList.size() > 0){
for (WxCUserBasicChild child:childrenList) { for (WxCUserBasicChild child:childrenList) {
child.setId(null);
child.setCUserId(record.getId()); child.setCUserId(record.getId());
wxCUserBasicChildService.saveOrUpdate(child); wxCUserBasicChildService.saveOrUpdate(child);
} }


+ 2
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java Просмотреть файл

@@ -255,9 +255,10 @@ public class WxCUserServiceImpl implements WxCUserService {
@Override @Override
public void actionMsgAfterLogin(WxCUser user) { public void actionMsgAfterLogin(WxCUser user) {
FmInsideCLoginMsg loginMsg = new FmInsideCLoginMsg(); FmInsideCLoginMsg loginMsg = new FmInsideCLoginMsg();
loginMsg.setId(user.getId());
loginMsg.setMsgType(EnumMsgRecordType.INSIDE_C_LOGIN.getCode()); loginMsg.setMsgType(EnumMsgRecordType.INSIDE_C_LOGIN.getCode());
loginMsg.updateTenantInfo(user); loginMsg.updateTenantInfo(user);
loginMsg.setCUserId(user.getId());
loginMsg.setUserId(user.getUserId());
mqBaseProducer.sendMessage(loginMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); mqBaseProducer.sendMessage(loginMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode());
} }




+ 22
- 21
mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java Просмотреть файл

@@ -606,7 +606,7 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService {
return resList; return resList;
} }


private List<WxTags> assignTypeId21(WxCUserBasicInfo user,String tenantId) {
private List<WxTags> assignTypeId21(WxCUserBasicInfo user,TenantEntity tenantEntity) {
List<WxTags> resList = null; List<WxTags> resList = null;
Calendar startC = Calendar.getInstance(); Calendar startC = Calendar.getInstance();
startC.setTime(new Date()); startC.setTime(new Date());
@@ -616,7 +616,7 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService {
wxCouponOrder.setCUserId(user.getId()); wxCouponOrder.setCUserId(user.getId());
wxCouponOrder.setStartTime(startC.getTime()); wxCouponOrder.setStartTime(startC.getTime());
wxCouponOrder.setEndTime(new Date()); wxCouponOrder.setEndTime(new Date());
wxCouponOrder.setTenantId(tenantId);
wxCouponOrder.updateTenantInfo(tenantEntity);


int count = wxCouponOrderMapper.findCount(wxCouponOrder); int count = wxCouponOrderMapper.findCount(wxCouponOrder);


@@ -715,27 +715,27 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService {
WxCUserBasicInfo param = (WxCUserBasicInfo) obj; WxCUserBasicInfo param = (WxCUserBasicInfo) obj;
WxCUserBasicInfo user = wxCUserBasicInfoMapper.selectById(param.getId(),param.getFinalTenantId()); WxCUserBasicInfo user = wxCUserBasicInfoMapper.selectById(param.getId(),param.getFinalTenantId());
if (user != null) { if (user != null) {
if (param.getSex() != null) {
if (user.getSex() != null) {
//性别 //性别
resList = assignTypeId1(user, param.getSex());
resList = assignTypeId1(user, user.getSex());
} }
if (param.getBirthdate() != null) {
if (user.getBirthdate() != null) {
//X0后 //X0后
resList = assignTypeId2(user, param.getBirthdate());
resList = assignTypeId2(user, user.getBirthdate());
//生肖 //生肖
resList = assignTypeId3(user, param.getBirthdate());
resList = assignTypeId3(user, user.getBirthdate());
//星座 //星座
resList = assignTypeId4(user, param.getBirthdate());
resList = assignTypeId4(user, user.getBirthdate());
} }
if (param.getPhone() != null) {
if (user.getPhone() != null) {
//来源 //来源
resList = assignTypeId5(user, false); resList = assignTypeId5(user, false);
//运营商 //运营商
resList = assignTypeId7(user, param.getPhone());
resList = assignTypeId7(user, user.getPhone());
} }
if (param.getEducation() != null) {
if (user.getEducation() != null) {
//学历 //学历
resList = assignTypeId6(user, param.getEducation());
resList = assignTypeId6(user, user.getEducation());
} }
resList = assignTypeId29(user); resList = assignTypeId29(user);
} }
@@ -754,11 +754,11 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService {
WxCUser param = (WxCUser) obj; WxCUser param = (WxCUser) obj;
WxCUserBasicInfo user = wxCUserBasicInfoMapper.selectById(param.getUserId(),param.getFinalTenantId()); WxCUserBasicInfo user = wxCUserBasicInfoMapper.selectById(param.getUserId(),param.getFinalTenantId());
if (user != null) { if (user != null) {
if (param.getPhone() != null) {
if (user.getPhone() != null) {
//来源 //来源
resList = assignTypeId5(user, true); resList = assignTypeId5(user, true);
//运营商 //运营商
resList = assignTypeId7(user, param.getPhone());
resList = assignTypeId7(user, user.getPhone());
} }
} }
} }
@@ -782,24 +782,25 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService {


case ASSIGN_TAGS_TRIGGER_LOGIN: { case ASSIGN_TAGS_TRIGGER_LOGIN: {
WxCUser param = (WxCUser) obj; WxCUser param = (WxCUser) obj;
WxCUserBasicInfo user = wxCUserBasicInfoMapper.selectById(param.getUserId(),param.getFinalTenantId());
WxCUserBasicInfo user = wxCUserBasicInfoMapper.selectById(param.getUserId(),param.getFinalTenantId());

if (user != null) { if (user != null) {
if (param.getGender() != null) {
if (user.getSex() != null) {
//性别 //性别
resList = assignTypeId1(user, param.getGender());
resList = assignTypeId1(user, user.getSex());
} }
if (param.getExtraInfo() != null) { if (param.getExtraInfo() != null) {
//手机品牌 //手机品牌
resList = assignTypeId9(user, param.getExtraInfo()); resList = assignTypeId9(user, param.getExtraInfo());
} }
if (param.getPhone() != null) {
if (user.getPhone() != null) {
//来源 //来源
resList = assignTypeId5(user, true); resList = assignTypeId5(user, true);
//运营商 //运营商
resList = assignTypeId7(user, param.getPhone());
resList = assignTypeId7(user, user.getPhone());
} }
//活跃 //活跃
resList = assignTypeId21(user,param.getTenantId());
resList = assignTypeId21(user,tenantEntity);
} }
} }
break; break;
@@ -843,7 +844,7 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService {
//消费频度 //消费频度
resList = assignTypeId22(user); resList = assignTypeId22(user);
//活跃 //活跃
resList = assignTypeId21(user,suser.getTenantId());
resList = assignTypeId21(user,tenantEntity);
//车 //车
WxCUserCar wxCUserCar = new WxCUserCar(); WxCUserCar wxCUserCar = new WxCUserCar();


+ 3
- 3
mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCLoginMsgServiceImpl.java Просмотреть файл

@@ -35,10 +35,10 @@ public class FmInsideCLoginMsgServiceImpl implements MsgSendService {
@Override @Override
public void send(BaseMsg baseMsg) throws Exception { public void send(BaseMsg baseMsg) throws Exception {
FmInsideCLoginMsg msg = (FmInsideCLoginMsg)baseMsg; FmInsideCLoginMsg msg = (FmInsideCLoginMsg)baseMsg;
WxCUser user = userService.getById(msg.getCUserId(),msg.getTenantId());
WxCUser user = userService.getById(msg.getId(),msg.getTenantId());
if(user == null) { if(user == null) {
logger.error("用户ID未找到: " + msg.getCUserId());
throw new MallinkException(ErrorCode.USER_IS_EMPTY.getCode(), "用户ID未找到" + msg.getCUserId());
logger.error("用户ID未找到: " + msg.getId());
throw new MallinkException(ErrorCode.USER_IS_EMPTY.getCode(), "用户ID未找到" + msg.getId());
} }
userService.actionAfterLogin(user); userService.actionAfterLogin(user);
} }


Загрузка…
Отмена
Сохранить