优化用户下单方法-进行中

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

@@ -10662,7 +10662,7 @@ class StoreOrderRepository extends BaseRepository
         // 商品属性
         /** @var ProductAttrValueRepository $productAttrValueRepository */
         $productAttrValueRepository = app()->make(ProductAttrValueRepository::class);
-        // 目前还未搞清这个表的意义
+        //
         /** @var SeckillRepository $seckillRepository */
         $seckillRepository = app()->make(SeckillRepository::class);
         // 商户设置秒杀商品关联表
@@ -10691,8 +10691,13 @@ class StoreOrderRepository extends BaseRepository
         // 获取  商品 对应的 运费模板 de 配送区域表
         /** @var ShippingTemplateRegionRepository $shippingTemplateRegionRepository */
         $shippingTemplateRegionRepository = app()->make(ShippingTemplateRegionRepository::class);
+
         /** @var UserRepository $UserRepository */
-        $UserRepository = app()->make(UserRepository::class);
+        $userRepository = app()->make(UserRepository::class);
+        /** @var StoreOrderRepository $storeOrderRepository */
+        $storeOrderRepository = app()->make(StoreOrderRepository::class);
+        /** @var StoreGroupOrderRepository $storeGroupOrderRepository */
+        $storeGroupOrderRepository = app()->make(StoreGroupOrderRepository::class);
 
         // 记录 用户 在指定商家的 优惠券
         $storeCouponUserEntityListByMerIdMap = [];
@@ -10976,8 +10981,10 @@ class StoreOrderRepository extends BaseRepository
                 ->setDouhuomallStatus(StoreOrderEnum::DOHUOMALL_STATUS['NotSubmittedToWeiweiBao']['code'])
                 ->setFzonePaytype($storeOrderCreateRequestEntity->getFzonePayType())
                 ->setConPri($serviceMoney);
+            $storeOrderEntityList[] = $storeOrderEntity;
         }
 
+        // 验证支付方式
         /** @var FzonePayTypeEntity $fzonePayTypeEntity */
         $fzonePayTypeEntity = FzonePayTypeEntity::newInstance($storeOrderCreateRequestEntity->getFzonePayType());
         if ($fzonePayTypeEntity->getType() == StoreOrderEnum::FZONE_PAY_TYPE['B1-VR+Score']['code']) {
@@ -10985,7 +10992,37 @@ class StoreOrderRepository extends BaseRepository
                 throw new ValidateException('支付失败，VR或积分不足！');
             }
         } else if ($fzonePayTypeEntity->getType() == StoreOrderEnum::FZONE_PAY_TYPE['B2-Cash+Score']['code']) {
+            if ($fzonePayTypeEntity->getOther() > $userEntity->getScore()) {
+                throw new ValidateException('支付失败，积分不足！');
+            }
+        } else if ($fzonePayTypeEntity->getType() == StoreOrderEnum::FZONE_PAY_TYPE['B3-VR+Jingdou']['code']) {
+            if ($fzonePayTypeEntity->getPrice() > $userEntity->getVr() || $fzonePayTypeEntity->getOther() > $userEntity->getJingdou()) {
+                throw new ValidateException('支付失败，VR或京豆不足！');
+            }
+        } else if ($fzonePayTypeEntity->getType() == StoreOrderEnum::FZONE_PAY_TYPE['B4-Cash+Jingdou']['code']) {
+            if ($fzonePayTypeEntity->getPrice() > $userEntity->getVr() || $fzonePayTypeEntity->getOther() > $userEntity->getJingdou()) {
+                throw new ValidateException('支付失败，京豆不足！');
+            }
+        } else if ($fzonePayTypeEntity->getType() == StoreOrderEnum::FZONE_PAY_TYPE['B5-VR']['code']) {
+            if ($fzonePayTypeEntity->getPrice() > $userEntity->getVr()) {
+                throw new ValidateException('支付失败，VR不足！');
+            }
+        } else if ($fzonePayTypeEntity->getType() == StoreOrderEnum::FZONE_PAY_TYPE['A1-VR']['code']) {
+            if ($fzonePayTypeEntity->getPrice() > $userEntity->getVr()) {
+                throw new ValidateException('支付失败，VR不足！');
+            }
+        } else if ($fzonePayTypeEntity->getType() == StoreOrderEnum::FZONE_PAY_TYPE['A2-Cash']['code']) {
 
+        } else if ($fzonePayTypeEntity->getType() == StoreOrderEnum::FZONE_PAY_TYPE['A3-Cash+VR']['code']) {
+            if ($fzonePayTypeEntity->getOther() > $userEntity->getVr()) {
+                throw new ValidateException('支付失败，VR不足！');
+            }
+        } else if ($fzonePayTypeEntity->getType() == StoreOrderEnum::FZONE_PAY_TYPE['C1-Fugou']['code']) {
+            if ($fzonePayTypeEntity->getOther() > $userEntity->getFugou()) {
+                throw new ValidateException('支付失败，复购金不足！');
+            }
+        } else {
+            throw new ValidateException('支付失败，支付方式错误！');
         }
 
         /** @var StoreGroupOrderEntity $storeGroupOrderEntity */
@@ -11003,11 +11040,12 @@ class StoreOrderRepository extends BaseRepository
             ->setCost($totalCost)
             ->setPayType($storeOrderCreateRequestEntity->getPayType())
             ->setFzonePaytype($storeOrderCreateRequestEntity->getFzonePayType());
+        $storeGroupOrderCreateResultModel = $storeGroupOrderRepository->create($storeGroupOrderEntity->toUnderlineArray());
+        $storeGroupOrderEntity->setGroupOrderId($storeGroupOrderCreateResultModel->group_order_id);
 
-        // TODO 保存后 将保存后的ID 存入到订单表中
-        // foreach ($storeOrderEntityList as $storeOrderEntity) {
-        //     $storeOrderEntity->setGroupOrderId();
-        // }
+        foreach ($storeOrderEntityList as $storeOrderEntity) {
+             $storeOrderEntity->setGroupOrderId($storeGroupOrderEntity->getGroupOrderId());
+         }