developrelease_toaliyun_real
| @@ -518,10 +518,6 @@ public class WxUserGrantController extends BaseController { | |||||
| int score = user.getScore() == null ? 0 : user.getScore(); | int score = user.getScore() == null ? 0 : user.getScore(); | ||||
| int memScore = basicInfo.getPoins() == null ? 0 : basicInfo.getPoins(); | int memScore = basicInfo.getPoins() == null ? 0 : basicInfo.getPoins(); | ||||
| int memCredit = basicInfo.getCredit() == null ? 0 : basicInfo.getCredit(); | int memCredit = basicInfo.getCredit() == null ? 0 : basicInfo.getCredit(); | ||||
| if (memCredit > 0) { | |||||
| user.setCredit(memCredit); | |||||
| wxCUserService.addCredit(user, EnumScoreType.MEM_IMPORT); | |||||
| } | |||||
| user.setCredit(memCredit + credit); | user.setCredit(memCredit + credit); | ||||
| user.setScore(memScore + score); | user.setScore(memScore + score); | ||||
| } | } | ||||
| @@ -5,13 +5,17 @@ import lombok.Data; | |||||
| import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
| import lombok.ToString; | import lombok.ToString; | ||||
| import javax.persistence.Transient; | |||||
| /** | /** | ||||
| * Created by syf on 2018/8/30. | * Created by syf on 2018/8/30. | ||||
| */ | */ | ||||
| @Data | @Data | ||||
| @ToString(callSuper = true) | @ToString(callSuper = true) | ||||
| @EqualsAndHashCode(callSuper = true) | @EqualsAndHashCode(callSuper = true) | ||||
| public class CUserTagVo extends WxCUserTags { | |||||
| public class CUserTagNewIdVo extends WxCUserTags { | |||||
| @Transient | |||||
| @io.swagger.annotations.ApiModelProperty(value="用户新的ID",name="newUserId") | |||||
| private Long newUserId; | private Long newUserId; | ||||
| } | } | ||||
| @@ -0,0 +1,19 @@ | |||||
| package com.iformall.domain.vo; | |||||
| import cn.afterturn.easypoi.excel.annotation.Excel; | |||||
| import com.iformall.domain.po.WxCreditHistory; | |||||
| import lombok.Data; | |||||
| import lombok.EqualsAndHashCode; | |||||
| import javax.persistence.Transient; | |||||
| import java.util.Date; | |||||
| @Data | |||||
| @EqualsAndHashCode(callSuper = true) | |||||
| public class WxCreditHistoryNewIdVo extends WxCreditHistory { | |||||
| @Transient | |||||
| @io.swagger.annotations.ApiModelProperty(value="用户新的ID",name="newUserId") | |||||
| private Long newUserId; | |||||
| } | |||||
| @@ -0,0 +1,17 @@ | |||||
| package com.iformall.domain.vo; | |||||
| import com.iformall.domain.po.WxScoreHistory; | |||||
| import lombok.Data; | |||||
| import lombok.EqualsAndHashCode; | |||||
| import javax.persistence.Transient; | |||||
| @Data | |||||
| @EqualsAndHashCode(callSuper = true) | |||||
| public class WxScoreHistoryNewIdVo extends WxScoreHistory { | |||||
| @Transient | |||||
| @io.swagger.annotations.ApiModelProperty(value="用户新的ID",name="newUserId") | |||||
| private Long newUserId; | |||||
| } | |||||
| @@ -5,7 +5,7 @@ import java.util.List; | |||||
| import com.iformall.common.CommonMapper; | import com.iformall.common.CommonMapper; | ||||
| import com.iformall.domain.po.WxCUserTags; | import com.iformall.domain.po.WxCUserTags; | ||||
| import com.iformall.domain.vo.CUserTagVo; | |||||
| import com.iformall.domain.vo.CUserTagNewIdVo; | |||||
| import org.apache.ibatis.annotations.Param; | import org.apache.ibatis.annotations.Param; | ||||
| public interface WxCUserTagsMapper extends CommonMapper<WxCUserTags, String> { | public interface WxCUserTagsMapper extends CommonMapper<WxCUserTags, String> { | ||||
| @@ -15,5 +15,5 @@ public interface WxCUserTagsMapper extends CommonMapper<WxCUserTags, String> { | |||||
| long countUser(@Param("tagIds")String tagIds,@Param("tenantId")String tenantId, | long countUser(@Param("tagIds")String tagIds,@Param("tenantId")String tenantId, | ||||
| @Param("startTime")Date startTime,@Param("endTime")Date endTime); | @Param("startTime")Date startTime,@Param("endTime")Date endTime); | ||||
| void updateNewId(CUserTagVo record); | |||||
| void updateNewId(CUserTagNewIdVo record); | |||||
| } | } | ||||
| @@ -2,7 +2,7 @@ package com.iformall.mapper; | |||||
| import java.util.*; | import java.util.*; | ||||
| import com.iformall.common.CommonMapper; | import com.iformall.common.CommonMapper; | ||||
| import com.iformall.domain.po.WxScoreHistory; | |||||
| import com.iformall.domain.vo.WxCreditHistoryNewIdVo; | |||||
| import com.iformall.domain.vo.WxCreditHistoryVo; | import com.iformall.domain.vo.WxCreditHistoryVo; | ||||
| import com.iformall.domain.po.WxCreditHistory; | import com.iformall.domain.po.WxCreditHistory; | ||||
| @@ -18,4 +18,6 @@ public interface WxCreditHistoryMapper extends CommonMapper<WxCreditHistory, Lon | |||||
| int countList(WxCreditHistory wxCreditHistory); | int countList(WxCreditHistory wxCreditHistory); | ||||
| int updateNewId(WxCreditHistoryNewIdVo wxCreditHistory); | |||||
| } | } | ||||
| @@ -3,6 +3,7 @@ package com.iformall.mapper; | |||||
| import java.util.*; | import java.util.*; | ||||
| import com.iformall.common.CommonMapper; | import com.iformall.common.CommonMapper; | ||||
| import com.iformall.domain.po.WxScoreHistory; | import com.iformall.domain.po.WxScoreHistory; | ||||
| import com.iformall.domain.vo.WxScoreHistoryNewIdVo; | |||||
| public interface WxScoreHistoryMapper extends CommonMapper<WxScoreHistory, String> { | public interface WxScoreHistoryMapper extends CommonMapper<WxScoreHistory, String> { | ||||
| @@ -12,5 +13,7 @@ public interface WxScoreHistoryMapper extends CommonMapper<WxScoreHistory, Strin | |||||
| int countTodayList(WxScoreHistory wxScoreHistory); | int countTodayList(WxScoreHistory wxScoreHistory); | ||||
| int countList(WxScoreHistory wxScoreHistory); | int countList(WxScoreHistory wxScoreHistory); | ||||
| int updateNewId(WxScoreHistoryNewIdVo wxScoreHistoryNewIdVo); | |||||
| } | } | ||||
| @@ -49,6 +49,12 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { | |||||
| @Autowired | @Autowired | ||||
| WxTagsMapper wxTagsMapper; | WxTagsMapper wxTagsMapper; | ||||
| @Autowired | |||||
| WxScoreHistoryMapper scoreHistoryMapper; | |||||
| @Autowired | |||||
| WxCreditHistoryMapper creditHistoryMapper; | |||||
| @Autowired | @Autowired | ||||
| WxCUserTagsService wxCUserTagsService; | WxCUserTagsService wxCUserTagsService; | ||||
| @@ -589,13 +595,28 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { | |||||
| @Override | @Override | ||||
| public void updateObj(WxCUserBasicInfo record, Long newId) { | public void updateObj(WxCUserBasicInfo record, Long newId) { | ||||
| // update c_user_tags | |||||
| CUserTagVo userTagVo = new CUserTagVo(); | |||||
| // 1. update c_user_tags | |||||
| CUserTagNewIdVo userTagVo = new CUserTagNewIdVo(); | |||||
| userTagVo.setTenantId(record.getTenantId()); | userTagVo.setTenantId(record.getTenantId()); | ||||
| userTagVo.setUserId(record.getId()); | userTagVo.setUserId(record.getId()); | ||||
| userTagVo.setNewUserId(newId); | userTagVo.setNewUserId(newId); | ||||
| wxCUserTagsMapper.updateNewId(userTagVo); | wxCUserTagsMapper.updateNewId(userTagVo); | ||||
| // base info | |||||
| // 2. update score history | |||||
| WxScoreHistoryNewIdVo scoreHistoryNewIdVo = new WxScoreHistoryNewIdVo(); | |||||
| scoreHistoryNewIdVo.setTenantId(record.getTenantId()); | |||||
| scoreHistoryNewIdVo.setCUserId(record.getId()); | |||||
| scoreHistoryNewIdVo.setNewUserId(newId); | |||||
| scoreHistoryMapper.updateNewId(scoreHistoryNewIdVo); | |||||
| // 3. update credit history | |||||
| WxCreditHistoryNewIdVo creditHistoryNewIdVo = new WxCreditHistoryNewIdVo(); | |||||
| creditHistoryNewIdVo.setTenantId(record.getTenantId()); | |||||
| creditHistoryNewIdVo.setCUserId(record.getId()); | |||||
| creditHistoryNewIdVo.setNewUserId(newId); | |||||
| creditHistoryMapper.updateNewId(creditHistoryNewIdVo); | |||||
| // 10. base info | |||||
| 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); | ||||
| @@ -599,6 +599,12 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| cardInfo.setCreateDate(curr); | cardInfo.setCreateDate(curr); | ||||
| cardInfo.setUpdateDate(curr); | cardInfo.setUpdateDate(curr); | ||||
| cardInfo.setSupportTransfer(coupon.getSupportTransfer()); | cardInfo.setSupportTransfer(coupon.getSupportTransfer()); | ||||
| //检查卡是否下架,如果是,不可转赠 | |||||
| WxCouponChannel wxCouponChannel = wxCouponChannelMapper.selectByPrimaryKey(order.getCouponChannelId()); | |||||
| if (wxCouponChannel != null && wxCouponChannel.getStatus().equals(EnumCouponChannelStatus.STATUS_TAKE_OFFF.getCode())) { | |||||
| cardInfo.setSupportTransfer(EnumCouponTransfer.NO.getCode()); | |||||
| } | |||||
| wxCardInfoMapper.insertSelective(cardInfo); | wxCardInfoMapper.insertSelective(cardInfo); | ||||
| } | } | ||||
| return couponOrder; | return couponOrder; | ||||
| @@ -62,7 +62,7 @@ | |||||
| <include refid="dynamicWhereConditions"/> | <include refid="dynamicWhereConditions"/> | ||||
| </select> | </select> | ||||
| <update id="updateNewId" parameterType="com.iformall.domain.vo.CUserTagVo"> | |||||
| <update id="updateNewId" parameterType="com.iformall.domain.vo.CUserTagNewIdVo"> | |||||
| update wx_c_user_tags | update wx_c_user_tags | ||||
| set user_id=#{newUserId} | set user_id=#{newUserId} | ||||
| where tenant_id=#{tenantId} | where tenant_id=#{tenantId} | ||||
| @@ -199,4 +199,11 @@ | |||||
| and `credit_type` = #{creditType} | and `credit_type` = #{creditType} | ||||
| </if> | </if> | ||||
| </select> | </select> | ||||
| <update id="updateNewId" parameterType="com.iformall.domain.vo.WxCreditHistoryNewIdVo"> | |||||
| update wx_credit_history | |||||
| set c_user_id=#{newUserId} | |||||
| where tenant_id=#{tenantId} | |||||
| and c_user_id = #{cUserId} | |||||
| </update> | |||||
| </mapper> | </mapper> | ||||
| @@ -114,4 +114,11 @@ | |||||
| </if> | </if> | ||||
| </select> | </select> | ||||
| <update id="updateNewId" parameterType="com.iformall.domain.vo.WxScoreHistoryNewIdVo"> | |||||
| update wx_score_history | |||||
| set c_user_id=#{newUserId} | |||||
| where tenant_id=#{tenantId} | |||||
| and c_user_id = #{cUserId} | |||||
| </update> | |||||
| </mapper> | </mapper> | ||||