From 357f148f73eed2b25da6ecd13bc3e632c07d4c11 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 29 Jun 2021 16:07:17 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

---
 gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml          |    2 +-
 gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java      |    4 ++++
 gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java |   23 ++++++++++++++---------
 3 files changed, 19 insertions(+), 10 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 5611360..ab9f48c 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
@@ -56,10 +56,10 @@
     private IdUtils idUtils;
 
     public void addJhyOrder(AddJhyOrderDto orderDto) {
-//        JhyInfo jhyInfo = jhyInfoMapper.selectJhyInfoByUserId(orderDto.getUserId());
-//        if (jhyInfo != null && JhyInfo.CHECK_PASS.equals(jhyInfo.getStatus())) {
-//            throw new RestException(-3, "集货员不能下单");
-//        }
+        JhyInfo jhyInfo = jhyInfoMapper.selectJhyInfoByUserId(orderDto.getUserId());
+        if (jhyInfo != null && JhyInfo.CHECK_PASS.equals(jhyInfo.getStatus())) {
+            throw new RestException(-3, "集货员不能下单");
+        }
 
         // TODO 判断地址附近500米是否有集物员
         String orderNo = idUtils.generate("JW", 10);
@@ -165,11 +165,6 @@
             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());
@@ -181,7 +176,17 @@
             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());
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java b/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java
index 1ecd9e8..b9d4ab1 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java
@@ -176,6 +176,10 @@
             }
         }
 
+        if (addGoodsOrderDto.getCnt() > sku.getStock()) {
+            throw new RestException(-3, "库存不足");
+        }
+
         AccountInfo accountInfo = accountInfoMapper.selectAccountInfoByUserId(addGoodsOrderDto.getUserId());
 
         if (accountInfo.getCollectScore() == null) {
diff --git a/gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml b/gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml
index 28ce66f..9edd117 100644
--- a/gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml
@@ -99,7 +99,7 @@
             c.quantity sku_quantity
         from xzx_score_goods a
         inner join xzx_score_goods_style b on a.id = b.goods_id and b.del_flag = 0
-        inner join xzx_score_goods_sku c on a.id = c.goods_id and c.del_flag = 0
+        inner join xzx_score_goods_sku c on b.id = c.style_id and c.del_flag = 0
         where a.id=#{id}
     </select>
 </mapper>

--
Gitblit v1.9.1