From e847891c4f6f12cee5e764f8c1fad001496b9740 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 09 Aug 2021 16:30:21 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java | 153 +++++++++++++++++++++++++++++----------------------
1 files changed, 87 insertions(+), 66 deletions(-)
diff --git a/gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java b/gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java
index d47e691..24719d6 100644
--- a/gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java
+++ b/gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java
@@ -7,9 +7,11 @@
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.xzx.gc.common.constant.Constants;
+import com.xzx.gc.common.constant.RedisKeyConstant;
import com.xzx.gc.common.exception.RestException;
import com.xzx.gc.common.utils.IdUtils;
import com.xzx.gc.common.utils.LocationUtils;
+import com.xzx.gc.common.utils.RedisUtil;
import com.xzx.gc.entity.*;
import com.xzx.gc.order.dto.AddJhyOrderDto;
import com.xzx.gc.order.dto.JhyOrderConfirmDto;
@@ -59,6 +61,9 @@
@Autowired
private DistribService distribService;
+
+ @Autowired
+ private RedisUtil redisUtil;
public void addJhyOrder(AddJhyOrderDto orderDto) {
JhyInfo jhyInfo = jhyInfoMapper.selectJhyInfoByUserId(orderDto.getUserId());
@@ -200,74 +205,90 @@
}
public void confirmOrder(JhyOrderConfirmDto confirmDto) {
- JhyInfo jhyInfo = jhyInfoMapper.selectJhyInfoByUserId(confirmDto.getUserId());
- if (jhyInfo == null || !JhyInfo.CHECK_PASS.equals(jhyInfo.getStatus())) {
- throw new RestException(-3, "不是集物员");
+ String key = RedisKeyConstant.ORDER_PAY + confirmDto.getOrderId();
+ if (redisUtil.setnx(key, "0")) {
+ try {
+ JhyInfo jhyInfo = jhyInfoMapper.selectJhyInfoByUserId(confirmDto.getUserId());
+ if (jhyInfo == null || !JhyInfo.CHECK_PASS.equals(jhyInfo.getStatus())) {
+ throw new RestException(-3, "不是集物员");
+ }
+
+ jhyOrderItemsMapper.deleteItemsByOrderId(confirmDto.getOrderId());
+
+ BigDecimal totalScore = BigDecimal.ZERO;
+ for (JhyOrderConfirmItemsDto item : confirmDto.getItems()) {
+ BigDecimal weight = StrUtil.isNotBlank(item.getWeight()) ? new BigDecimal(item.getWeight()) : BigDecimal.ZERO;
+ SysEnvironmentalInfo environmentalInfo = environmentalInfoMapper.selectByPrimaryKey(item.getId());
+
+ JhyOrderItems orderItems = new JhyOrderItems();
+ orderItems.setOrderId(confirmDto.getOrderId());
+ orderItems.setPicture(environmentalInfo.getPicture());
+ orderItems.setItemType(item.getId());
+ orderItems.setTitle(environmentalInfo.getTitle());
+ orderItems.setPrice(new BigDecimal(environmentalInfo.getPrice()));
+ BigDecimal total = orderItems.getPrice().multiply(BigDecimal.valueOf(40)).multiply(weight);
+ orderItems.setScore(total.setScale(0, BigDecimal.ROUND_DOWN).toString());
+ orderItems.setWeight(weight);
+ jhyOrderItemsMapper.insert(orderItems);
+
+ totalScore = totalScore.add(total);
+ }
+
+ JhyOrder order = jhyOrderMapper.selectByPrimaryKey(confirmDto.getOrderId());
+ AccountInfo jhyAccount = accountMapper.selectAccountInfoByUserId(order.getJhyId());
+ BigDecimal collectScore = StrUtil.isNotBlank(jhyAccount.getCollectScore()) ? new BigDecimal(jhyAccount.getCollectScore()) : BigDecimal.ZERO;
+ if (totalScore.compareTo(collectScore) > 0) {
+ throw new RestException(-3, "剩余积分不足");
+ }
+
+ order.setStatus(JhyOrder.ORDER_STATUS_CONFIRM);
+ order.setReceivingTime(new Date());
+ jhyOrderMapper.updateByPrimaryKey(order);
+
+ BigDecimal jhyScore = StrUtil.isBlank(jhyAccount.getCollectScore()) ? BigDecimal.ZERO : new BigDecimal(jhyAccount.getCollectScore());
+ ScoreDetails jhyScoreDetail = new ScoreDetails();
+ jhyScoreDetail.setOrderNo(order.getOrderNo());
+ jhyScoreDetail.setUserId(order.getJhyId());
+ jhyScoreDetail.setType(ScoreDetails.SCORE_TYPE_PAY);
+ jhyScoreDetail.setChangeScore(totalScore.negate().setScale( 0, BigDecimal.ROUND_DOWN ));
+ jhyScoreDetail.setOriginalScore(jhyScore.setScale( 0, BigDecimal.ROUND_DOWN ));
+ jhyScoreDetail.setCurrentScore(jhyScore.subtract(totalScore).setScale( 0, BigDecimal.ROUND_DOWN ));
+ jhyScoreDetail.setCreatedTime(new Date());
+ scoreDetailsMapper.insert(jhyScoreDetail);
+
+ jhyAccount.setCollectScore(jhyScore.subtract(totalScore).setScale( 0, BigDecimal.ROUND_DOWN ).toString());
+ accountMapper.updateByPrimaryKey(jhyAccount);
+
+ AccountInfo userAccount = accountMapper.selectAccountInfoByUserId(order.getUserId());
+ BigDecimal userScore = StrUtil.isBlank(userAccount.getCollectScore()) ? BigDecimal.ZERO : new BigDecimal(userAccount.getCollectScore());
+ ScoreDetails userScoreDetail = new ScoreDetails();
+ userScoreDetail.setOrderNo(order.getOrderNo());
+ // userScoreDetail.setUserId(order.getJhyId());
+ userScoreDetail.setUserId(order.getUserId());
+ userScoreDetail.setType(ScoreDetails.SCORE_TYPE_EXCHANGE);
+ userScoreDetail.setChangeScore(totalScore.setScale( 0, BigDecimal.ROUND_DOWN ));
+ userScoreDetail.setOriginalScore(userScore.setScale( 0, BigDecimal.ROUND_DOWN ));
+ userScoreDetail.setCurrentScore(userScore.add(totalScore).setScale( 0, BigDecimal.ROUND_DOWN ));
+ userScoreDetail.setCreatedTime(new Date());
+ scoreDetailsMapper.insert(userScoreDetail);
+
+ userAccount.setCollectScore(userScore.add(totalScore).setScale( 0, BigDecimal.ROUND_DOWN ).toString());
+ accountMapper.updateByPrimaryKey(userAccount);
+
+ // 团长返利
+ distribService.distribRecord(order.getId(), order.getUserId());
+ // 推荐返利
+ distribService.inviteAddOrderScore(order.getUserId(), order.getId().toString());
+ } catch (Exception e) {
+ log.error("异常", e);
+ throw new RestException("支付失败");
+ } finally {
+ redisUtil.del(key);
+ }
+ } else {
+ throw new RestException("支付中");
}
- jhyOrderItemsMapper.deleteItemsByOrderId(confirmDto.getOrderId());
-
- BigDecimal totalScore = BigDecimal.ZERO;
- for (JhyOrderConfirmItemsDto item : confirmDto.getItems()) {
- BigDecimal weight = StrUtil.isNotBlank(item.getWeight()) ? new BigDecimal(item.getWeight()) : BigDecimal.ZERO;
- SysEnvironmentalInfo environmentalInfo = environmentalInfoMapper.selectByPrimaryKey(item.getId());
-
- JhyOrderItems orderItems = new JhyOrderItems();
- orderItems.setOrderId(confirmDto.getOrderId());
- orderItems.setPicture(environmentalInfo.getPicture());
- orderItems.setItemType(item.getId());
- orderItems.setTitle(environmentalInfo.getTitle());
- orderItems.setPrice(new BigDecimal(environmentalInfo.getPrice()));
- BigDecimal total = orderItems.getPrice().multiply(BigDecimal.valueOf(40)).multiply(weight);
- orderItems.setScore(total.setScale(0, BigDecimal.ROUND_DOWN).toString());
- orderItems.setWeight(weight);
- jhyOrderItemsMapper.insert(orderItems);
-
- totalScore = totalScore.add(total);
- }
-
- JhyOrder order = jhyOrderMapper.selectByPrimaryKey(confirmDto.getOrderId());
- AccountInfo jhyAccount = accountMapper.selectAccountInfoByUserId(order.getJhyId());
- BigDecimal collectScore = StrUtil.isNotBlank(jhyAccount.getCollectScore()) ? new BigDecimal(jhyAccount.getCollectScore()) : BigDecimal.ZERO;
- if (totalScore.compareTo(collectScore) > 0) {
- throw new RestException(-3, "剩余积分不足");
- }
-
- order.setStatus(JhyOrder.ORDER_STATUS_CONFIRM);
- order.setReceivingTime(new Date());
- jhyOrderMapper.updateByPrimaryKey(order);
-
- BigDecimal jhyScore = StrUtil.isBlank(jhyAccount.getCollectScore()) ? BigDecimal.ZERO : new BigDecimal(jhyAccount.getCollectScore());
- ScoreDetails jhyScoreDetail = new ScoreDetails();
- jhyScoreDetail.setOrderNo(order.getOrderNo());
- jhyScoreDetail.setUserId(order.getJhyId());
- jhyScoreDetail.setType(ScoreDetails.SCORE_TYPE_PAY);
- jhyScoreDetail.setChangeScore(totalScore.negate().setScale( 0, BigDecimal.ROUND_DOWN ));
- jhyScoreDetail.setOriginalScore(jhyScore.setScale( 0, BigDecimal.ROUND_DOWN ));
- jhyScoreDetail.setCurrentScore(jhyScore.subtract(totalScore).setScale( 0, BigDecimal.ROUND_DOWN ));
- jhyScoreDetail.setCreatedTime(new Date());
- scoreDetailsMapper.insert(jhyScoreDetail);
-
- jhyAccount.setCollectScore(jhyScore.subtract(totalScore).setScale( 0, BigDecimal.ROUND_DOWN ).toString());
- accountMapper.updateByPrimaryKey(jhyAccount);
-
- AccountInfo userAccount = accountMapper.selectAccountInfoByUserId(order.getUserId());
- BigDecimal userScore = StrUtil.isBlank(userAccount.getCollectScore()) ? BigDecimal.ZERO : new BigDecimal(userAccount.getCollectScore());
- ScoreDetails userScoreDetail = new ScoreDetails();
- userScoreDetail.setOrderNo(order.getOrderNo());
-// userScoreDetail.setUserId(order.getJhyId());
- userScoreDetail.setUserId(order.getUserId());
- userScoreDetail.setType(ScoreDetails.SCORE_TYPE_EXCHANGE);
- userScoreDetail.setChangeScore(totalScore.setScale( 0, BigDecimal.ROUND_DOWN ));
- userScoreDetail.setOriginalScore(userScore.setScale( 0, BigDecimal.ROUND_DOWN ));
- userScoreDetail.setCurrentScore(userScore.add(totalScore).setScale( 0, BigDecimal.ROUND_DOWN ));
- userScoreDetail.setCreatedTime(new Date());
- scoreDetailsMapper.insert(userScoreDetail);
-
- userAccount.setCollectScore(userScore.add(totalScore).setScale( 0, BigDecimal.ROUND_DOWN ).toString());
- accountMapper.updateByPrimaryKey(userAccount);
-
- distribService.distribRecord(order.getId(), order.getUserId());
}
public Map<Integer, Integer> orderStatusCount(Integer type, String userId) {
--
Gitblit v1.9.1