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

app/common/enum/store/StoreOrderEnum.php

@@ -33,5 +33,17 @@ class StoreOrderEnum extends CommonEnum
         'NotSubmittedToWeiweiBao' => ['code' => 9, 'name' => '还未提交到微唯保']
     ];
 
+    // 组合支付类型 （考虑到这个区分 A或B 在此步骤毫无意义，划分混乱） A：会员专区 B：精彩生活区 C：复购区
+    const FZONE_PAY_TYPE = [
+        'B1-VR+Score' => ['code' => 'b1', 'name' => 'VR+积分'],
+        'B2-Cash+Score' => ['code' => 'b2', 'name' => '现金+积分'],
+        'B3-VR+Jingdou' => ['code' => 'b3', 'name' => 'VR+京豆'],
+        'B4-Cash+Jingdou' => ['code' => 'b4', 'name' => '现金+京豆'],
+        'B5-VR' => ['code' => 'b5', 'name' => 'VR'],
+        'A1-VR' => ['code' => 'a1', 'name' => 'VR'],
+        'A2-Cash' => ['code' => 'a2', 'name' => '现金'],
+        'A3-Cash+VR' => ['code' => 'a3', 'name' => '现金+VR'],
+        'C1-Fugou' => ['code' => 'c1', 'name' => '复购金'],
+    ];
 
 }

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

@@ -58,6 +58,7 @@ use app\entity\data\store\StoreGroupOrderEntity;
 use app\entity\data\store\StoreOrderEntity;
 use app\entity\data\user\AddressEntity;
 use app\entity\data\user\UserEntity;
+use app\entity\monomer\store\FzonePayTypeEntity;
 use app\entity\request\api\store\order\StoreOrderCreateRequestEntity;
 use app\model\common\JdOrderModel;
 use app\model\common\TbOrderModel;
@@ -10690,6 +10691,8 @@ class StoreOrderRepository extends BaseRepository
         // 获取  商品 对应的 运费模板 de 配送区域表
         /** @var ShippingTemplateRegionRepository $shippingTemplateRegionRepository */
         $shippingTemplateRegionRepository = app()->make(ShippingTemplateRegionRepository::class);
+        /** @var UserRepository $UserRepository */
+        $UserRepository = app()->make(UserRepository::class);
 
         // 记录 用户 在指定商家的 优惠券
         $storeCouponUserEntityListByMerIdMap = [];
@@ -10713,6 +10716,8 @@ class StoreOrderRepository extends BaseRepository
         $totalNum = 0;
         // 此笔订单产生的总 邮费
         $totalPostage = 0.00;
+        // 订单总成本价
+        $totalCost = 0.00;
         // 订单实体表
         $storeOrderEntityList = [];
 
@@ -10828,12 +10833,17 @@ class StoreOrderRepository extends BaseRepository
             $price = bcmul($cartEntity->getCartNum(), $productAttrValueEntity->getPrice(), 2);
             // 平台拿到的钱（商户分润）
             $serviceMoney = bcmul($cartEntity->getCartNum(), $productAttrValueEntity->getPlateMerProfit(), 2);
+            // 商家获利部分（成本）
+            $cost = bcsub($price, $serviceMoney, 2);
             // 计算养老金 注意 此步骤需要传入商品的价格，因为上述 可能对商品的价格发生了改变
             $yanglaojin = bcadd($yanglaojin, $productRepository->yanglaojin($cartEntity->getProductId(), $price), 2);
+
             // 计算总价
             $totalPrice = bcadd($totalPrice, $price, 2);
             // 计算总数
             $totalNum = bcadd($totalNum, $cartEntity->getCartNum(), 2);
+            // 计算总成本
+            $totalCost = bcadd($totalCost, $cost, 2);
 
             // 如果是 普通商品 product_type 类型 0=普通产品
             if ($cartEntity->getProductType() == CartEnum::PRODUCT_TYPE['Ordinary']['code']) {
@@ -10951,7 +10961,7 @@ class StoreOrderRepository extends BaseRepository
                 ->setPayPostage($postage)
                 ->setPayPrice($price)
                 ->setMerId($cartEntity->getMerId())
-                ->setCost(bcsub($price, $serviceMoney, 2))
+                ->setCost($cost)
                 ->setPayType($storeOrderCreateRequestEntity->getPayType())
                 ->setShareId($storeOrderCreateRequestEntity->getShareId())
                 ->setShareUid($shareEntity->getUid())
@@ -10966,25 +10976,39 @@ class StoreOrderRepository extends BaseRepository
                 ->setDouhuomallStatus(StoreOrderEnum::DOHUOMALL_STATUS['NotSubmittedToWeiweiBao']['code'])
                 ->setFzonePaytype($storeOrderCreateRequestEntity->getFzonePayType())
                 ->setConPri($serviceMoney);
+        }
 
+        /** @var FzonePayTypeEntity $fzonePayTypeEntity */
+        $fzonePayTypeEntity = FzonePayTypeEntity::newInstance($storeOrderCreateRequestEntity->getFzonePayType());
+        if ($fzonePayTypeEntity->getType() == StoreOrderEnum::FZONE_PAY_TYPE['B1-VR+Score']['code']) {
+            if ($fzonePayTypeEntity->getPrice() > $userEntity->getVr() || $fzonePayTypeEntity->getOther() > $userEntity->getScore()) {
+                throw new ValidateException('支付失败，VR或积分不足！');
+            }
+        } else if ($fzonePayTypeEntity->getType() == StoreOrderEnum::FZONE_PAY_TYPE['B2-Cash+Score']['code']) {
 
+        }
 
+        /** @var StoreGroupOrderEntity $storeGroupOrderEntity */
+        $storeGroupOrderEntity = StoreGroupOrderEntity::newInstance();
+        $storeGroupOrderEntity->setUid($userEntity->getUid())
+            ->setGroupOrderSn($this->getNewOrderId() . '0')
+            ->setTotalPostage($totalPostage)
+            ->setTotalPrice($totalPrice)
+            ->setTotalNum($totalNum)
+            ->setRealName($addressEntity->getRealName())
+            ->setUserPhone($addressEntity->getPhone())
+            ->setUserAddress($addressEntity->getProvince() . $addressEntity->getCity() . $addressEntity->getDistrict() . $addressEntity->getDetail())
+            ->setPayPrice($totalPrice)
+            ->setPayPostage($totalPostage)
+            ->setCost($totalCost)
+            ->setPayType($storeOrderCreateRequestEntity->getPayType())
+            ->setFzonePaytype($storeOrderCreateRequestEntity->getFzonePayType());
 
-            // // 修改优惠券状态
-            // // $storeCouponUserRepository->updates([], []);
-            // /** @var StoreGroupOrderEntity $storeGroupOrderEntity */
-            // $storeGroupOrderEntity = StoreGroupOrderEntity::newInstance();
-            // $storeGroupOrderEntity->setUid($cartEntity->getUid())
-            //     ->setGroupOrderSn($this->getNewOrderId() . '0')
-            //     ->setTotalPostage($postage)
-            //     ->setTotalPrice($price)
-            //     ->setTotalNum($cartEntity->getCartNum())
-            //     ->setRealName($addressEntity->getRealName())
-            //     ->setUserPhone($addressEntity->getPhone())
-            //     ->setUserAddress($addressEntity->getProvince() . $addressEntity->getCity() . $addressEntity->getDistrict() . $addressEntity->getDetail())
-            //     ->setPayPrice()
+        // TODO 保存后 将保存后的ID 存入到订单表中
+        // foreach ($storeOrderEntityList as $storeOrderEntity) {
+        //     $storeOrderEntity->setGroupOrderId();
+        // }
 
-        }
 
 
         return [];

app/entity/data/store/StoreGroupOrderEntity.php

@@ -511,11 +511,21 @@ class StoreGroupOrderEntity extends DataEntity
     }
 
     /**
-     * @param string $fzonePaytype
+     * @param mixed $fzonePaytype
      * @return StoreGroupOrderEntity
      */
-    public function setFzonePaytype(string $fzonePaytype): StoreGroupOrderEntity
+    public function setFzonePaytype($fzonePaytype): StoreGroupOrderEntity
     {
+        if (!is_string($fzonePaytype)) {
+            $fzonePaytypePre = $fzonePaytype;
+            $fzonePaytype = '';
+
+            if (is_array($fzonePaytypePre)) {
+                $fzonePaytype = json_encode($fzonePaytypePre);
+            }
+
+            unset($fzonePaytypePre);
+        }
         $this->fzonePaytype = $fzonePaytype;
         return $this;
     }

app/entity/monomer/MonomerEntity.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace app\entity\monomer;
+
+use app\entity\CommonEntity;
+
+class MonomerEntity extends CommonEntity
+{
+
+}

app/entity/monomer/store/FzonePayTypeEntity.php

@@ -0,0 +1,104 @@
+<?php
+
+namespace app\entity\monomer\store;
+
+use app\entity\data\DataEntity;
+
+class FzonePayTypeEntity extends DataEntity
+{
+    public $type = '';
+    public $price = 0.00;
+    public $other = 0.00;
+    public $note = '';
+    public $checked = false;
+
+    /**
+     * @return string
+     */
+    public function getType(): string
+    {
+        return $this->type;
+    }
+
+    /**
+     * @param string $type
+     * @return FzonePayTypeEntity
+     */
+    public function setType(string $type): FzonePayTypeEntity
+    {
+        $this->type = $type;
+        return $this;
+    }
+
+    /**
+     * @return float
+     */
+    public function getPrice(): float
+    {
+        return $this->price;
+    }
+
+    /**
+     * @param float $price
+     * @return FzonePayTypeEntity
+     */
+    public function setPrice(float $price): FzonePayTypeEntity
+    {
+        $this->price = $price;
+        return $this;
+    }
+
+    /**
+     * @return float
+     */
+    public function getOther(): float
+    {
+        return $this->other;
+    }
+
+    /**
+     * @param float $other
+     * @return FzonePayTypeEntity
+     */
+    public function setOther(float $other): FzonePayTypeEntity
+    {
+        $this->other = $other;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getNote(): string
+    {
+        return $this->note;
+    }
+
+    /**
+     * @param string $note
+     * @return FzonePayTypeEntity
+     */
+    public function setNote(string $note): FzonePayTypeEntity
+    {
+        $this->note = $note;
+        return $this;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isChecked(): bool
+    {
+        return $this->checked;
+    }
+
+    /**
+     * @param bool $checked
+     * @return FzonePayTypeEntity
+     */
+    public function setChecked(bool $checked): FzonePayTypeEntity
+    {
+        $this->checked = $checked;
+        return $this;
+    }
+}