From f3bf2c69494bb78afa098819b742677dd8be6b7c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 30 Jun 2021 16:01:25 +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 | 14 ++++++++++++--
gc-user/src/main/resources/mapper/user/AccountMapper.xml | 8 ++++++++
gc-user/src/main/java/com/xzx/gc/user/mapper/AccountMapper.java | 2 ++
3 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/gc-user/src/main/java/com/xzx/gc/user/mapper/AccountMapper.java b/gc-user/src/main/java/com/xzx/gc/user/mapper/AccountMapper.java
index 60e8fd8..dc7697a 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/mapper/AccountMapper.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/mapper/AccountMapper.java
@@ -2,6 +2,7 @@
import com.xzx.gc.entity.AccountInfo;
import com.xzx.gc.entity.OrderInfo;
+import com.xzx.gc.entity.ScoreDetails;
import com.xzx.gc.entity.UserInfo;
import com.xzx.gc.model.admin.AccountMoneyModel;
import com.xzx.gc.model.admin.UserAccountModel;
@@ -46,5 +47,6 @@
List<OrderInfo> findArea();
+ void insertScoreDetailsRet(ScoreDetails scoreDetailsRet);
}
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 55d7231..ea4fb16 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,7 +8,7 @@
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.entity.ScoreDetails;
import com.xzx.gc.user.dto.AddScoreNumDto;
import com.xzx.gc.user.dto.ExamineJwyDto;
import com.xzx.gc.user.dto.JhyApplyDto;
@@ -22,6 +22,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;
@@ -119,10 +120,19 @@
List<AccountInfo> accountInfos = accountMapper.selectByExample(exampleAccount);
if(CollUtil.isNotEmpty(accountInfos)){
AccountInfo accountInfo = accountInfos.get(0);
-// Integer collectScore = Integer.parseInt(accountInfo.getCollectScore());
+ Integer collectScore = Integer.parseInt(accountInfo.getCollectScore());
// 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);
}
}
}
diff --git a/gc-user/src/main/resources/mapper/user/AccountMapper.xml b/gc-user/src/main/resources/mapper/user/AccountMapper.xml
index ccf2bed..5b06173 100644
--- a/gc-user/src/main/resources/mapper/user/AccountMapper.xml
+++ b/gc-user/src/main/resources/mapper/user/AccountMapper.xml
@@ -133,4 +133,12 @@
</select>
+
+ <insert id="insertScoreDetailsRet">
+ insert into xzx_score_details (CREATED_TIME, user_id, type, original_score, change_score, current_score)
+ values (
+ #{createdTime}, #{userId}, #{type}, #{originalScore}, #{changeScore}, #{currentScore}
+ )
+ </insert>
+
</mapper>
--
Gitblit v1.9.1