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

[积分][修改]:excel导入积分问题

release_toaliyun_real
hanxueda 7 лет назад
Родитель
Сommit
519101aaaf
2 измененных файлов: 12 добавлений и 15 удалений
  1. +1
    -9
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java
  2. +11
    -6
      mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java

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

@@ -3,30 +3,24 @@ package com.iformall.service.impl;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;

import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;
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.*; import com.iformall.domain.po.*;
import com.iformall.domain.vo.*; import com.iformall.domain.vo.*;
import com.iformall.enums.*; import com.iformall.enums.*;

import com.iformall.mapper.*; import com.iformall.mapper.*;
import com.iformall.service.*; import com.iformall.service.*;

import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;

import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;


import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.time.DayOfWeek; import java.time.DayOfWeek;
@@ -34,7 +28,6 @@ import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.ZoneId; import java.time.ZoneId;
import java.time.temporal.TemporalAdjusters; import java.time.temporal.TemporalAdjusters;
import java.time.temporal.WeekFields;
import java.util.*; import java.util.*;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@@ -765,7 +758,6 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService {
//积分处理逻辑:覆盖原积分 记录历史 //积分处理逻辑:覆盖原积分 记录历史
if (credit != null) { if (credit != null) {
WxCreditHistory wxCreditHistory = new WxCreditHistory(); WxCreditHistory wxCreditHistory = new WxCreditHistory();
wxCreditHistory.setId(idWorker.nextId());
wxCreditHistory.setTenantId(tenantId); wxCreditHistory.setTenantId(tenantId);
wxCreditHistory.setCreateDate(new Date()); wxCreditHistory.setCreateDate(new Date());
if (mallUserInfo != null) { if (mallUserInfo != null) {


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

@@ -162,13 +162,15 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService {


//计算出需要新增或减少的积分 //计算出需要新增或减少的积分
int creditChangeNum = creditIncrement(record); int creditChangeNum = creditIncrement(record);
if (currentCreditAmount + creditChangeNum < 0) {
throw new MallinkException(ErrorCode.CREDIT_NOT_ENOUGH);
}
if (creditChangeNum != 0) { if (creditChangeNum != 0) {
//throw new MallinkException(ErrorCode.CREDIT_ZERO);
record.setCreditNum(creditChangeNum);
record.setCreditAmount(currentCreditAmount + creditChangeNum);
if (currentCreditAmount + creditChangeNum < 0) {
throw new MallinkException(ErrorCode.CREDIT_NOT_ENOUGH);
}
//如果为导入的会员 则直接覆盖总积分和操作积分明细
if (record.getCreditType() != EnumScoreType.MEM_IMPORT.getCode()) {
record.setCreditNum(creditChangeNum);
record.setCreditAmount(currentCreditAmount + creditChangeNum);
}
if (record.getId() == null) { if (record.getId() == null) {
final IdWorker idWorker = IdWorker.get(); final IdWorker idWorker = IdWorker.get();
record.setId(idWorker.nextId()); record.setId(idWorker.nextId());
@@ -249,6 +251,9 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService {
if (record.getCreditType() == EnumScoreType.REDUCE_CREDIT.getCode()) { if (record.getCreditType() == EnumScoreType.REDUCE_CREDIT.getCode()) {
return reduceCredit(record); return reduceCredit(record);
} }
if (record.getCreditType() != EnumScoreType.MEM_IMPORT.getCode()) {
return record.getCreditNum();
}


return 0; return 0;
} }


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