From f4ef9fccb3347fd364ca59575bf62fe5e4362f59 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 22 Jul 2021 14:17:09 +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 | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 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 ee3c7f3..0906376 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
@@ -136,6 +136,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,6 +148,10 @@
JhyInfo jhyInfo = jhyInfoMapper.selectJhyInfoByUserId(userId);
if (jhyInfo == null || !JhyInfo.CHECK_PASS.equals(jhyInfo.getStatus())) {
throw new RestException(-3, "不是集货员");
+ }
+
+ if (JhyInfo.IS_JHY_N.equals(jhyInfo.getIsJhy())) {
+ throw new RestException(-3, "暂无法抢单");
}
JhyOrder order = jhyOrderMapper.selectByPrimaryKey(orderId);
@@ -181,14 +187,23 @@
throw new RestException(-3, "不是集物员");
}
+ jhyOrderItemsMapper.deleteItemsByOrderId(confirmDto.getOrderId());
+
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);
+ 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);
}
@@ -237,8 +252,8 @@
distribService.distribRecord(order.getId(), order.getUserId());
}
- public Map<Integer, Integer> orderStatusCount(String userId) {
- List<JhyStatusCountVo> count = jhyOrderMapper.selectOrderStatusCount(userId);
+ 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++) {
--
Gitblit v1.9.1