From 3cdddd8bb0a0b2cef27d44629647666579655877 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 28 Jun 2021 22:22:30 +0800
Subject: [PATCH] add confirmOrder
---
gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 53 insertions(+), 5 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 599c89d..4841c1b 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
@@ -9,6 +9,8 @@
import com.xzx.gc.common.utils.IdUtils;
import com.xzx.gc.entity.*;
import com.xzx.gc.order.dto.AddJhyOrderDto;
+import com.xzx.gc.order.dto.JhyOrderConfirmDto;
+import com.xzx.gc.order.dto.JhyOrderConfirmItemsDto;
import com.xzx.gc.order.dto.JhyOrderListDto;
import com.xzx.gc.order.mapper.*;
import com.xzx.gc.order.vo.JhyOrderDetailsVo;
@@ -43,6 +45,12 @@
@Autowired
private JhyInfoMapper jhyInfoMapper;
+
+ @Autowired
+ private AccountMapper accountMapper;
+
+ @Autowired
+ private ScoreDetailsMapper scoreDetailsMapper;
@Autowired
private IdUtils idUtils;
@@ -100,11 +108,6 @@
}
public PageInfo<JhyOrderListVo> orderList(JhyOrderListDto orderListDto) {
- JhyInfo jhyInfo = jhyInfoMapper.selectJhyInfoByUserId(orderListDto.getUserId());
- if (jhyInfo == null || !JhyInfo.CHECK_PASS.equals(jhyInfo.getStatus())) {
- throw new RestException(-3, "不是集货员");
- }
-
PageHelper.startPage(orderListDto.getPageNo(), orderListDto.getPageSize());
List<JhyOrderListVo> data = jhyOrderMapper.selectJhyOrderList(orderListDto);
return new PageInfo<>(data);
@@ -154,4 +157,49 @@
order.setStatus(JhyOrder.ORDER_STATUS_CANCEL);
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, "不是集物员");
+ }
+
+ JhyOrder order = jhyOrderMapper.selectByPrimaryKey(confirmDto.getOrderId());
+ order.setStatus(JhyOrder.ORDER_STATUS_CONFIRM);
+ order.setReceivingTime(new Date());
+ jhyOrderMapper.updateByPrimaryKey(order);
+
+ BigDecimal totalScore = BigDecimal.ZERO;
+ for (JhyOrderConfirmItemsDto item : confirmDto.getItems()) {
+ JhyOrderItems orderItem = jhyOrderItemsMapper.selectByPrimaryKey(item.getId());
+ BigDecimal total = orderItem.getPrice().multiply(BigDecimal.valueOf(40)).multiply(new BigDecimal(item.getWeight()));
+ orderItem.setScore(total.setScale(0, BigDecimal.ROUND_DOWN).toString());
+ orderItem.setWeight(new BigDecimal(item.getWeight()));
+ jhyOrderItemsMapper.updateByPrimaryKey(orderItem);
+
+ totalScore = totalScore.add(total);
+ }
+
+ AccountInfo jhyAccount = accountMapper.selectAccountInfoByUserId(order.getJhyId());
+ 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());
+ jhyScoreDetail.setOriginalScore(jhyScore);
+ jhyScoreDetail.setCurrentScore(jhyScore.subtract(totalScore));
+ scoreDetailsMapper.insert(jhyScoreDetail);
+
+ 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.setType(ScoreDetails.SCORE_TYPE_EXCHANGE);
+ userScoreDetail.setChangeScore(totalScore);
+ userScoreDetail.setOriginalScore(userScore);
+ userScoreDetail.setCurrentScore(userScore.add(totalScore));
+ scoreDetailsMapper.insert(userScoreDetail);
+ }
}
--
Gitblit v1.9.1