From 919a85cebea0da5e67711a0a5efa6279b7de04d2 Mon Sep 17 00:00:00 2001 From: hanxueda Date: Wed, 17 Apr 2019 15:21:01 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=A7=AF=E5=88=86][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E7=A7=AF=E5=88=86=E6=93=8D=E4=BD=9C=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/WxCreditHistoryServiceImpl.java | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java index 94266aea9..90612579c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java @@ -1,8 +1,5 @@ package com.iformall.service.impl; -import java.util.*; -import java.util.stream.Collectors; - import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageHelper; @@ -10,12 +7,12 @@ import com.github.pagehelper.PageInfo; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.iformall.common.ErrorCode; +import com.iformall.common.IdWorker; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.*; import com.iformall.domain.vo.WxCreditHistoryVo; import com.iformall.enums.EnumBusiness; -import com.iformall.enums.EnumCouponStatus; import com.iformall.enums.EnumScoreType; import com.iformall.enums.EnumUserType; import com.iformall.exception.MallinkException; @@ -26,10 +23,14 @@ import com.iformall.utils.RedisLock; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.iformall.common.IdWorker; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + @Service @Slf4j public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { @@ -160,31 +161,30 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { //计算出需要新增或减少的积分 int creditChangeNum = creditIncrement(record); - - if (creditChangeNum == 0) { - throw new MallinkException(ErrorCode.CREDIT_ZERO); - } if (currentCreditAmount + creditChangeNum < 0) { throw new MallinkException(ErrorCode.CREDIT_NOT_ENOUGH); } - record.setCreditNum(creditChangeNum); - record.setCreditAmount(currentCreditAmount + creditChangeNum); - if (record.getId() == null) { - final IdWorker idWorker = IdWorker.get(); - record.setId(idWorker.nextId()); - record.setCreateDate(new Date()); - wxCreditHistoryMapper.insertSelective(record); - //将计算出来新的总积分 更新到两张用户表里 - if (wxCUser != null) { - wxCUser.setCredit(record.getCreditAmount()); - wxCUserMapper.updateByPrimaryKeySelective(wxCUser); - } - if (wxCUserBasicInfo != null) { - wxCUserBasicInfo.setCredit(record.getCreditAmount()); - wxCUserBasicInfoMapper.updateByPrimaryKeySelective(wxCUserBasicInfo); + if (creditChangeNum != 0) { + //throw new MallinkException(ErrorCode.CREDIT_ZERO); + record.setCreditNum(creditChangeNum); + record.setCreditAmount(currentCreditAmount + creditChangeNum); + if (record.getId() == null) { + final IdWorker idWorker = IdWorker.get(); + record.setId(idWorker.nextId()); + record.setCreateDate(new Date()); + wxCreditHistoryMapper.insertSelective(record); + //将计算出来新的总积分 更新到两张用户表里 + if (wxCUser != null) { + wxCUser.setCredit(record.getCreditAmount()); + wxCUserMapper.updateByPrimaryKeySelective(wxCUser); + } + if (wxCUserBasicInfo != null) { + wxCUserBasicInfo.setCredit(record.getCreditAmount()); + wxCUserBasicInfoMapper.updateByPrimaryKeySelective(wxCUserBasicInfo); + } + } else { + //wxCreditHistoryMapper.updateByPrimaryKeySelective(record); } - } else { - //wxCreditHistoryMapper.updateByPrimaryKeySelective(record); } return new ResultData(Result.SUCCESS,"积分操作成功"); }