Просмотр исходного кода

[BUG][修改][C端通过积分报名用户需要在积分变更记录下有记录]

release_toaliyun_real
gongbiao 7 лет назад
Родитель
Сommit
e75d7b153d
3 измененных файлов: 20 добавлений и 7 удалений
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java
  2. +2
    -1
      mallinkService/src/main/java/com/iformall/enums/EnumScoreType.java
  3. +17
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java

+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java Просмотреть файл

@@ -51,7 +51,7 @@ public class WxCreditHistory implements Serializable {
private Integer creditAmount;
@io.swagger.annotations.ApiModelProperty(value="每笔积分明细",name="creditNum")
private Integer creditNum;
@io.swagger.annotations.ApiModelProperty(value="积分类型 1每日登录,2消费,3绑车牌,4连接WIFI,5微信用户昵称授权,6微信用户手机授权,7完善个人信息,8积分导入,10新增积分,11积分兑换,12消费积分 注:11积分兑换改为走订单接口",name="creditType")
@io.swagger.annotations.ApiModelProperty(value = "积分类型 1每日登录,2消费,3绑车牌,4连接WIFI,5微信用户昵称授权,6微信用户手机授权,7完善个人信息,8积分导入,10新增积分,11积分兑换,12消费积分 13活动报名 注:11积分兑换改为走订单接口", name = "creditType")
private Integer creditType;
@io.swagger.annotations.ApiModelProperty(value="创建日期",name="createDate")
private Date createDate;


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

@@ -16,7 +16,8 @@ public enum EnumScoreType {
MEM_REDUCE(9, "会员成长值扣减"),
SPEND_CREDIT(10, "新增积分"),
CHANGE_CREDIT(11, "积分兑换"),
REDUCE_CREDIT(12, "消费积分");
REDUCE_CREDIT(12, "消费积分"),
ACTIVITY_JOIN(13, "活动报名"),;

public static EnumScoreType getEnum(Integer code) {
for (EnumScoreType value : values()) {


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

@@ -9,12 +9,10 @@ import com.iformall.common.ResultData;
import com.iformall.domain.po.WxActivity;
import com.iformall.domain.po.WxActivityJoin;
import com.iformall.domain.po.WxCUser;
import com.iformall.domain.po.WxCreditHistory;
import com.iformall.domain.po.msg.WxMsgRecord;
import com.iformall.enums.*;
import com.iformall.mapper.WxActivityJoinMapper;
import com.iformall.mapper.WxActivityMapper;
import com.iformall.mapper.WxCUserBasicInfoMapper;
import com.iformall.mapper.WxCUserMapper;
import com.iformall.mapper.*;
import com.iformall.mq.MqBaseProducer;
import com.iformall.service.ExcelService;
import com.iformall.service.WxActivityJoinService;
@@ -59,6 +57,9 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService {
@Autowired
WxCUserBasicInfoMapper wxCUserBasicInfoMapper;

@Autowired
WxCreditHistoryMapper wxCreditHistoryMapper;

@Override
public PageInfo<WxActivityJoin> listAsPage(WxActivityJoin record, Integer pageIndex, Integer pageSize) {
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxActivityJoinMapper.findList(record));
@@ -151,6 +152,7 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService {
WxCUser user = wxCUserMapper.selectByPrimaryKey(wxActivityJoin.getUserId());
//查询是否消耗积分
WxActivity wxActivity = wxActivityMapper.selectByPrimaryKey(wxActivityJoin.getActivityId());
Date date = new Date();
if (wxActivity.getUseCredit().equals(EnumActivityUseCreditStatus.YES.getCode())) {
Integer userCredit = user.getCredit();
Integer credit = wxActivity.getCredit();
@@ -165,12 +167,22 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService {
wxCUserMapper.updateByPrimaryKeySelective(user);
data.put("useCredit", credit);
data.put("totalCredit", userCredit);
//积分历史
WxCreditHistory wxCreditHistory = new WxCreditHistory();
wxCreditHistory.setTenantId(wxActivity.getTenantId());
wxCreditHistory.setCUserId(wxActivityJoin.getUserId());
wxCreditHistory.setCreditAmount(userCredit);
wxCreditHistory.setCreditNum(-credit);
wxCreditHistory.setCreditType(EnumScoreType.ACTIVITY_JOIN.getCode());
wxCreditHistory.setCreateDate(date);
wxCreditHistory.setOperatorType(EnumUserType.CUSER.getCode());
wxCreditHistory.setOperatorId(wxActivityJoin.getUserId());
wxCreditHistoryMapper.updateByPrimaryKeySelective(wxCreditHistory);
}
//保存到报名表中
final IdWorker idWorker = IdWorker.get();
wxActivityJoin.setId(idWorker.nextId());
wxActivityJoin.setPhone(user.getPhone());
Date date = new Date();
wxActivityJoin.setCreateTime(date);
wxActivityJoin.setUpdateTime(date);
wxActivityJoinMapper.insertSelective(wxActivityJoin);


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