From cd4f41c98dd9a071b3e2003e324b9fd61472c7f4 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 30 Jun 2021 16:40:53 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-user/src/main/java/com/xzx/gc/user/service/JhyInfoService.java | 36 +++++++++++++++++++++++++++++-------
1 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/gc-user/src/main/java/com/xzx/gc/user/service/JhyInfoService.java b/gc-user/src/main/java/com/xzx/gc/user/service/JhyInfoService.java
index 3055b23..34fe401 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/service/JhyInfoService.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/service/JhyInfoService.java
@@ -8,13 +8,11 @@
import com.xzx.gc.common.exception.RestException;
import com.xzx.gc.entity.AccountInfo;
import com.xzx.gc.entity.JhyInfo;
-import com.xzx.gc.entity.ScoreGoodsSearch;
-import com.xzx.gc.user.dto.AddScoreNumDto;
-import com.xzx.gc.user.dto.ExamineJwyDto;
-import com.xzx.gc.user.dto.JhyApplyDto;
-import com.xzx.gc.user.dto.JhyInfoListDto;
+import com.xzx.gc.entity.ScoreDetails;
+import com.xzx.gc.user.dto.*;
import com.xzx.gc.user.mapper.AccountMapper;
import com.xzx.gc.user.mapper.JhyInfoMapper;
+import com.xzx.gc.user.vo.GetScoreNumVo;
import com.xzx.gc.user.vo.JhyInfoListVo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,6 +20,7 @@
import org.springframework.transaction.annotation.Transactional;
import tk.mybatis.mapper.entity.Example;
+import java.math.BigDecimal;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -120,9 +119,32 @@
if(CollUtil.isNotEmpty(accountInfos)){
AccountInfo accountInfo = accountInfos.get(0);
Integer collectScore = Integer.parseInt(accountInfo.getCollectScore());
- collectScore = collectScore + model.getScore();
- accountInfo.setCollectScore(collectScore.toString());
+// collectScore = collectScore + model.getScore();
+ accountInfo.setCollectScore(model.getScore().toString());
accountMapper.updateByPrimaryKey(accountInfo);
+
+ ScoreDetails scoreDetailsRet = new ScoreDetails();
+ scoreDetailsRet.setUserId(model.getUserId());
+ scoreDetailsRet.setType(ScoreDetails.SCORE_TYPE_ADMIN_RECHARGE);
+ scoreDetailsRet.setOriginalScore(new BigDecimal(collectScore));
+ scoreDetailsRet.setCurrentScore(new BigDecimal(model.getScore()));
+ scoreDetailsRet.setChangeScore(new BigDecimal(model.getScore()));
+ scoreDetailsRet.setCreatedTime(new Date());
+ accountMapper.insertScoreDetailsRet(scoreDetailsRet);
}
}
+
+ public GetScoreNumVo getScoreNum(GetScoreNumDto model) {
+ GetScoreNumVo getScoreNumVo = new GetScoreNumVo();
+ Example exampleAccount = new Example(AccountInfo.class);
+ Example.Criteria criteriaAccount = exampleAccount.createCriteria();
+ criteriaAccount.andEqualTo("userId",model.getUserId());
+ List<AccountInfo> accountInfos = accountMapper.selectByExample(exampleAccount);
+ if(CollUtil.isNotEmpty(accountInfos)){
+ AccountInfo accountInfo = accountInfos.get(0);
+ Integer collectScore = Integer.parseInt(accountInfo.getCollectScore());
+ getScoreNumVo.setScore(new BigDecimal(collectScore));
+ }
+ return getScoreNumVo;
+ }
}
--
Gitblit v1.9.1