| @@ -144,7 +144,7 @@ public class BaseController { | |||||
| if (basicInfo.getCredit() == null) { | if (basicInfo.getCredit() == null) { | ||||
| basicInfo.setCredit(user.getCredit()); | basicInfo.setCredit(user.getCredit()); | ||||
| } | } | ||||
| wxCUserBasicInfoService.updateObj(basicInfo, user.getId()); | |||||
| wxCUserBasicInfoService.updateObj(basicInfo, user.getId(),user); | |||||
| } else { | } else { | ||||
| Date cur = new Date(); | Date cur = new Date(); | ||||
| WxCUserBasicInfo basicInfo = new WxCUserBasicInfo(); | WxCUserBasicInfo basicInfo = new WxCUserBasicInfo(); | ||||
| @@ -4,10 +4,7 @@ import com.github.pagehelper.PageInfo; | |||||
| import com.iformall.domain.dto.WxCUserBasicInfoDto; | import com.iformall.domain.dto.WxCUserBasicInfoDto; | ||||
| import com.iformall.domain.dto.WxCUserBasicInfoFilterDto; | import com.iformall.domain.dto.WxCUserBasicInfoFilterDto; | ||||
| import com.iformall.domain.dto.WxCUserBasicInfoFilterListDto; | import com.iformall.domain.dto.WxCUserBasicInfoFilterListDto; | ||||
| import com.iformall.domain.po.MallUserInfo; | |||||
| 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.CUserBaseInfoT; | ||||
| import com.iformall.domain.vo.WxTagsGroupVo; | import com.iformall.domain.vo.WxTagsGroupVo; | ||||
| @@ -70,7 +67,7 @@ public interface WxCUserBasicInfoService { | |||||
| * | * | ||||
| * @param record | * @param record | ||||
| */ | */ | ||||
| void updateObj(WxCUserBasicInfo record, Long newId); | |||||
| void updateObj(WxCUserBasicInfo record, Long newId, WxCUser user); | |||||
| /** | /** | ||||
| * 根据Id删除实体 | * 根据Id删除实体 | ||||
| @@ -594,7 +594,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { | |||||
| } | } | ||||
| @Override | @Override | ||||
| public void updateObj(WxCUserBasicInfo record, Long newId) { | |||||
| public void updateObj(WxCUserBasicInfo record, Long newId,WxCUser user) { | |||||
| // 1. update c_user_tags | // 1. update c_user_tags | ||||
| CUserTagNewIdVo userTagVo = new CUserTagNewIdVo(); | CUserTagNewIdVo userTagVo = new CUserTagNewIdVo(); | ||||
| userTagVo.setTenantId(record.getTenantId()); | userTagVo.setTenantId(record.getTenantId()); | ||||
| @@ -620,6 +620,8 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { | |||||
| CUserBaseVo userBaseVo = new CUserBaseVo(); | CUserBaseVo userBaseVo = new CUserBaseVo(); | ||||
| org.springframework.beans.BeanUtils.copyProperties(record, userBaseVo); | org.springframework.beans.BeanUtils.copyProperties(record, userBaseVo); | ||||
| userBaseVo.setNewId(newId); | userBaseVo.setNewId(newId); | ||||
| userBaseVo.setCredit(user.getCredit()); | |||||
| userBaseVo.setPoins(user.getScore()); | |||||
| wxCUserBasicInfoMapper.updateNewId(userBaseVo); | wxCUserBasicInfoMapper.updateNewId(userBaseVo); | ||||
| } | } | ||||
| @@ -127,7 +127,7 @@ | |||||
| </update> | </update> | ||||
| <update id="updateNewId" parameterType="com.iformall.domain.vo.CUserBaseVo"> | <update id="updateNewId" parameterType="com.iformall.domain.vo.CUserBaseVo"> | ||||
| update wx_c_user_basic_info set id=#{newId} where tenant_id=#{tenantId} | |||||
| update wx_c_user_basic_info set id=#{newId} , credit=#{credit} , poins=#{poins} where tenant_id=#{tenantId} | |||||
| and id = #{id} | and id = #{id} | ||||
| </update> | </update> | ||||
| @@ -137,7 +137,7 @@ public class BaseController { | |||||
| if (basicInfo.getPoins() == null) { | if (basicInfo.getPoins() == null) { | ||||
| basicInfo.setPoins(user.getScore()); | basicInfo.setPoins(user.getScore()); | ||||
| } | } | ||||
| wxCUserBasicInfoService.updateObj(basicInfo, user.getId()); | |||||
| wxCUserBasicInfoService.updateObj(basicInfo, user.getId(),user); | |||||
| } else { | } else { | ||||
| Date cur = new Date(); | Date cur = new Date(); | ||||
| WxCUserBasicInfo basicInfo = new WxCUserBasicInfo(); | WxCUserBasicInfo basicInfo = new WxCUserBasicInfo(); | ||||