From 12542f379312598f83a50893584944e51fc0f2b9 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 09 Oct 2021 16:06:43 +0800
Subject: [PATCH] fix
---
gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java | 197 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 141 insertions(+), 56 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 3add922..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;
@@ -18,6 +20,7 @@
import com.xzx.gc.order.mapper.*;
import com.xzx.gc.order.vo.JhyOrderDetailsVo;
import com.xzx.gc.order.vo.JhyOrderListVo;
+import com.xzx.gc.order.vo.JhyStatusCountVo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -25,9 +28,7 @@
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
@Slf4j
@Service
@@ -58,10 +59,18 @@
@Autowired
private IdUtils idUtils;
+ @Autowired
+ private DistribService distribService;
+
+ @Autowired
+ private RedisUtil redisUtil;
+
public void addJhyOrder(AddJhyOrderDto orderDto) {
JhyInfo jhyInfo = jhyInfoMapper.selectJhyInfoByUserId(orderDto.getUserId());
if (jhyInfo != null && JhyInfo.CHECK_PASS.equals(jhyInfo.getStatus())) {
- throw new RestException(-3, "集货员不能下单");
+ if (JhyInfo.IS_JHY_Y.equals(jhyInfo.getIsJhy())) {
+ throw new RestException(-3, "集货员不能下单");
+ }
}
AddressInfo addressInfo = addressMapper.selectByPrimaryKey(orderDto.getAddressId());
@@ -87,6 +96,18 @@
address.append(StrUtil.isNotBlank(addressInfo.getUnitName()) ? addressInfo.getUnitName() : "");
}
}
+
+ List<JhyOrder> addressExist = jhyOrderMapper.selectJhyOrderListByStatus(StrUtil.split("1,2", ','), orderDto.getUserId());
+ if (CollUtil.isNotEmpty(addressExist)) {
+ for (JhyOrder order : addressExist) {
+ String orderAddr = order.getArea() + order.getAddress();
+
+ if (orderAddr.equals(addressInfo.getAddressArea() + address)) {
+ throw new RestException(-3, "同一地址仅能有一单在进行中");
+ }
+ }
+ }
+
jhyOrder.setAddress(address.toString());
jhyOrder.setUsername(addressInfo.getRelaName());
@@ -134,6 +155,8 @@
JhyOrderDetailsVo detailsVo = new JhyOrderDetailsVo();
BeanUtil.copyProperties(order, detailsVo);
+ detailsVo.setLongitude(order.getLongitude());
+ detailsVo.setLatitude(order.getLatitude());
detailsVo.setAddress(order.getArea() + order.getAddress());
detailsVo.setTotalPrice(total);
detailsVo.setItems(items);
@@ -146,9 +169,17 @@
throw new RestException(-3, "不是集货员");
}
+ if (JhyInfo.IS_JHY_N.equals(jhyInfo.getIsJhy())) {
+ throw new RestException(-3, "暂无法抢单");
+ }
+
JhyOrder order = jhyOrderMapper.selectByPrimaryKey(orderId);
if (order == null) {
throw new RestException(-3, "订单不存在");
+ }
+
+ if (order.getUserId().equals(jhyInfo.getUserId())) {
+ throw new RestException(-3, "不能抢自己的单");
}
order.setJhyId(userId);
@@ -169,66 +200,120 @@
order.setStatus(JhyOrder.ORDER_STATUS_CANCEL);
}
+ order.setJhyId(null);
jhyOrderMapper.updateByPrimaryKey(order);
}
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("支付中");
}
- BigDecimal totalScore = BigDecimal.ZERO;
- for (JhyOrderConfirmItemsDto item : confirmDto.getItems()) {
- JhyOrderItems orderItem = jhyOrderItemsMapper.selectByPrimaryKey(item.getId());
- BigDecimal weight = StrUtil.isNotBlank(item.getWeight()) ? new BigDecimal(item.getWeight()) : BigDecimal.ZERO;
- BigDecimal total = orderItem.getPrice().multiply(BigDecimal.valueOf(40)).multiply(weight);
- orderItem.setScore(total.setScale(0, BigDecimal.ROUND_DOWN).toString());
- orderItem.setWeight(weight);
- jhyOrderItemsMapper.updateByPrimaryKey(orderItem);
+ }
- totalScore = totalScore.add(total);
+ public Map<Integer, Integer> orderStatusCount(Integer type, String userId) {
+ List<JhyStatusCountVo> count = jhyOrderMapper.selectOrderStatusCount(type, userId);
+
+ Map<Integer, Integer> map = new HashMap<>();
+ for (int i = 1; i < 6; i++) {
+ if (CollUtil.isNotEmpty(count)) {
+ boolean flag = false;
+ for (JhyStatusCountVo jhyStatusCountVo : count) {
+ if (i == jhyStatusCountVo.getStatus()) {
+ map.put(i, jhyStatusCountVo.getCnt());
+ flag = true;
+ break;
+ }
+ }
+
+ if (flag) {
+ continue;
+ }
+ }
+
+ map.put(i, 0);
}
- 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);
+ return map;
}
}
--
Gitblit v1.9.1