| @@ -10,12 +10,7 @@ import com.iformall.domain.po.WxTags; | |||
| import com.iformall.domain.vo.CUserBaseInfoT; | |||
| import com.iformall.service.WxCUserBasicInfoService; | |||
| import com.iformall.service.WxTagsService; | |||
| import com.iformall.shiro.UserSession; | |||
| import org.apache.shiro.SecurityUtils; | |||
| import org.apache.shiro.session.Session; | |||
| import org.apache.shiro.session.UnknownSessionException; | |||
| import org.apache.shiro.subject.Subject; | |||
| import org.apache.shiro.util.ThreadContext; | |||
| import org.slf4j.Logger; | |||
| import org.slf4j.LoggerFactory; | |||
| import org.springframework.beans.factory.annotation.Autowired; | |||
| @@ -111,7 +106,7 @@ public class AsyncTask { | |||
| try { | |||
| successList.parallelStream().forEach(uBase -> { | |||
| try { | |||
| wxCUserBasicInfoService.importOneMem(tenantId, importKey, tagList, uBase); | |||
| wxCUserBasicInfoService.importOneMem(tenantId, importKey, tagList, uBase,user); | |||
| } catch (UnknownSessionException ue) { | |||
| logger.error("session :"+ue.getMessage()); | |||
| } | |||
| @@ -1,27 +1,18 @@ | |||
| package com.iformall.controller; | |||
| import com.iformall.common.ErrorCode; | |||
| import com.iformall.domain.dto.WxCreditHistoryDto; | |||
| import com.iformall.domain.vo.WxCreditHistoryVo; | |||
| import org.slf4j.LoggerFactory; | |||
| import org.springframework.beans.factory.annotation.Autowired; | |||
| import org.springframework.util.Assert; | |||
| import org.springframework.web.bind.annotation.*; | |||
| import com.github.pagehelper.PageInfo; | |||
| import com.iformall.common.Result; | |||
| import com.iformall.common.ResultData; | |||
| import org.slf4j.Logger; | |||
| import com.iformall.domain.po.WxCreditHistory; | |||
| import com.iformall.domain.vo.WxCreditHistoryVo; | |||
| import com.iformall.service.WxCreditHistoryService; | |||
| import io.swagger.annotations.ApiImplicitParam; | |||
| import io.swagger.annotations.ApiImplicitParams; | |||
| import io.swagger.annotations.ApiOperation; | |||
| import java.util.List; | |||
| import java.util.Map; | |||
| import java.util.stream.Collectors; | |||
| import org.slf4j.Logger; | |||
| import org.slf4j.LoggerFactory; | |||
| import org.springframework.beans.factory.annotation.Autowired; | |||
| import org.springframework.web.bind.annotation.*; | |||
| @RestController | |||
| @RequestMapping("wxCreditHistory") | |||
| @@ -2,6 +2,7 @@ package com.iformall.service; | |||
| import com.github.pagehelper.PageInfo; | |||
| import com.iformall.domain.dto.WxCUserBasicInfoDto; | |||
| import com.iformall.domain.po.MallUserInfo; | |||
| import com.iformall.domain.po.WxCUserBasicInfo; | |||
| import com.iformall.domain.po.WxCarPayRecord; | |||
| import com.iformall.domain.po.WxTags; | |||
| @@ -105,7 +106,7 @@ public interface WxCUserBasicInfoService { | |||
| void exportTemplate(HttpServletRequest request, HttpServletResponse response, String tenantId); | |||
| void importOneMem(String tenantId, String importKey, List<WxTags> tagList, CUserBaseInfoT uBase); | |||
| void importOneMem(String tenantId, String importKey, List<WxTags> tagList, CUserBaseInfoT uBase,MallUserInfo mallUserInfo); | |||
| long findCount(WxCUserBasicInfoDto dto); | |||
| @@ -6,21 +6,16 @@ import com.github.pagehelper.PageInfo; | |||
| import com.iformall.common.IdWorker; | |||
| import com.iformall.domain.dto.WxCUserBasicInfoDto; | |||
| import com.iformall.domain.po.WxCUser; | |||
| import com.iformall.domain.po.WxCUserBasicInfo; | |||
| import com.iformall.domain.po.WxCarPayRecord; | |||
| import com.iformall.domain.po.WxTags; | |||
| import com.iformall.domain.po.*; | |||
| import com.iformall.domain.vo.CUserBaseInfoT; | |||
| import com.iformall.domain.vo.CUserBaseVo; | |||
| import com.iformall.domain.vo.CUserTagVo; | |||
| import com.iformall.domain.vo.WxCUserBasicInfoVo; | |||
| import com.iformall.enums.EnumScoreType; | |||
| import com.iformall.enums.EnumUserType; | |||
| import com.iformall.mapper.*; | |||
| import com.iformall.service.ExcelService; | |||
| import com.iformall.service.WxCUserBasicInfoService; | |||
| import com.iformall.service.WxCUserTagsService; | |||
| import com.iformall.service.WxScoreRulesService; | |||
| import com.iformall.service.*; | |||
| import org.apache.commons.lang3.StringUtils; | |||
| import org.slf4j.Logger; | |||
| import org.slf4j.LoggerFactory; | |||
| @@ -68,6 +63,9 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { | |||
| @Autowired | |||
| ExcelService excelService; | |||
| @Autowired | |||
| WxCreditHistoryService wxCreditHistoryService; | |||
| @Override | |||
| public PageInfo<WxCUserBasicInfo> listAsPage(WxCUserBasicInfo record, Integer pageIndex, Integer pageSize) { | |||
| @@ -540,7 +538,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { | |||
| } | |||
| @Override | |||
| public void importOneMem(String tenantId, String importKey, List<WxTags> tagList, CUserBaseInfoT uBase) { | |||
| public void importOneMem(String tenantId, String importKey, List<WxTags> tagList, CUserBaseInfoT uBase,MallUserInfo mallUserInfo) { | |||
| final IdWorker idWorker = IdWorker.get(); | |||
| if (StringUtils.isBlank(uBase.getPhone())) { | |||
| @@ -700,6 +698,26 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { | |||
| wxScoreRulesService.addScore2(EnumScoreType.MEM_IMPORT, userBase, bHaveCUser); | |||
| } | |||
| } | |||
| //积分处理逻辑:覆盖原积分 记录历史 | |||
| if (credit != null) { | |||
| WxCreditHistory wxCreditHistory = new WxCreditHistory(); | |||
| wxCreditHistory.setId(idWorker.nextId()); | |||
| wxCreditHistory.setTenantId(tenantId); | |||
| wxCreditHistory.setCreateDate(new Date()); | |||
| if (mallUserInfo != null) { | |||
| wxCreditHistory.setOperatorId(mallUserInfo.getId()); | |||
| wxCreditHistory.setOperatorType(EnumUserType.MALLUSER.getCode()); | |||
| } | |||
| wxCreditHistory.setCreditType(EnumScoreType.MEM_IMPORT.getCode()); | |||
| if (oldUserBase != null) { | |||
| wxCreditHistory.setCUserId(oldUserBase.getId()); | |||
| } else { | |||
| wxCreditHistory.setCUserId(userBase.getId()); | |||
| } | |||
| wxCreditHistory.setCreditAmount(credit); | |||
| wxCreditHistory.setCreditNum(credit); | |||
| wxCreditHistoryService.saveOrUpdate(wxCreditHistory); | |||
| } | |||
| } catch (Exception e) { | |||
| logger.error(e.getMessage()); | |||
| logger.error("打标签+成长值失败--继续导入"); | |||