From b87e2975c597d67d7a419a63e1d0166b3d4ad1d3 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 12 七月 2024 17:53:17 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index 91b9323..91a1092 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -373,6 +373,9 @@
             if (data.getListingStatus().getCode()==1){
                 throw new ServiceException("该商品已经下架");
             }
+            if (data.getStartStatus().getCode()==0){
+                throw new ServiceException("该商品未开始");
+            }
             Integer m=data.getCurrentNumber()+1;
             if (m>data.getGroupSize()){
                 throw new ServiceException("对不起,大成团人数");
@@ -797,6 +800,10 @@
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
+        CustomConfig memberPointsPoints = sysUserClient.getconfig("MALL_ORDER_DESCRIPTION").getData();
+        orderVO.setOrderShuoMin(memberPointsPoints.getConfigValue());
+        CustomConfig ReturnCycle = sysUserClient.getconfig("RETURN_CYCLE").getData();
+        orderVO.setOrderZq(Integer.valueOf(ReturnCycle.getConfigValue()));
         return orderVO;
     }
 
@@ -813,6 +820,7 @@
                 GoodsStockUpdDTO goodsStockUpdDTO1 = new GoodsStockUpdDTO();
                 goodsStockUpdDTO1.setGoodsSkuId(order.getGoodsSkuId());
                 goodsStockUpdDTO1.setAuctionStock(goodsSku.getStock()+order.getGoodsQuantity());
+                goodsStockUpdDTO1.setSoldQuantity(goodsSku.getSoldQuantity()-order.getGoodsQuantity());
                 goodsSkuClient.updGoodsStock1(goodsStockUpdDTO1,SecurityConstants.INNER);
             }
 
@@ -821,7 +829,8 @@
                 GoodsStockUpdDTO goodsStockUpdDTO1 = new GoodsStockUpdDTO();
                 goodsStockUpdDTO1.setGoodsSkuId(order.getGoodsSkuId());
                 goodsStockUpdDTO1.setAuctionStock(data.getSeckillStock()+order.getGoodsQuantity());
-                goodsSkuClient.updGoodsStock1(goodsStockUpdDTO1,SecurityConstants.INNER);
+                goodsStockUpdDTO1.setSoldQuantity(data.getSoldQuantity()-order.getGoodsQuantity());
+                goodsSkuClient.updGoodsSeckill(goodsStockUpdDTO1,SecurityConstants.INNER);
             }
 
 
@@ -836,6 +845,7 @@
                 GoodsStockUpdDTO goodsStockUpdDTO1 = new GoodsStockUpdDTO();
                 goodsStockUpdDTO1.setGoodsSkuId(order.getGoodsSkuId());
                 goodsStockUpdDTO1.setAuctionStock(goodsSku.getStock()+order.getGoodsQuantity());
+                goodsStockUpdDTO1.setSoldQuantity(goodsSku.getSoldQuantity()-order.getGoodsQuantity());
                 goodsSkuClient.updGoodsStock1(goodsStockUpdDTO1,SecurityConstants.INNER);
             }
 
@@ -844,7 +854,8 @@
                 GoodsStockUpdDTO goodsStockUpdDTO1 = new GoodsStockUpdDTO();
                 goodsStockUpdDTO1.setGoodsSkuId(order.getGoodsSkuId());
                 goodsStockUpdDTO1.setAuctionStock(data.getSeckillStock()+order.getGoodsQuantity());
-                goodsSkuClient.updGoodsStock1(goodsStockUpdDTO1,SecurityConstants.INNER);
+                goodsStockUpdDTO1.setSoldQuantity(data.getSoldQuantity()-order.getGoodsQuantity());
+                goodsSkuClient.updGoodsSeckill(goodsStockUpdDTO1,SecurityConstants.INNER);
             }
 
             if (order.getCouponId()!=0){

--
Gitblit v1.7.1