From b141df9bf9764db8567efebed48006e12ab1f657 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sun, 14 Aug 2022 15:52:45 +0800
Subject: [PATCH] fix:jhy 停止下单
---
gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java | 198 +++++++++++++++++++++++++++++--------------------
1 files changed, 118 insertions(+), 80 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 8b89b3d..af7e9f8 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;
@@ -60,6 +62,9 @@
@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())) {
@@ -82,29 +87,37 @@
jhyOrder.setOrderNo(orderNo);
jhyOrder.setArea(addressInfo.getAddressArea());
- StringBuffer address = new StringBuffer();
- address.append(addressInfo.getDetailAddress());
- if (StrUtil.isNotBlank(addressInfo.getTagName())) {
- address.append(StrUtil.isNotBlank(addressInfo.getHouseName()) ? addressInfo.getHouseName() : "");
- if (Constants.ADDRESS_TYPE_HOME.equals(addressInfo.getTagName())) {
- address.append(StrUtil.isNotBlank(addressInfo.getHouseNumber()) ? addressInfo.getHouseNumber() : "");
- address.append(StrUtil.isNotBlank(addressInfo.getUnitName()) ? addressInfo.getUnitName() : "");
- }
- }
+// StringBuffer address = new StringBuffer();
+// address.append(addressInfo.getDetailAddress());
+// if (StrUtil.isNotBlank(addressInfo.getTagName())) {
+// address.append(StrUtil.isNotBlank(addressInfo.getHouseName()) ? addressInfo.getHouseName() : "");
+// if (Constants.ADDRESS_TYPE_HOME.equals(addressInfo.getTagName())) {
+// address.append(StrUtil.isNotBlank(addressInfo.getHouseNumber()) ? addressInfo.getHouseNumber() : "");
+// 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();
+ String orderAddr = order.getArea()
+ + order.getAddress()
+ + (StrUtil.isEmpty(order.getUnitName())?"":order.getUnitName())
+ + (StrUtil.isEmpty(order.getHouseNumber())?"":order.getHouseNumber());
- if (orderAddr.equals(address.toString())) {
+ if (orderAddr.equals(addressInfo.getAddressArea()
+ + addressInfo.getDetailAddress()
+ + (StrUtil.isEmpty(addressInfo.getHouseName())?"":addressInfo.getHouseName())
+ + (StrUtil.isEmpty(addressInfo.getUnitName())?"":addressInfo.getUnitName())
+ + (StrUtil.isEmpty(addressInfo.getHouseNumber())?"":addressInfo.getHouseNumber()))) {
throw new RestException(-3, "同一地址仅能有一单在进行中");
}
}
}
- jhyOrder.setAddress(address.toString());
-
+ jhyOrder.setAddress(addressInfo.getDetailAddress()+(StrUtil.isEmpty(addressInfo.getHouseName())?"":addressInfo.getHouseName()));
+ jhyOrder.setUnitName(StrUtil.isEmpty(addressInfo.getUnitName())?"":addressInfo.getUnitName());
+ jhyOrder.setHouseNumber(StrUtil.isEmpty(addressInfo.getHouseNumber())?"":addressInfo.getHouseNumber());
jhyOrder.setUsername(addressInfo.getRelaName());
jhyOrder.setPhone(addressInfo.getMobilePhone());
jhyOrder.setLongitude(addressInfo.getLongitude());
@@ -143,7 +156,7 @@
BigDecimal total = BigDecimal.ZERO;
for (JhyOrderItems item : items) {
- item.setPrice(item.getPrice().multiply(BigDecimal.valueOf(40)));
+ item.setPrice(item.getPrice().multiply(BigDecimal.valueOf(Constants.PRICE_SCORE_EXCHANGE)));
total = total.add(StrUtil.isNotBlank(item.getScore()) ? new BigDecimal(item.getScore()) : BigDecimal.ZERO);
}
@@ -153,6 +166,8 @@
detailsVo.setLongitude(order.getLongitude());
detailsVo.setLatitude(order.getLatitude());
detailsVo.setAddress(order.getArea() + order.getAddress());
+ detailsVo.setUnitName(order.getUnitName());
+ detailsVo.setHouseNumber(order.getHouseNumber());
detailsVo.setTotalPrice(total);
detailsVo.setItems(items);
return detailsVo;
@@ -200,74 +215,93 @@
}
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(Constants.PRICE_SCORE_EXCHANGE)).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;
+ log.info("===={}======{}====", collectScore, totalScore);
+ 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 (RestException e) {
+ throw new RestException(e.getMessage());
+ } 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) {
@@ -295,4 +329,8 @@
return map;
}
+
+ public List<JhyInfo> findJhyInfoInRange(Long addressId) {
+ return jhyInfoMapper.selectJhyInfoListInAddressRange(addressId);
+ }
}
--
Gitblit v1.9.1