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

app/common/dao/store/StoreSeckillActiveDao.php

@@ -5,12 +5,14 @@
  * @author Qinii
  * @day 2020-07-30
  *
- * 
+ *
  */
 namespace app\common\dao\store;
 
+use app\common\enum\store\SeckillActiveEnum;
 use app\common\model\store\StoreSeckillActive;
 use app\common\dao\BaseDao;
+use app\entity\data\store\SeckillActiveEntity;
 
 class StoreSeckillActiveDao extends BaseDao
 {
@@ -129,4 +131,30 @@ class StoreSeckillActiveDao extends BaseDao
             });
         return $query;
     }
+
+    /**
+     * 根据 商品ID 获取当前生效的 活动记录
+     * @param int $productId
+     * @return \app\entity\CommonEntity
+     */
+    public function getSeckillActiveEntityByProductIdInActive(int $productId): \app\entity\CommonEntity
+    {
+        $data = [];
+        try {
+            /** @var StoreSeckillActive $model */
+            $model = $this->getModel();
+            $dataRes = $model::getDB()
+                ->where('product_id', '=', $productId)
+                ->where("`start_time` <= '" . time() . "'")
+                ->where("`end_time` >= '" . time() . "'")
+                ->where("status", '=', SeckillActiveEnum::STATUS['Active']['code'])
+                ->find();
+            if (!empty($dataRes)) {
+                $data = $dataRes->toArray();
+            }
+        } catch (\Exception $e) {
+
+        }
+        return SeckillActiveEntity::newInstance($data);
+    }
 }

app/common/dao/store/order/StoreCartDao.php

@@ -178,4 +178,28 @@ class StoreCartDao extends BaseDao
         }
         return CartEntity::newInstance($storeCartData);
     }
+
+    /**
+     * @param array $cartIdList
+     * @return CartEntity[]
+     */
+    public function getCartEntityListByCartIdList(array $cartIdList): array
+    {
+        $entityList = [];
+        try {
+            /** @var StoreCart  $model */
+            $model = $this->getModel();
+            $dataListRes = $model::getDB()
+                ->whereIn('cart_id', $cartIdList)
+                ->select()
+                ->toArray();
+            if (!empty($dataListRes)) {
+                foreach ($dataListRes as $data) {
+                    $entityList[] = CartEntity::newInstance($data);
+                }
+            }
+        } catch (\Exception $e) {
+        }
+        return $entityList;
+    }
 }

app/common/dao/system/merchant/MerchantDao.php

@@ -12,8 +12,10 @@ namespace app\common\dao\system\merchant;
 
 
 use app\common\dao\BaseDao;
+use app\common\enum\merchant\MerchantEnum;
 use app\common\model\system\merchant\Merchant;
 use app\common\model\user\User;
+use app\entity\data\merchant\MerchantEntity;
 use think\db\BaseQuery;
 use think\db\exception\DataNotFoundException;
 use think\db\exception\DbException;
@@ -226,4 +228,28 @@ class MerchantDao extends BaseDao
     }
 
 
+    /**
+     * 根据 商户ID 获取 未删除的 商户信息
+     * @param int $merId
+     * @return \app\entity\CommonEntity
+     */
+    public function getMerchantEntityByMerchantId(int $merId): \app\entity\CommonEntity
+    {
+        $data = [];
+        try {
+            /** @var Merchant $model */
+            $model = $this->getModel();
+            $dataRes = $model::getDB()
+                ->where('mer_id', '=', $merId)
+                ->where('is_del', '=', MerchantEnum::IS_DEL['No']['code'])
+                ->find();
+            if (!empty($dataRes)) {
+                $data = $dataRes->toArray();
+            }
+        } catch (\Exception $e) {
+
+        }
+        return MerchantEntity::newInstance($data);
+    }
+
 }

app/common/enum/merchant/MerchantEnum.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace app\common\enum\merchant;
+
+use app\common\enum\CommonEnum;
+
+class MerchantEnum extends CommonEnum
+{
+
+}

app/common/enum/store/ProductEnum.php

@@ -27,4 +27,11 @@ class ProductEnum extends CommonEnum
         'No' => ['code' => 0, 'name' => '非正常'],
         'Yes' => ['code' => 1, 'name' => '正常']
     ];
+
+
+    // 是否秒杀
+    const SECKILL = [
+        'No' => ['code' => 0, 'name' => '否'],
+        'Yes' => ['code' => 1, 'name' => '是']
+    ];
 }

app/common/enum/store/SeckillActiveEnum.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace app\common\enum\store;
+
+use app\common\enum\CommonEnum;
+
+class SeckillActiveEnum extends CommonEnum
+{
+    const STATUS = [
+        'Active' => ['code' => 0, 'name' => '进行中'],
+        'Finish' => ['code' => 1, 'name' => '已结束']
+    ];
+}

app/common/repositories/store/StoreSeckillActiveRepository.php

@@ -11,8 +11,7 @@ namespace app\common\repositories\store;
 
 use app\common\dao\store\StoreSeckillActiveDao;
 use app\common\repositories\BaseRepository;
-use FormBuilder\Factory\Elm;
-use think\facade\Route;
+use app\entity\data\store\SeckillActiveEntity;
 
 class StoreSeckillActiveRepository extends BaseRepository
 {
@@ -30,4 +29,16 @@ class StoreSeckillActiveRepository extends BaseRepository
     {
         $this->dao = $dao;
     }
+
+    /**
+     * 根据 商品ID 获取当前生效的 活动记录
+     * @param int $productId
+     * @return SeckillActiveEntity
+     */
+    public function getSeckillActiveEntityByProductIdInActive(int $productId): SeckillActiveEntity
+    {
+        /** @var SeckillActiveEntity $seckillActiveEntity */
+        $seckillActiveEntity = $this->dao->getSeckillActiveEntityByProductIdInActive($productId);
+        return $seckillActiveEntity;
+    }
 }

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

@@ -133,4 +133,14 @@ class StoreCartRepository extends BaseRepository
         $cartEntity = $this->dao->getCartEntityByCartId($cartId);
         return $cartEntity;
     }
+
+    /**
+     * 根据 购物车 ID 获取购物车实体
+     * @param array $cartIdList
+     * @return CartEntity[]
+     */
+    public function getCartEntityListByCartIdList(array $cartIdList): array
+    {
+        return $this->dao->getCartEntityListByCartIdList($cartIdList);
+    }
 }

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

@@ -13,6 +13,7 @@ namespace app\common\repositories\store\order;
 
 use app\common\dao\store\order\StoreOrderDao;
 use app\common\enum\store\CartEnum;
+use app\common\enum\store\ProductEnum;
 use app\common\model\store\order\StoreGroupOrder;
 use app\common\model\store\order\StoreOrder;
 use app\common\model\store\order\StoreRefundOrder;
@@ -10622,10 +10623,10 @@ class StoreOrderRepository extends BaseRepository
         return isset($group_rate[$user_group]) ? round($group_rate[$user_group] / 100, 2) : 0.00;
     }
 
-    public function createOrderNew(StoreOrderCreateRequestEntity $storeOrderCreateRequestEntity, UserEntity $userEntity, CartEntity $cartEntity, AddressEntity $addressEntity, ShareEntity $shareEntity)
+    public function createOrderNew(StoreOrderCreateRequestEntity $storeOrderCreateRequestEntity, UserEntity $userEntity, array $cartEntityList, AddressEntity $addressEntity, ShareEntity $shareEntity)
     {
 
-        $order = $this->cartIdByOrderInfoNew($userEntity->getUid(), [$cartEntity->getCartId()], $addressEntity->getAddressId(), false, 0, 0, 0);
+        $order = $this->cartIdByOrderInfoNew($userEntity->getUid(), [$cartEntityList->getCartId()], $addressEntity->getAddressId(), false, 0, 0, 0);
         return $order;
         $isTest = $userEntity->getTestUser();
 
@@ -11533,53 +11534,87 @@ class StoreOrderRepository extends BaseRepository
     }
 
     /**
-     * @param $uid
-     * @param array $cartId
-     * @param int|null $addressId
-     * @param $confirm
-     * @param $psType
-     * @param $payType
-     * @param $youhui_price_key
-     * @param CartEntity $cartEntity
-     * @return mixed
-     * @throws DataNotFoundException
-     * @throws DbException
-     * @throws ModelNotFoundException
+     * @param CartEntity[] $cartEntityList
+     * @return array
      */
-    public function cartIdByOrderInfoNew(CartEntity $cartEntity)
+    public function cartIdByOrderInfoNew(array $cartEntityList)
     {
-        // 获取购物车商品信息
+        // 商户
+        /** @var MerchantRepository $merchantRepository */
+        $merchantRepository = app()->make(MerchantRepository::class);
+        // 商品
         /** @var ProductRepository $productRepository */
         $productRepository = app()->make(ProductRepository::class);
-        $productEntity = $productRepository->getProductEntityByProductId($cartEntity->getProductId());
-        if (empty($productEntity->getProductId())) {
-            throw new ValidateException('未查询到商品信息');
-        }
-
-        // 获取购物车商品属性信息
+        // 商品属性
         /** @var ProductAttrValueRepository $productAttrValueRepository */
         $productAttrValueRepository = app()->make(ProductAttrValueRepository::class);
-        $productAttrValueEntity = $productAttrValueRepository->getProductAttrValueEntityByUnique($cartEntity->getProductAttrUnique());
-        if (empty($productAttrValueEntity->getProductId())) {
-            throw new ValidateException('未查询到商品属性信息');
-        }
+        // 目前还未搞清这个表的意义
+        /** @var SeckillRepository $seckillRepository */
+        $seckillRepository = app()->make(SeckillRepository::class);
+        // 商户设置秒杀商品关联表
+        /** @var StoreSeckillActiveRepository $storeSeckillActiveRepository */
+        $storeSeckillActiveRepository = app()->make(StoreSeckillActiveRepository::class);
 
-        // 判断订单是否已失效
-        if ($cartEntity->getIsFail() == CartEnum::IS_FAIL['Yes']['code']) {
-            throw new ValidateException($productEntity->getStoreName() . ' 已失效');
-        }
-        // 如果商品类型是 普通商品 ，则判断库存是否充足
-        if ($cartEntity->getProductType() == CartEnum::PRODUCT_TYPE['Ordinary']['code']) {
-            if ($productAttrValueEntity->getStock() < $cartEntity->getCartNum()) {
-                throw new ValidateException($productEntity->getStoreName() . ' 库存不足--' . $cartEntity->getCartNum());
+        foreach ($cartEntityList as $cartEntity) {
+            // 验证商户
+            $merchantEntity = $merchantRepository->getMerchantEntityByMerchantId($cartEntity->getMerId());
+            if (empty($merchantEntity->getMerId())) {
+                throw new ValidateException('未查询到商户信息');
             }
-        } else {
-            // 如果不是普通商品 则是否秒杀产品，如果是秒杀产品则判断是否超卖
-            if (!$this->getDayPayCount($cartEntity->getUid(), $cartEntity->getProductId()) || !$this->getPayCount($cartEntity->getUid(), $cartEntity->getProductId())) {
-                throw new ValidateException($productEntity->getStoreName() . ' 已超出购买限制');
+
+            // 获取购物车商品信息
+            $productEntity = $productRepository->getProductEntityByProductId($cartEntity->getProductId());
+            if (empty($productEntity->getProductId())) {
+                throw new ValidateException('未查询到商品信息');
+            }
+
+            // 获取购物车商品属性信息
+            $productAttrValueEntity = $productAttrValueRepository->getProductAttrValueEntityByUnique($cartEntity->getProductAttrUnique());
+            if (empty($productAttrValueEntity->getProductId())) {
+                throw new ValidateException('未查询到商品属性信息');
             }
+
+            // 判断订单是否已失效
+            if ($cartEntity->getIsFail() == CartEnum::IS_FAIL['Yes']['code']) {
+                throw new ValidateException($productEntity->getStoreName() . ' 已失效');
+            }
+
+            // 如果商品类型是 普通商品 ，则判断库存是否充足
+            if ($cartEntity->getProductType() == CartEnum::PRODUCT_TYPE['Ordinary']['code']) {
+                if ($productAttrValueEntity->getStock() < $cartEntity->getCartNum()) {
+                    throw new ValidateException($productEntity->getStoreName() . ' 库存不足--' . $cartEntity->getCartNum());
+                }
+            } else {
+                // 如果是秒杀商品 应该首先判断是否还在活动期间内（rrx_store_seckill_active 商户设置秒杀商品关联表）
+                $seckillActiveEntity = $storeSeckillActiveRepository->getSeckillActiveEntityByProductIdInActive($cartEntity->getProductId());
+                if (empty($seckillActiveEntity->getSeckillActiveId())) {
+                    throw new ValidateException($productEntity->getStoreName() . ' 秒杀活动已失效');
+                }
+
+                // 如果不是普通商品 则是否秒杀产品，如果是秒杀产品则判断是否超卖
+                if (!$this->getDayPayCount($cartEntity->getUid(), $cartEntity->getProductId()) || !$this->getPayCount($cartEntity->getUid(), $cartEntity->getProductId())) {
+                    throw new ValidateException($productEntity->getStoreName() . ' 已超出购买限制');
+                }
+            }
+
+            // 计算养老金
+            $yanglaojin = $productRepository->yanglaojin($cartEntity->getProductId());
+
+            if ($productEntity->getSeckill() == ProductEnum::SECKILL['Yes']['code'] && !is_null($productEntity->getDcPrice()) && $productEntity->getDcPrice() > 0.00) {
+                // 获取 在活动期间内的 秒杀活动记录
+                $seckillEntity = $seckillRepository->getSeckillEntityByProductId($cartEntity->getProductId());
+                if (!empty($seckillEntity->getId())) {
+                    // 把 商品属性的 价格 改成 大仓会员价
+                    $productAttrValueEntity->setPrice($productEntity->getDcPrice());
+                }
+            }
+
+            // TODO 写到这了，对应 StoreCartRepository.php 的 70 的else 内
+
         }
 
+
+
         // 计算 邮费
         $postage_price = 0.00;
         $product_price = [];
@@ -11591,9 +11626,7 @@ class StoreOrderRepository extends BaseRepository
         // ProductType => 0.普通商品 1.秒杀商品
         $productEntity->setProductType($productEntity->getType());
 
-        /** @var SeckillRepository $seckillRepository */
-        $seckillRepository = app()->make(SeckillRepository ::class);
-        $seckillEntity = $seckillRepository->getSeckillEntityByProductId($cartEntity->getProductId());
+        $seckillEntity = $seckillRepository->getSeckillEntityByProductId($cartEntityList->getProductId());
         // ??? 暂时不理解这一步
         if (!empty($seckillEntity->getId())) {
             // 把 商品属性的 价格 改成 大仓会员价
@@ -11601,15 +11634,15 @@ class StoreOrderRepository extends BaseRepository
         }
 
         // 计算 订单价格 总价 单价 （目前一笔订单只能有一个购物车 购物车内 只能有一件商品）
-        $total_price = $price = bcmul($cartEntity->getCartNum(), $productAttrValueEntity->getPrice(), 2);
-        $total_num = $cartEntity->getCartNum();
+        $total_price = $price = bcmul($cartEntityList->getCartNum(), $productAttrValueEntity->getPrice(), 2);
+        $total_num = $cartEntityList->getCartNum();
 
         // 如果是 普通商品 product_type 类型 0=普通产品
-        if ($cartEntity->getProductType() == CartEnum::PRODUCT_TYPE['Ordinary']['code']) {
-            $valid_total_price = $product_price[$cartEntity->getProductId()] = $price;
+        if ($cartEntityList->getProductType() == CartEnum::PRODUCT_TYPE['Ordinary']['code']) {
+            $valid_total_price = $product_price[$cartEntityList->getProductId()] = $price;
         }
 
-        $product_cart[$cartEntity->getProductId()] = [$cartEntity->getCartId()];
+        $product_cart[$cartEntityList->getProductId()] = [$cartEntityList->getCartId()];
 
         // unset($cartInfo['list'][$_k]['product']['temp']);
         // $cartInfo['list'][$_k] = $cart;

app/common/repositories/system/merchant/MerchantRepository.php

@@ -24,6 +24,7 @@ use app\common\repositories\user\UserVisitRepository;
 use app\common\repositories\wechat\RoutineQrcodeRepository;
 use app\controller\admin\system\merchant\MerchantIntention;
 use app\controller\merchant\gong\Goods;
+use app\entity\data\merchant\MerchantEntity;
 use app\traits\HaikeApiRequest;
 use crmeb\services\QrcodeService;
 use crmeb\services\UploadService;
@@ -1008,6 +1009,16 @@ class MerchantRepository extends BaseRepository
 
     }
 
-
+    /**
+     * 根据 商户ID 获取 未删除的 商户信息
+     * @param int $merchantId
+     * @return MerchantEntity
+     */
+    public function getMerchantEntityByMerchantId(int $merchantId): MerchantEntity
+    {
+        /** @var MerchantEntity $entity */
+        $entity = $this->dao->getMerchantEntityByMerchantId($merchantId);
+        return $entity;
+    }
 
 }

app/controller/api/store/order/StoreOrder.php

@@ -42,7 +42,7 @@ use think\facade\Request;
  * @author xaboy
  * @day 2020/6/10
  */
-class StoreOrder extends BaseController
+class StoreOrder
 {
     /**
      * @var StoreOrderRepository
@@ -58,7 +58,7 @@ class StoreOrder extends BaseController
      */
     public function __construct(App $app, StoreOrderRepository $repository)
     {
-        parent::__construct($app);
+        // parent::__construct($app);
         $this->repository = $repository;
 
         $this->source = request()->header('source');
@@ -697,6 +697,8 @@ class StoreOrder extends BaseController
     }
 
     /**
+     * 理解注释
+     * store_cart 购物车表，每个人购物车里 有多件商品，每个商品在这张表里 都是一条记录
      * @param StoreOrderCreateValidate $storeOrderCreateValidate
      * @return false|string|\think\response\Json
      * @throws DataNotFoundException
@@ -721,11 +723,13 @@ class StoreOrder extends BaseController
 
         // 2、加锁，他之前加的锁好像在锁狗屎，毛线都没锁住, 而且为什么要锁用户
         // 增加锁，防止同一用户重读点击
-        // $redisHandler = Cache::store('redis')->handler();
-        // $isSet = $redisHandler->set('createOrder' . $uid . '-' . $storeOrderCreateRequestEntity->getCartId(), 1, ['nx', 'ex' => 30]);
-        // if ($isSet) {
-        //     return app('json')->fail('请勿重复下单');
-        // }
+        $redisHandler = Cache::store('redis')->handler();
+        $cartIdList = $storeOrderCreateRequestEntity->getCartIdList();
+        sort($cartIdList);
+        $isSet = $redisHandler->set('createOrder' . $uid . '-' . implode('-', $cartIdList), 1, ['nx', 'ex' => 30]);
+        if (!$isSet) {
+            return app('json')->fail('请勿重复下单');
+        }
 
         /** @var UserRepository $userRepository */
         $userRepository = app()->make(UserRepository::class);
@@ -737,18 +741,20 @@ class StoreOrder extends BaseController
         // 目前购物车只能添加一件商品，据了解之前 写的购物车，添加多件商品组合支付时计算的 金额和 VR 积分之类的会有问题
         /** @var StoreCartRepository $storeCartRepository */
         $storeCartRepository = app()->make(StoreCartRepository::class);
-        $cartEntity = $storeCartRepository->getCartEntityByCartId($storeOrderCreateRequestEntity->getCartId());
-        if (empty($cartEntity->getCartId())) {
+        $cartEntityList = $storeCartRepository->getCartEntityListByCartIdList($storeOrderCreateRequestEntity->getCartIdList());
+        if (empty($cartEntityList) || count($storeOrderCreateRequestEntity->getCartIdList()) != count($cartEntityList)) {
             return app('json')->fail('获取购物车内容失败');
         }
         // 确认购物车内 微唯宝 的商品 是否满足发货
-        /** @var ProductAttrValueRepository $productAttrValueRepository */
-        $productAttrValueRepository = app()->make(ProductAttrValueRepository::class);
-        // 检查库存 查看 此商品已下架 此商品规格无货 此商品不支持该地区
-        // （按照代码中所写的逻辑来推理：从微唯宝拉取过来，从而上架到商品表的商品，都有SPUId，所以去走微唯宝提供的接口验证，而会员专区和商贸区的商品可能是商户自己加的，没有SPUId，所以也就不用走微唯宝的验证）
-        $checkGong = $productAttrValueRepository->checkGong($cartEntity->getProductId(), $cartEntity->getProductAttrUnique(), $cartEntity->getCartNum(), $uid, $storeOrderCreateRequestEntity->getAddressId());
-        if (isset($checkGong['code']) && $checkGong['code'] == -1) {
-            return app('json')->fail($checkGong['message']);
+        foreach ($cartEntityList as $cartEntity) {
+            /** @var ProductAttrValueRepository $productAttrValueRepository */
+            $productAttrValueRepository = app()->make(ProductAttrValueRepository::class);
+            // 检查库存 查看 此商品已下架 此商品规格无货 此商品不支持该地区
+            // （按照代码中所写的逻辑来推理：从微唯宝拉取过来，从而上架到商品表的商品，都有SPUId，所以去走微唯宝提供的接口验证，而会员专区和商贸区的商品可能是商户自己加的，没有SPUId，所以也就不用走微唯宝的验证）
+            $checkGong = $productAttrValueRepository->checkGong($cartEntity->getProductId(), $cartEntity->getProductAttrUnique(), $cartEntity->getCartNum(), $uid, $storeOrderCreateRequestEntity->getAddressId());
+            if (isset($checkGong['code']) && $checkGong['code'] == -1) {
+                return app('json')->fail($checkGong['message']);
+            }
         }
 
         // 获取 用户收货地址
@@ -768,7 +774,9 @@ class StoreOrder extends BaseController
         $shareEntity = $shareRepository->getShareEntityByShareId($storeOrderCreateRequestEntity->getShareId());
 
 
-        $result = $this->repository->createOrderNew($storeOrderCreateRequestEntity, $userEntity, $cartEntity, $addressEntity, $shareEntity);
+
+
+        $result = $this->repository->createOrderNew($storeOrderCreateRequestEntity, $userEntity, $cartEntityList, $addressEntity, $shareEntity);
         
         
         return app('json')->success('aaa', $result);

app/entity/data/store/ProductEntity.php

@@ -158,7 +158,7 @@ class ProductEntity extends DataEntity
     }
 
     /**
-     * @return null
+     * @return mixed
      */
     public function getBrandId()
     {
@@ -166,7 +166,7 @@ class ProductEntity extends DataEntity
     }
 
     /**
-     * @param null $brandId
+     * @param mixed $brandId
      * @return ProductEntity
      */
     public function setBrandId($brandId)
@@ -264,7 +264,7 @@ class ProductEntity extends DataEntity
     }
 
     /**
-     * @return null
+     * @return mixed
      */
     public function getPrice()
     {
@@ -272,7 +272,7 @@ class ProductEntity extends DataEntity
     }
 
     /**
-     * @param null $price
+     * @param mixed $price
      * @return ProductEntity
      */
     public function setPrice($price)
@@ -282,7 +282,7 @@ class ProductEntity extends DataEntity
     }
 
     /**
-     * @return null
+     * @return mixed
      */
     public function getCost()
     {
@@ -290,7 +290,7 @@ class ProductEntity extends DataEntity
     }
 
     /**
-     * @param null $cost
+     * @param mixed $cost
      * @return ProductEntity
      */
     public function setCost($cost)
@@ -300,7 +300,7 @@ class ProductEntity extends DataEntity
     }
 
     /**
-     * @return null
+     * @return mixed
      */
     public function getOtPrice()
     {
@@ -308,7 +308,7 @@ class ProductEntity extends DataEntity
     }
 
     /**
-     * @param null $otPrice
+     * @param mixed $otPrice
      * @return ProductEntity
      */
     public function setOtPrice($otPrice)
@@ -472,7 +472,7 @@ class ProductEntity extends DataEntity
     }
 
     /**
-     * @return null
+     * @return mixed
      */
     public function getRefusal()
     {
@@ -480,7 +480,7 @@ class ProductEntity extends DataEntity
     }
 
     /**
-     * @param null $refusal
+     * @param mixed $refusal
      * @return ProductEntity
      */
     public function setRefusal($refusal)
@@ -523,7 +523,7 @@ class ProductEntity extends DataEntity
     }
 
     /**
-     * @return null
+     * @return mixed
      */
     public function getGiveCouponIds()
     {
@@ -531,7 +531,7 @@ class ProductEntity extends DataEntity
     }
 
     /**
-     * @param null $giveCouponIds
+     * @param mixed $giveCouponIds
      * @return ProductEntity
      */
     public function setGiveCouponIds($giveCouponIds)
@@ -552,7 +552,7 @@ class ProductEntity extends DataEntity
     }
 
     /**
-     * @return null
+     * @return mixed
      */
     public function getCreateTime()
     {
@@ -560,7 +560,7 @@ class ProductEntity extends DataEntity
     }
 
     /**
-     * @param null $createTime
+     * @param mixed $createTime
      * @return ProductEntity
      */
     public function setCreateTime($createTime)
@@ -570,7 +570,7 @@ class ProductEntity extends DataEntity
     }
 
     /**
-     * @return null
+     * @return mixed
      */
     public function getCareCount()
     {
@@ -578,7 +578,7 @@ class ProductEntity extends DataEntity
     }
 
     /**
-     * @param null $careCount
+     * @param mixed $careCount
      * @return ProductEntity
      */
     public function setCareCount($careCount)
@@ -632,7 +632,7 @@ class ProductEntity extends DataEntity
     }
 
     /**
-     * @return null
+     * @return mixed
      */
     public function getPension()
     {
@@ -640,7 +640,7 @@ class ProductEntity extends DataEntity
     }
 
     /**
-     * @param null $pension
+     * @param mixed $pension
      * @return ProductEntity
      */
     public function setPension($pension)
@@ -672,7 +672,7 @@ class ProductEntity extends DataEntity
     }
 
     /**
-     * @return null
+     * @return mixed
      */
     public function getDcPrice()
     {
@@ -680,7 +680,7 @@ class ProductEntity extends DataEntity
     }
 
     /**
-     * @param null $dcPrice
+     * @param mixed $dcPrice
      * @return ProductEntity
      */
     public function setDcPrice($dcPrice)
@@ -712,7 +712,7 @@ class ProductEntity extends DataEntity
     }
 
     /**
-     * @return null
+     * @return mixed
      */
     public function getSpuId()
     {
@@ -720,7 +720,7 @@ class ProductEntity extends DataEntity
     }
 
     /**
-     * @param null $spuId
+     * @param mixed $spuId
      * @return ProductEntity
      */
     public function setSpuId($spuId)
@@ -730,7 +730,7 @@ class ProductEntity extends DataEntity
     }
 
     /**
-     * @return null
+     * @return mixed
      */
     public function getCostPrice()
     {
@@ -738,7 +738,7 @@ class ProductEntity extends DataEntity
     }
 
     /**
-     * @param null $costPrice
+     * @param mixed $costPrice
      * @return ProductEntity
      */
     public function setCostPrice($costPrice)
@@ -748,7 +748,7 @@ class ProductEntity extends DataEntity
     }
 
     /**
-     * @return null
+     * @return mixed
      */
     public function getGongSkuId()
     {
@@ -756,7 +756,7 @@ class ProductEntity extends DataEntity
     }
 
     /**
-     * @param null $gongSkuId
+     * @param mixed $gongSkuId
      * @return ProductEntity
      */
     public function setGongSkuId($gongSkuId)
@@ -766,7 +766,7 @@ class ProductEntity extends DataEntity
     }
 
     /**
-     * @return null
+     * @return mixed
      */
     public function getPlateMerProfit()
     {
@@ -774,7 +774,7 @@ class ProductEntity extends DataEntity
     }
 
     /**
-     * @param null $plateMerProfit
+     * @param mixed $plateMerProfit
      * @return ProductEntity
      */
     public function setPlateMerProfit($plateMerProfit)
@@ -784,7 +784,7 @@ class ProductEntity extends DataEntity
     }
 
     /**
-     * @return null
+     * @return mixed
      */
     public function getYanglaojinScale()
     {
@@ -792,7 +792,7 @@ class ProductEntity extends DataEntity
     }
 
     /**
-     * @param null $yanglaojinScale
+     * @param mixed $yanglaojinScale
      * @return ProductEntity
      */
     public function setYanglaojinScale($yanglaojinScale)
@@ -835,7 +835,7 @@ class ProductEntity extends DataEntity
     }
 
     /**
-     * @return null
+     * @return mixed
      */
     public function getArgument()
     {
@@ -843,7 +843,7 @@ class ProductEntity extends DataEntity
     }
 
     /**
-     * @param null $argument
+     * @param mixed $argument
      * @return ProductEntity
      */
     public function setArgument($argument)

app/entity/data/store/SeckillActiveEntity.php

@@ -0,0 +1,199 @@
+<?php
+
+namespace app\entity\data\store;
+
+use app\entity\data\DataEntity;
+
+class SeckillActiveEntity extends DataEntity
+{
+    public $seckillActiveId = 0;  // 活动ID
+    public $startDay = null;  // 开始日期
+    public $endDay = null;  // 结束日期
+    public $startTime = 0;  // 开始时间
+    public $endTime = 0;  // 结束时间
+    public $merId = 0;  // 商户ID
+    public $productId = 0;  // 商品ID
+    public $oncePayCount = 0;  // 每人每日购买数量限制
+    public $allPayCount = 0;  // 总购买数量限制
+    public $status = 0;  // 活动状态（0: 进行中, -1: 过时）
+
+    /**
+     * @return int
+     */
+    public function getSeckillActiveId(): int
+    {
+        return $this->seckillActiveId;
+    }
+
+    /**
+     * @param int $seckillActiveId
+     * @return SeckillActiveEntity
+     */
+    public function setSeckillActiveId(int $seckillActiveId): SeckillActiveEntity
+    {
+        $this->seckillActiveId = $seckillActiveId;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getStartDay()
+    {
+        return $this->startDay;
+    }
+
+    /**
+     * @param mixed $startDay
+     * @return SeckillActiveEntity
+     */
+    public function setStartDay($startDay)
+    {
+        $this->startDay = $startDay;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getEndDay()
+    {
+        return $this->endDay;
+    }
+
+    /**
+     * @param mixed $endDay
+     * @return SeckillActiveEntity
+     */
+    public function setEndDay($endDay)
+    {
+        $this->endDay = $endDay;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getStartTime(): int
+    {
+        return $this->startTime;
+    }
+
+    /**
+     * @param int $startTime
+     * @return SeckillActiveEntity
+     */
+    public function setStartTime(int $startTime): SeckillActiveEntity
+    {
+        $this->startTime = $startTime;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getEndTime(): int
+    {
+        return $this->endTime;
+    }
+
+    /**
+     * @param int $endTime
+     * @return SeckillActiveEntity
+     */
+    public function setEndTime(int $endTime): SeckillActiveEntity
+    {
+        $this->endTime = $endTime;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getMerId(): int
+    {
+        return $this->merId;
+    }
+
+    /**
+     * @param int $merId
+     * @return SeckillActiveEntity
+     */
+    public function setMerId(int $merId): SeckillActiveEntity
+    {
+        $this->merId = $merId;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getProductId(): int
+    {
+        return $this->productId;
+    }
+
+    /**
+     * @param int $productId
+     * @return SeckillActiveEntity
+     */
+    public function setProductId(int $productId): SeckillActiveEntity
+    {
+        $this->productId = $productId;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getOncePayCount(): int
+    {
+        return $this->oncePayCount;
+    }
+
+    /**
+     * @param int $oncePayCount
+     * @return SeckillActiveEntity
+     */
+    public function setOncePayCount(int $oncePayCount): SeckillActiveEntity
+    {
+        $this->oncePayCount = $oncePayCount;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getAllPayCount(): int
+    {
+        return $this->allPayCount;
+    }
+
+    /**
+     * @param int $allPayCount
+     * @return SeckillActiveEntity
+     */
+    public function setAllPayCount(int $allPayCount): SeckillActiveEntity
+    {
+        $this->allPayCount = $allPayCount;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getStatus(): int
+    {
+        return $this->status;
+    }
+
+    /**
+     * @param int $status
+     * @return SeckillActiveEntity
+     */
+    public function setStatus(int $status): SeckillActiveEntity
+    {
+        $this->status = $status;
+        return $this;
+    }
+}

app/entity/request/api/store/order/StoreOrderCreateRequestEntity.php

@@ -7,6 +7,7 @@ use app\entity\request\RequestCommonEntity;
 class StoreOrderCreateRequestEntity extends RequestCommonEntity
 {
     public $cartId = 0;
+    public $cartIdList = [];
     public $addressId = 0;
     public $payType = 0;
     public $mark = '';
@@ -21,10 +22,24 @@ class StoreOrderCreateRequestEntity extends RequestCommonEntity
 
     public function setCartId(int $cartId): StoreOrderCreateRequestEntity
     {
+        if(empty($this->getCartIdList())) {
+            $this->setCartIdList([$cartId]);
+        }
         $this->cartId = $cartId;
         return $this;
     }
 
+    public function getCartIdList(): array
+    {
+        return $this->cartIdList;
+    }
+
+    public function setCartIdList(array $cartIdList): StoreOrderCreateRequestEntity
+    {
+        $this->cartIdList = $cartIdList;
+        return $this;
+    }
+
     public function getAddressId(): int
     {
         return $this->addressId;

app/validate/api/store/order/StoreOrderCreateValidate.php

@@ -12,6 +12,7 @@ class StoreOrderCreateValidate extends CommonValidate
 
     protected $rule = [
         'cart_id' => 'require|integer',
+        'cart_id_list' => 'array',
         'fzone_paytype' => 'require',
         'address_id' => 'require|integer|gt:0',
         'pay_type' => 'require|integer',
@@ -22,6 +23,7 @@ class StoreOrderCreateValidate extends CommonValidate
     protected $message = [
         'cart_id.require' => '缺少购物车ID参数!',
         'cart_id.integer' => '购物车ID必须是整数！',
+        'cart_id_list.array' => '购物车ID列表必须是一个数组！',
         'fzone_paytype.require' => '支付方式不能为空！',
         // 'fzone_paytype.string' => '支付方式必须是字符串！',
         'address_id.require' => '地址ID不能为空！',