From e35c046f3a17f17eae34138de4ad6f5dfc785eff Mon Sep 17 00:00:00 2001
From: hupeng <hupeng@hupengdeMacBook-Pro.local>
Date: Sun, 9 Aug 2020 23:54:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E4=B9=8B=E5=89=8D=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E6=98=AF=E5=90=A6=E6=8B=BC=E5=9B=A2=E6=88=90=E5=8A=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/service/impl/YxStoreOrderServiceImpl.java       | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
index 4e7ae184..4205491a 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
@@ -673,6 +673,14 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<StoreOrderMapper, Y
         YxExpress expressQueryVo = expressService.getById(Integer.valueOf(deliveryName));
         if(ObjectUtil.isNull(expressQueryVo)) throw new YshopException("请后台先添加快递公司");
 
+        //判断拼团产品
+        if(orderQueryVo.getPinkId() != null && orderQueryVo.getPinkId() >0 ){
+            YxStorePink pink = pinkService.getById(orderQueryVo.getPinkId());
+            if(!OrderInfoEnum.PINK_STATUS_2.getValue().equals(pink.getStatus())){
+                throw new YshopException("拼团未成功不能发货");
+            }
+        }
+
         YxStoreOrder storeOrder = YxStoreOrder.builder()
                 .id(orderQueryVo.getId())
                 .status(OrderInfoEnum.STATUS_1.getValue())