创建订单-修复下单问题

app/common/repositories/store/order/StoreGroupOrderRepository.php

@@ -418,18 +418,6 @@ class StoreGroupOrderRepository extends BaseRepository
             throw new ValidateException('地址需要选择4级地址！请修改地址！');
         }
 
-        /** 验证分享信息 分享 */
-        /** @var ShareEntity $shareEntity */
-        $shareEntity = ShareEntity::newInstance();
-        if (!empty($storeOrderCreateRequestEntity->getShareId())) {
-            /** @var ShareRepository $shareRepository */
-            $shareRepository = app()->make(ShareRepository::class);
-            $shareEntity = $shareRepository->getShareEntityByShareId($storeOrderCreateRequestEntity->getShareId());
-            if (empty($shareEntity->getId())) {
-                throw new ValidateException('无效的分享信息');
-            }
-        }
-
         /** 验证 购物车信息 */
         // 目前购物车只能添加一件商品，据了解之前 写的购物车，添加多件商品组合支付时计算的 金额和 VR 积分之类的会有问题
         /** @var StoreCartRepository $storeCartRepository */
@@ -563,6 +551,24 @@ class StoreGroupOrderRepository extends BaseRepository
             }
         }
 
+        /** 验证分享信息 分享 */
+        /** @var ShareEntity $shareEntity */
+        $shareEntity = ShareEntity::newInstance();
+        if (!empty($storeOrderCreateRequestEntity->getShareId())) {
+            /** @var ShareRepository $shareRepository */
+            $shareRepository = app()->make(ShareRepository::class);
+            $shareEntity = $shareRepository->getShareEntityByShareId($storeOrderCreateRequestEntity->getShareId());
+            if (empty($shareEntity->getId())) {
+                throw new ValidateException('无效的分享信息');
+            } else if ($shareEntity->getUid() == $userEntity->getUid()) {
+                // 如果分享人是自己，则分享数据无效
+                $shareEntity = ShareEntity::newInstance();
+            } else if (!in_array($shareEntity->getProductId(), $productIdList)) {
+                // 如果分享的商品 不是下单的商品则分享无效
+                $shareEntity = ShareEntity::newInstance();
+            }
+        }
+
         return [
             'userEntity' => $userEntity,
             'cartEntityList' => $cartEntityList,