| @@ -63,12 +63,4 @@ public enum EnumScoreType { | |||||
| return message; | 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; | |||||
| } | |||||
| } | } | ||||
| @@ -323,7 +323,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { | |||||
| private void sendLevelChangeCoupons(TenantEntity tenantinfo,Long userId,Integer userLastChangeScore,int oldPoins,int newPoins) { | private void sendLevelChangeCoupons(TenantEntity tenantinfo,Long userId,Integer userLastChangeScore,int oldPoins,int newPoins) { | ||||
| WxLevelConfig levelConfig = new WxLevelConfig(); | WxLevelConfig levelConfig = new WxLevelConfig(); | ||||
| levelConfig.updateTenantInfo(tenantinfo); | levelConfig.updateTenantInfo(tenantinfo); | ||||
| levelConfig.setSortColumns("poins asc"); | |||||
| levelConfig.setSortColumns("points asc"); | |||||
| List<WxLevelConfig> lcList = wxLevelConfigMapper.findList(levelConfig); | List<WxLevelConfig> lcList = wxLevelConfigMapper.findList(levelConfig); | ||||
| if (null != lcList && lcList.size() > 0 ) { | if (null != lcList && lcList.size() > 0 ) { | ||||
| for (int i = 0 ; i < lcList.size(); i++) { | for (int i = 0 ; i < lcList.size(); i++) { | ||||
| @@ -60,20 +60,22 @@ public class FmInsideBasicUserCompleteInfoMsgServiceImpl implements MsgSendServi | |||||
| return; | 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); | wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_IMPORT, basicInfo,tenantEntity,null); | ||||
| @@ -58,17 +58,10 @@ public class FmInsideBasicUserPhoneFirstMsgServiceImpl implements MsgSendService | |||||
| } | } | ||||
| if(msg.getIsFirst()){ | 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 先处理微信的业务 | //老带新增加积分 todo 先处理微信的业务 | ||||
| wxCUserFromService.oldAddCreditWithNew(tenantEntity,basicInfo,EnumAppPlat.WX); | wxCUserFromService.oldAddCreditWithNew(tenantEntity,basicInfo,EnumAppPlat.WX); | ||||
| // 外部注券 | // 外部注券 | ||||