winter 2 лет назад
Родитель
Сommit
c6718a5f40
4 измененных файлов: 19 добавлений и 32 удалений
  1. +0
    -8
      mallinkService/src/main/java/com/iformall/enums/EnumScoreType.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java
  3. +16
    -14
      mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideBasicUserCompleteInfoMsgServiceImpl.java
  4. +2
    -9
      mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideBasicUserPhoneFirstMsgServiceImpl.java

+ 0
- 8
mallinkService/src/main/java/com/iformall/enums/EnumScoreType.java Просмотреть файл

@@ -63,12 +63,4 @@ public enum EnumScoreType {
return message;
}
public static EnumScoreType getEnumScoreByMsgType(Integer msgType) {
if (EnumMsgRecordType.INSIDE_C_PHONE_FIRST_LOGIN.getCode() == msgType) {
return WECHAT_PHONE;
}else if (EnumMsgRecordType.INSIDE_C_COMPLETE_INFO.getCode() == msgType) {
return COMPLETE_INFO;
}
return null;
}
}

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

@@ -323,7 +323,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService {
private void sendLevelChangeCoupons(TenantEntity tenantinfo,Long userId,Integer userLastChangeScore,int oldPoins,int newPoins) {
WxLevelConfig levelConfig = new WxLevelConfig();
levelConfig.updateTenantInfo(tenantinfo);
levelConfig.setSortColumns("poins asc");
levelConfig.setSortColumns("points asc");
List<WxLevelConfig> lcList = wxLevelConfigMapper.findList(levelConfig);
if (null != lcList && lcList.size() > 0 ) {
for (int i = 0 ; i < lcList.size(); i++) {


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

@@ -60,20 +60,22 @@ public class FmInsideBasicUserCompleteInfoMsgServiceImpl implements MsgSendServi
return;
}

//增加成长值
wxScoreRulesService.addScore(tenantEntity,EnumScoreType.COMPLETE_INFO, basicInfo);
//增加积分
WxCreditHistory wxCreditHistory = new WxCreditHistory();
wxCreditHistory.setCUserId(basicUserId);
// wxCreditHistory.updateTenantInfo(tenantEntity);
wxCreditHistory.setTenantId(tenantEntity.getFinalTenantId());
wxCreditHistory.setFinalTenantId(tenantEntity.getFinalTenantId());
wxCreditHistory.setCreateDate(new Date());
wxCreditHistory.setCreditType(EnumScoreType.COMPLETE_INFO.getCode());
wxCreditHistory.setChangePurpose(EnumScoreType.COMPLETE_INFO.getMessage());
wxCreditHistory.setOperatorType(EnumUserType.CUSERBASIC.getCode());
wxCreditHistory.setOperatorId(basicUserId);
wxCreditHistoryService.saveOrUpdate(wxCreditHistory,tenantEntity);
if(msg.getIsFirst()){
//增加成长值
wxScoreRulesService.addScore(tenantEntity,EnumScoreType.COMPLETE_INFO, basicInfo);
//增加积分
WxCreditHistory wxCreditHistory = new WxCreditHistory();
wxCreditHistory.setCUserId(basicUserId);
// wxCreditHistory.updateTenantInfo(tenantEntity);
wxCreditHistory.setTenantId(tenantEntity.getFinalTenantId());
wxCreditHistory.setFinalTenantId(tenantEntity.getFinalTenantId());
wxCreditHistory.setCreateDate(new Date());
wxCreditHistory.setCreditType(EnumScoreType.COMPLETE_INFO.getCode());
wxCreditHistory.setChangePurpose(EnumScoreType.COMPLETE_INFO.getMessage());
wxCreditHistory.setOperatorType(EnumUserType.CUSERBASIC.getCode());
wxCreditHistory.setOperatorId(basicUserId);
wxCreditHistoryService.saveOrUpdate(wxCreditHistory,tenantEntity);
}

//打标签
wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_IMPORT, basicInfo,tenantEntity,null);


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

@@ -58,17 +58,10 @@ public class FmInsideBasicUserPhoneFirstMsgServiceImpl implements MsgSendService
}

if(msg.getIsFirst()){
EnumScoreType scoreType = null;
if (null != msg.getMsgType()) {
scoreType = EnumScoreType.getEnumScoreByMsgType(msg.getMsgType());
}
if (null == scoreType) {
scoreType = EnumScoreType.WECHAT_PHONE;
}
// 成长值
wxScoreRulesService.addScore(tenantEntity, scoreType, basicInfo);
wxScoreRulesService.addScore(tenantEntity, EnumScoreType.WECHAT_PHONE, basicInfo);
// 增加积分
wxCUserBasicInfoService.addCredit(basicInfo.getId(),tenantEntity,scoreType);
wxCUserBasicInfoService.addCredit(basicInfo.getId(),tenantEntity,EnumScoreType.WECHAT_PHONE);
//老带新增加积分 todo 先处理微信的业务
wxCUserFromService.oldAddCreditWithNew(tenantEntity,basicInfo,EnumAppPlat.WX);
// 外部注券


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