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

app/common/dao/product/SeckillDao.php

@@ -4,18 +4,18 @@ namespace app\common\dao\product;
 
 use app\common\dao\BaseDao;
 use app\common\enum\product\SeckillEnum;
-use app\common\model\product\SeckillModel;
+use app\common\model\product\ProductSeckillModel;
 use app\entity\CommonEntity;
-use app\entity\data\product\SeckillEntity;
+use app\entity\data\product\ProductSeckillEntity;
 
-class SeckillDao extends BaseDao
+class ProductSeckillDao extends BaseDao
 {
     /**
      * @return string
      */
     protected function getModel(): string
     {
-        return SeckillModel::class;
+        return ProductSeckillModel::class;
     }
 
     /**
@@ -23,11 +23,11 @@ class SeckillDao extends BaseDao
      * @param int $productId
      * @return CommonEntity
      */
-    public function getSeckillEntityByProductId(int $productId): CommonEntity
+    public function getProductSeckillEntityByProductId(int $productId): CommonEntity
     {
         $data = [];
         try {
-            /** @var SeckillModel $model */
+            /** @var ProductSeckillModel $model */
             $model = $this->getModel();
             $dataRes = $model::getDB()
                 ->where('product_id', '=', $productId)
@@ -40,6 +40,6 @@ class SeckillDao extends BaseDao
         } catch (\Exception $e) {
 
         }
-        return SeckillEntity::newInstance($data);
+        return ProductSeckillEntity::newInstance($data);
     }
 }

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

@@ -12,6 +12,7 @@ namespace app\common\dao\store\order;
 
 
 use app\common\dao\BaseDao;
+use app\common\enum\store\CartEnum;
 use app\common\model\BaseModel;
 use app\common\model\store\order\StoreCart;
 use app\entity\CommonEntity;
@@ -202,4 +203,19 @@ class StoreCartDao extends BaseDao
         }
         return $entityList;
     }
+
+    /**
+     * @param array $cartIdList
+     * @param int $isPay
+     * @return int
+     * @throws DbException
+     */
+    public function updateIsPayByCartIdList(array $cartIdList, int $isPay = CartEnum::IS_PAY['Yes']['code']): int
+    {
+        /** @var StoreCart $model */
+        $model = $this->getModel();
+        return $model::getDB()
+            ->whereIn('cart_id', $cartIdList)
+            ->update(['is_pay' => $isPay]);
+    }
 }

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

@@ -5,16 +5,18 @@
  * @author xaboy
  * @day 2020/6/8
  *
- * 
+ *
  */
 
 namespace app\common\dao\store\order;
 
 
 use app\common\dao\BaseDao;
+use app\common\enum\store\StoreGroupOrderEnum;
 use app\common\model\store\order\StoreGroupOrder;
 use app\entity\CommonEntity;
 use app\entity\data\store\StoreGroupOrderEntity;
+use think\db\exception\DbException;
 
 /**
  * Class StoreGroupOrderDao
@@ -45,7 +47,7 @@ class StoreGroupOrderDao extends BaseDao
     {
         return StoreGroupOrder::when($uid, function ($query, $uid) {
             $query->where('uid', $uid);
-        })->where('is_del', 0)->where('test_order',0)->where('paid', 0)->count();
+        })->where('is_del', 0)->where('test_order', 0)->where('paid', 0)->count();
     }
 
     /**
@@ -116,4 +118,21 @@ class StoreGroupOrderDao extends BaseDao
         }
         return $entityList;
     }
+
+    /**
+     * @param $groupOrderId
+     * @return int
+     * @throws DbException
+     */
+    public function paySuccess($groupOrderId): int
+    {
+        /** @var StoreGroupOrder $model */
+        $model = $this->getModel();
+        return $model::getDB()
+            ->where('group_order_id', '=', $groupOrderId)
+            ->update([
+                'paid' => StoreGroupOrderEnum::PAID['YES']['code'],
+                'pay_time' => date('Y-m-d H:i:s')
+            ]);
+    }
 }

app/common/dao/store/product/ProductAttrValueDao.php

@@ -9,7 +9,8 @@ namespace app\common\dao\store\product;
 
 use app\common\dao\BaseDao;
 use app\common\model\store\product\ProductAttrValue as model;
-use app\entity\data\store\ProductAttrValueEntity;
+use app\entity\CommonEntity;
+use app\entity\data\store\StoreProductAttrValueEntity;
 use think\facade\Db;
 
 /**
@@ -259,23 +260,27 @@ class ProductAttrValueDao extends BaseDao
     }
 
     /**
-     * @param string $unique
-     * @return \app\entity\CommonEntity
+     * @param array $uniqueList
+     * @return CommonEntity[]
      */
-    public function getProductAttrValueEntityByUnique(string $unique): \app\entity\CommonEntity
+    public function getStoreProductAttrValueEntityListByUniqueList(array $uniqueList): array
     {
-        $data = [];
+        $entityList = [];
         try {
             /** @var model $model */
             $model = $this->getModel();
-            $dataRes = $model::getDb()
-                ->where('unique', '=', $unique)
-                ->find();
+            $dataRes = $model::getDB()
+                ->whereIn('unique', $uniqueList)
+                ->select()
+                ->toArray();
             if (!empty($dataRes)) {
-                $data = $dataRes->toArray();
+                $entityList = array_map(function ($data) {
+                    return StoreProductAttrValueEntity::newInstance($data);
+                }, $dataRes);
             }
         } catch (\Exception $e) {
+
         }
-        return ProductAttrValueEntity::newInstance($data);
+        return $entityList;
     }
 }

app/common/dao/store/product/ProductDao.php

@@ -11,7 +11,8 @@ use app\common\dao\BaseDao;
 use app\common\enum\store\ProductEnum;
 use app\common\model\store\product\Product as model;
 use app\common\repositories\store\StoreCategoryRepository;
-use app\entity\data\store\ProductEntity;
+use app\entity\CommonEntity;
+use app\entity\data\store\StoreProductEntity;
 use think\Exception;
 use think\facade\Db;
 
@@ -439,28 +440,32 @@ class ProductDao extends BaseDao
     }
 
     /**
-     * @param int $productId
-     * @return \app\entity\CommonEntity
+     * @param array $idList
+     * @return CommonEntity[]
      */
-    public function getProductEntityByProductId(int $productId): \app\entity\CommonEntity
+    public function getUserSignGongxianEntityListByIdList(array $idList): array
     {
-        $productData = [];
+        $entityList = [];
         try {
             /** @var model $model */
             $model = $this->getModel();
-            $productDataRes = $model::getDb()
-                ->where('product_id', '=', $productId)
+            $dataRes = $model::getDB()
+                ->whereIn('product_id', $idList)
                 ->where('is_del', '=', ProductEnum::IS_DEL['No']['code'])
                 ->where('status', '=', ProductEnum::STATUS['Approved']['code'])
                 ->where('is_used', '=', ProductEnum::IS_USED['Yes']['code'])
                 ->where('is_show', '=', ProductEnum::IS_SHOW['Yes']['code'])
                 ->where('mer_status', '=', ProductEnum::MER_STATUS['Yes']['code'])
-                ->find();
-            if (!empty($productDataRes)) {
-                $productData = $productDataRes->toArray();
+                ->select()
+                ->toArray();
+            if (!empty($dataRes)) {
+                $entityList = array_map(function ($data) {
+                    return StoreProductEntity::newInstance($data);
+                }, $dataRes);
             }
         } catch (\Exception $e) {
+
         }
-        return ProductEntity::newInstance($productData);
+        return $entityList;
     }
 }

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

@@ -15,6 +15,7 @@ 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\CommonEntity;
 use app\entity\data\merchant\MerchantEntity;
 use think\db\BaseQuery;
 use think\db\exception\DataNotFoundException;
@@ -252,4 +253,29 @@ class MerchantDao extends BaseDao
         return MerchantEntity::newInstance($data);
     }
 
+    /**
+     * @param array $idList
+     * @return CommonEntity[]
+     */
+    public function getMerchantEntityListByMerchantIdList(array $idList): array
+    {
+        $entityList = [];
+        try {
+            /** @var Merchant $model */
+            $model = $this->getModel();
+            $dataRes = $model::getDB()
+                ->whereIn('mer_id', $idList)
+                ->where('is_del', '=', MerchantEnum::IS_DEL['No']['code'])
+                ->select()
+                ->toArray();
+            if (!empty($dataRes)) {
+                $entityList = array_map(function ($data) {
+                    return MerchantEntity::newInstance($data);
+                }, $dataRes);
+            }
+        } catch (\Exception $e) {
+
+        }
+        return $entityList;
+    }
 }

app/common/dao/user/UserPvLogDao.php

@@ -3,12 +3,87 @@
 namespace app\common\dao\user;
 
 use app\common\dao\BaseDao;
+use app\common\enum\user\UserPvLogEnum;
+use app\common\model\BaseModel;
 use app\common\model\user\UserPvLog;
+use app\entity\CommonEntity;
+use app\entity\data\user\UserPvLogEntity;
+use think\db\exception\DataNotFoundException;
+use think\db\exception\DbException;
+use think\db\exception\ModelNotFoundException;
 
 class UserPvLogDao extends BaseDao
 {
+    /**
+     * @return BaseModel
+     */
     protected function getModel(): string
     {
         return UserPvLog::class;
     }
+
+    /**
+     * @param array $idList
+     * @return CommonEntity[]
+     */
+    public function getUserPvLogEntityListByIdList(array $idList): array
+    {
+        $entityList = [];
+        try {
+            /** @var UserPvLog $model */
+            $model = $this->getModel();
+            $dataRes = $model::getDB()
+                ->whereIn('id', $idList)
+                ->select()
+                ->toArray();
+            if (!empty($dataRes)) {
+                $entityList = array_map(function ($data) {
+                    return UserPvLogEntity::newInstance($data);
+                }, $dataRes);
+            }
+        } catch (\Exception $e) {
+
+        }
+        return $entityList;
+    }
+
+    /**
+     * @param string $orderType
+     * @param array $orderIdList
+     * @return UserPvLogEntity[]
+     */
+    public function getUserPvLogEntityListByOrderIdListAndPending(string $orderType, array $orderIdList): array
+    {
+        $entityList = [];
+        try {
+            $dataList = UserPvLog::getDB()
+                ->where('order_type', '=', $orderType)
+                ->whereIn('order_id', $orderIdList)
+                ->where('status', '=', UserPvLogEnum::STATUS['PendingConfirmation']['code'])
+                ->select()
+                ->toArray();
+            if (!empty($dataList)) {
+                $entityList = array_map(function ($data) {
+                    return UserPvLogEntity::newInstance($data);
+                }, $dataList);
+            }
+        } catch (DataNotFoundException|ModelNotFoundException|DbException $e) {
+
+        }
+        return $entityList;
+    }
+
+    /**
+     * 批量更新
+     * @param $dataList
+     * @return array
+     */
+    public function saveAll($dataList): array
+    {
+        try {
+            return $this->getModel()->saveAll($dataList)->toArray();
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
 }

app/common/dao/user/UserSignHongbaoDao.php

@@ -3,12 +3,87 @@
 namespace app\common\dao\user;
 
 use app\common\dao\BaseDao;
+use app\common\enum\user\UserSignHongbaoEnum;
+use app\common\model\BaseModel;
 use app\common\model\user\UserSignHongbao;
+use app\entity\CommonEntity;
+use app\entity\data\user\UserSignHongbaoEntity;
+use think\db\exception\DataNotFoundException;
+use think\db\exception\DbException;
+use think\db\exception\ModelNotFoundException;
 
 class UserSignHongbaoDao extends BaseDao
 {
+    /**
+     * @return BaseModel
+     */
     protected function getModel(): string
     {
         return UserSignHongbao::class;
     }
+
+    /**
+     * @param array $idList
+     * @return CommonEntity[]
+     */
+    public function getUserSignHongbaoEntityListByIdList(array $idList): array
+    {
+        $entityList = [];
+        try {
+            /** @var UserSignHongbao $model */
+            $model = $this->getModel();
+            $dataRes = $model::getDB()
+                ->whereIn('id', $idList)
+                ->select()
+                ->toArray();
+            if (!empty($dataRes)) {
+                $entityList = array_map(function ($data) {
+                    return UserSignHongbaoEntity::newInstance($data);
+                }, $dataRes);
+            }
+        } catch (\Exception $e) {
+
+        }
+        return $entityList;
+    }
+
+    /**
+     * @param string $orderType
+     * @param array $orderIdList
+     * @return UserSignHongbaoEntity[]
+     */
+    public function getUserSignHongbaoEntityListByOrderIdListAndPending(string $orderType, array $orderIdList): array
+    {
+        $entityList = [];
+        try {
+            $dataList = UserSignHongbao::getDB()
+                ->where('order_type', '=', $orderType)
+                ->whereIn('order_id', $orderIdList)
+                ->where('status', '=', UserSignHongbaoEnum::STATUS['PendingConfirmation']['code'])
+                ->select()
+                ->toArray();
+            if (!empty($dataList)) {
+                $entityList = array_map(function ($data) {
+                    return UserSignHongbaoEntity::newInstance($data);
+                }, $dataList);
+            }
+        } catch (DataNotFoundException|ModelNotFoundException|DbException $e) {
+
+        }
+        return $entityList;
+    }
+
+    /**
+     * 批量更新
+     * @param $dataList
+     * @return array
+     */
+    public function saveAll($dataList): array
+    {
+        try {
+            return $this->getModel()->saveAll($dataList)->toArray();
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
 }

app/common/enum/merchant/MerchantEnum.php

@@ -6,6 +6,8 @@ use app\common\enum\CommonEnum;
 
 class MerchantEnum extends CommonEnum
 {
+    const IS_DEL = parent::IS_DEL;
+
     // 商户类型
     const MER_TYPE = [
         'Normal' => ['code' => 0, 'name' => '普通商户'],

app/common/enum/store/ProductEnum.php

@@ -6,6 +6,8 @@ use app\common\enum\CommonEnum;
 
 class ProductEnum extends CommonEnum
 {
+    const IS_DEL = parent::IS_DEL;
+
     const STATUS = [
         'Pending' => ['code' => 0, 'name' => '审核中'],
         'Approved' => ['code' => 1, 'name' => '审核通过'],

app/common/model/product/SeckillModel.php

@@ -4,7 +4,7 @@ namespace app\common\model\product;
 
 use app\common\model\BaseModel;
 
-class SeckillModel extends BaseModel
+class ProductSeckillModel extends BaseModel
 {
 
     public static function tablePk(): ?string

app/common/repositories/product/ProductSeckillRepository.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace app\common\repositories\product;
+
+use app\common\dao\product\ProductSeckillDao;
+use app\common\repositories\BaseRepository;
+use app\entity\data\product\ProductSeckillEntity;
+
+class ProductSeckillRepository extends BaseRepository
+{
+    public function __construct(ProductSeckillDao $dao)
+    {
+        $this->dao = $dao;
+    }
+
+    /**
+     * @param int $productId
+     * @return ProductSeckillEntity
+     */
+    public function getProductSeckillEntityByProductId(int $productId): ProductSeckillEntity
+    {
+        /** @var ProductSeckillEntity $entity */
+        $entity = $this->dao->getProductSeckillEntityByProductId($productId);
+        return $entity;
+    }
+}

app/common/repositories/product/SeckillRepository.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace app\common\repositories\product;
-
-use app\common\dao\product\SeckillDao;
-use app\common\repositories\BaseRepository;
-use app\entity\data\product\SeckillEntity;
-
-class SeckillRepository extends BaseRepository
-{
-    public function __construct(SeckillDao $dao)
-    {
-        $this->dao = $dao;
-    }
-
-    /**
-     * @param int $productId
-     * @return SeckillEntity
-     */
-    public function getSeckillEntityByProductId(int $productId): SeckillEntity
-    {
-        /** @var SeckillEntity $entity */
-        $entity = $this->dao->getSeckillEntityByProductId($productId);
-        return $entity;
-    }
-}

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

@@ -12,11 +12,13 @@ namespace app\common\repositories\store\order;
 
 
 use app\common\dao\store\order\StoreCartDao;
+use app\common\enum\store\CartEnum;
 use app\common\repositories\BaseRepository;
 use app\common\repositories\store\coupon\StoreCouponProductRepository;
 use app\common\repositories\store\coupon\StoreCouponRepository;
 use app\common\repositories\store\product\ProductRepository;
 use app\entity\data\store\CartEntity;
+use think\db\exception\DbException;
 use think\facade\Db;
 
 /**
@@ -143,4 +145,15 @@ class StoreCartRepository extends BaseRepository
     {
         return $this->dao->getCartEntityListByCartIdList($cartIdList);
     }
+
+    /**
+     * @param array $cartIdList
+     * @param int $isPay
+     * @return int
+     * @throws DbException
+     */
+    public function updateIsPayByCartIdList(array $cartIdList, int $isPay = CartEnum::IS_PAY['Yes']['code']): int
+    {
+        return $this->dao->updateIsPayByCartIdList($cartIdList, $isPay);
+    }
 }

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

@@ -16,6 +16,7 @@ use app\common\repositories\BaseRepository;
 use app\common\repositories\store\coupon\StoreCouponUserRepository;
 use app\entity\data\store\StoreGroupOrderEntity;
 use crmeb\jobs\CancelGroupOrderJob;
+use think\db\exception\DbException;
 use think\exception\ValidateException;
 use think\facade\Cache;
 use think\facade\Db;
@@ -46,7 +47,7 @@ class StoreGroupOrderRepository extends BaseRepository
      * @param $limit
      * @return array
      * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
+     * @throws DbException
      * @throws \think\db\exception\ModelNotFoundException
      * @author xaboy
      * @day 2020/6/10
@@ -68,7 +69,7 @@ class StoreGroupOrderRepository extends BaseRepository
      * @param $id
      * @return array|\think\Model|null
      * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
+     * @throws DbException
      * @throws \think\db\exception\ModelNotFoundException
      * @author xaboy
      * @day 2020/6/10
@@ -88,7 +89,7 @@ class StoreGroupOrderRepository extends BaseRepository
      * @param $id
      * @return array|\think\Model|null
      * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
+     * @throws DbException
      * @throws \think\db\exception\ModelNotFoundException
      * @author xaboy
      * @day 2020/6/10
@@ -115,7 +116,7 @@ class StoreGroupOrderRepository extends BaseRepository
      * @param $id
      * @return array|\think\Model|null
      * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
+     * @throws DbException
      * @throws \think\db\exception\ModelNotFoundException
      * @author xaboy
      * @day 2020/6/10
@@ -129,7 +130,7 @@ class StoreGroupOrderRepository extends BaseRepository
      * @param $id
      * @param null $uid
      * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
+     * @throws DbException
      * @throws \think\db\exception\ModelNotFoundException
      * @author xaboy
      * @day 2020/6/10
@@ -231,7 +232,7 @@ class StoreGroupOrderRepository extends BaseRepository
      * @param $product_id
      * @return array
      * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
+     * @throws DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
     public function ProductOutCancel($product_id){
@@ -276,4 +277,32 @@ class StoreGroupOrderRepository extends BaseRepository
     {
         return $this->dao->getStoreGroupOrderEntityListByGroupOrderIdList($groupOrderIdList);
     }
+
+    public function create($data)
+    {
+        return $this->dao->create($data);
+    }
+
+    /**
+     * 写入贡献值记录
+     * @param StoreGroupOrderEntity $storeGroupOrderEntity
+     * @return StoreGroupOrderEntity
+     */
+    public function createByEntity(StoreGroupOrderEntity $storeGroupOrderEntity): StoreGroupOrderEntity
+    {
+        $result = $this->create($storeGroupOrderEntity->toUnderlineArray())->toArray();
+        /** @var StoreGroupOrderEntity $entity */
+        $entity = StoreGroupOrderEntity::newInstance($result);
+        return $entity;
+    }
+
+    /**
+     * @param $groupOrderId
+     * @return int
+     * @throws DbException
+     */
+    public function paySuccess($groupOrderId): int
+    {
+        return $this->dao->paySuccess($groupOrderId);
+    }
 }

app/common/repositories/store/product/ProductAttrValueRepository.php

@@ -8,7 +8,7 @@ namespace app\common\repositories\store\product;
 
 use app\common\repositories\BaseRepository;
 use app\common\dao\store\product\ProductAttrValueDao as dao;
-use app\entity\data\store\ProductAttrValueEntity;
+use app\entity\data\store\StoreProductAttrValueEntity;
 use app\traits\GongApiRequest;
 use think\exception\ValidateException;
 use crmeb\exceptions\AuthException;
@@ -163,12 +163,26 @@ class ProductAttrValueRepository extends BaseRepository
 
     /**
      * @param string $unique
-     * @return ProductAttrValueEntity
+     * @return StoreProductAttrValueEntity
      */
-    public function getProductAttrValueEntityByUnique(string $unique): ProductAttrValueEntity
+    public function getStoreProductAttrValueEntityByUnique(string $unique): StoreProductAttrValueEntity
     {
-        /** @var ProductAttrValueEntity $productAttrValueEntity */
-        $productAttrValueEntity = $this->dao->getProductAttrValueEntityByUnique($unique);
-        return $productAttrValueEntity;
+        $entityList = $this->getStoreProductAttrValueEntityListByUniqueList([$unique]);
+        $entity = array_shift($entityList);
+        if ($entity instanceof StoreProductAttrValueEntity) {
+            return $entity;
+        } else {
+            /** @var StoreProductAttrValueEntity */
+            return StoreProductAttrValueEntity::newInstance();
+        }
+    }
+
+    /**
+     * @param array $uniqueList
+     * @return StoreProductAttrValueEntity[]
+     */
+    public function getStoreProductAttrValueEntityListByUniqueList(array $uniqueList): array
+    {
+        return $this->dao->getStoreProductAttrValueEntityListByUniqueList($uniqueList);
     }
 }

app/common/repositories/store/product/ProductRepository.php

@@ -23,7 +23,7 @@ use app\common\repositories\user\UserVisitRepository;
 use app\common\repositories\wechat\RoutineQrcodeRepository;
 use app\common\repositories\wechat\WechatQrcodeRepository;
 use app\controller\merchant\gong\Goods;
-use app\entity\data\store\ProductEntity;
+use app\entity\data\store\StoreProductEntity;
 use app\traits\ShouxinyiApiRequest;
 use crmeb\exceptions\ApiException;
 use crmeb\services\QrcodeService;
@@ -2113,12 +2113,26 @@ class ProductRepository extends BaseRepository
 
     /**
      * @param int $productId
-     * @return ProductEntity
+     * @return StoreProductEntity
      */
-    public function getProductEntityByProductId(int $productId): ProductEntity
+    public function getStoreProductEntityByProductId(int $productId): StoreProductEntity
     {
-        /** @var ProductEntity $productEntity */
-        $productEntity = $this->dao->getProductEntityByProductId($productId);
-        return $productEntity;
+        $entityList = $this->getStoreProductEntityListByProductIdList([$productId]);
+        $entity = array_shift($entityList);
+        if ($entity instanceof StoreProductEntity) {
+            return $entity;
+        } else {
+            /** @var StoreProductEntity */
+            return StoreProductEntity::newInstance();
+        }
+    }
+
+    /**
+     * @param array $idList
+     * @return StoreProductEntity[]
+     */
+    public function getStoreProductEntityListByProductIdList(array $idList): array
+    {
+        return $this->dao->getUserSignGongxianEntityListByIdList($idList);
     }
 }

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

@@ -1016,9 +1016,23 @@ class MerchantRepository extends BaseRepository
      */
     public function getMerchantEntityByMerchantId(int $merchantId): MerchantEntity
     {
-        /** @var MerchantEntity $entity */
-        $entity = $this->dao->getMerchantEntityByMerchantId($merchantId);
-        return $entity;
+        $entityList = $this->getMerchantEntityListByMerchantIdList([$merchantId]);
+        $entity = array_shift($entityList);
+        if ($entity instanceof MerchantEntity) {
+            return $entity;
+        } else {
+            /** @var MerchantEntity */
+            return MerchantEntity::newInstance();
+        }
+    }
+
+    /**
+     * @param array $idList
+     * @return MerchantEntity[]
+     */
+    public function getMerchantEntityListByMerchantIdList(array $idList): array
+    {
+        return $this->dao->getMerchantEntityListByMerchantIdList($idList);
     }
 
 }

app/common/repositories/user/UserPvLogRepository.php

@@ -6,7 +6,9 @@ use app\common\dao\user\UserPvLogDao;
 use app\common\enum\user\UserPvLogEnum;
 use app\common\repositories\BaseRepository;
 use app\common\repositories\store\order\StoreOrderRepository;
+use app\entity\data\user\UserEntity;
 use app\entity\data\user\UserPvLogEntity;
+use think\db\exception\DbException;
 use think\exception\ValidateException;
 
 class UserPvLogRepository extends BaseRepository
@@ -16,6 +18,41 @@ class UserPvLogRepository extends BaseRepository
         $this->dao = $dao;
     }
 
+    /**
+     * @param int $id
+     * @return UserPvLogEntity
+     */
+    public function getUserPvLogEntityById(int $id): UserPvLogEntity
+    {
+        $entityList = $this->getUserPvLogEntityListByIdList([$id]);
+        $entity = array_shift($entityList);
+        if ($entity instanceof UserPvLogEntity) {
+            return $entity;
+        } else {
+            /** @var UserPvLogEntity */
+            return UserPvLogEntity::newInstance();
+        }
+    }
+
+    /**
+     * @param array $idList
+     * @return UserPvLogEntity[]
+     */
+    public function getUserPvLogEntityListByIdList(array $idList): array
+    {
+        return $this->dao->getUserPvLogEntityListByIdList($idList);
+    }
+
+    /**
+     * @param string $orderType
+     * @param array $orderIdList
+     * @return UserPvLogEntity[]
+     */
+    public function getUserPvLogEntityListByOrderIdListAndPending(string $orderType, array $orderIdList): array
+    {
+        return $this->dao->getUserPvLogEntityListByOrderIdListAndPending($orderType, $orderIdList);
+    }
+
     public function create($data)
     {
         return $this->dao->create($data);
@@ -70,4 +107,102 @@ class UserPvLogRepository extends BaseRepository
 
         return $this->createByEntity($userPvLogEntity);
     }
+
+    /**
+     * 将 贡献值 直推贡献值 记录设置为生效状态 并对用户的 贡献值 直推贡献值 字段进行增减
+     * @param array $idList
+     * @return array
+     */
+    public function executeByIdList(array $idList): array
+    {
+        $userPvLogEntityList = $this->getUserPvLogEntityListByIdList($idList);
+        $userIdList = [];
+
+        // 忽略 已经生效的 记录
+        $userPvLogEntityList = array_filter($userPvLogEntityList, function ($entity) use (&$userIdList) {
+            // 积分数据不为空 用户不为空 状态属于待结算 并且结算字段为空
+            if ((!empty($entity->getId()) && !empty($entity->getUid()) && ($entity->getStatus() == UserPvLogEnum::STATUS['PendingConfirmation']['code']) && empty($entity->getSettlementTime()))) {
+                $userIdList[] = $entity->getUid();
+                return true;
+            }
+            return false;
+        });
+
+        if (!empty($userPvLogEntityList)) {
+            // 获取用户 映射信息
+            /** @var UserRepository $userRepository */
+            $userRepository = app()->make(UserRepository::class);
+            /** @var UserEntity[] $userEntityMapByUid */
+            $userEntityMapByUid = [];
+            if (!empty($userIdList)) {
+                $userEntityMapByUid = $userRepository->getUserEntityMapByUidList($userIdList);
+            }
+
+            /** @var UserEntity[] $updateUserEntityList */
+            $updateUserEntityList = [];
+            /** @var UserPvLogEntity[] $updateUserPvLogEntityList */
+            $updateUserPvLogEntityList = [];
+            foreach ($userPvLogEntityList as $userPvLogEntity) {
+
+                $userEntity = $userEntityMapByUid[$userPvLogEntity->getUid()];
+                if (empty($userEntity) || empty($userEntity->getUid())) {
+                    throw new ValidateException("未查询到用户信息(PvLogId:{$userPvLogEntity->getId()})");
+                }
+
+                // 组建 更新 用户信息
+                if (isset($updateUserEntityList[$userEntity->getUid()])) {
+                    $updateUserEntity = $updateUserEntityList[$userEntity->getUid()];
+                } else {
+                    /** @var UserEntity $updateUserEntity */
+                    $updateUserEntity = UserEntity::newInstance();
+                    $updateUserEntity
+                        ->setUid($userEntity->getUid())
+                        ->setPv($userEntity->getPv());
+                }
+                // 组建 账单 记录
+                if (isset($updateUserPvLogEntityList[$userPvLogEntity->getId()])) {
+                    $updateUserPvLogEntity = $updateUserPvLogEntityList[$userPvLogEntity->getId()];
+                } else {
+                    /** @var UserPvLogEntity $updateUserPvLogEntity */
+                    $updateUserPvLogEntity = UserPvLogEntity::newInstance();
+                    // 更新 账单记录 状态
+                    $updateUserPvLogEntity
+                        ->setId($userPvLogEntity->getId())
+                        ->setStatus(UserPvLogEnum::STATUS['Valid']['code'])
+                        ->setSettlementTime(date('Y-m-d H:i:s'));
+                }
+                // 写入Pv
+                $updateUserEntity->setPv(bcadd($updateUserEntity->getPv(), $userPvLogEntity->getPv(), 2));
+
+                $updateUserEntityList[$userPvLogEntity->getUid()] = $updateUserEntity;
+                $updateUserPvLogEntityList[$userPvLogEntity->getId()] = $updateUserPvLogEntity;
+            }
+
+            if (!empty($updateUserEntityList)) {
+                $userRepository->batchUpdateUserDataByDataList(
+                    array_map(function (UserEntity $updateUserEntity) {
+                        return $updateUserEntity->toUnderlineArray();
+                    }, $updateUserEntityList)
+                );
+            }
+
+            if (!empty($updateUserBillEntityList)) {
+                $this->batchUpdateUserPvLogDataByDataList(
+                    array_map(function (UserPvLogEntity $updateUserPvLogEntity) {
+                        return $updateUserPvLogEntity->toUnderlineArray();
+                    }, $updateUserPvLogEntityList)
+                );
+            }
+        }
+        return $idList;
+    }
+
+    /**
+     * @param $dataList
+     * @return array
+     */
+    public function batchUpdateUserPvLogDataByDataList($dataList): array
+    {
+        return $this->dao->saveAll($dataList);
+    }
 }

app/common/repositories/user/UserSignGongxianRepository.php

@@ -52,7 +52,7 @@ class UserSignGongxianRepository extends BaseRepository
     {
         return $this->dao->getUserSignGongxianEntityListByOrderIdListAndPending($orderType, $orderIdList);
     }
-    
+
     public function create($data)
     {
         return $this->dao->create($data);
@@ -206,24 +206,20 @@ class UserSignGongxianRepository extends BaseRepository
                 $updateUserEntityList[$userSignGongxianEntity->getUid()] = $updateUserEntity;
                 $updateUserScoreEntityList[$userSignGongxianEntity->getId()] = $updateUserSignGongxianEntity;
             }
-            try {
-                if (!empty($updateUserEntityList)) {
-                    $userRepository->batchUpdateUserDataByDataList(
-                        array_map(function (UserEntity $updateUserEntity) {
-                            return $updateUserEntity->toUnderlineArray();
-                        }, $updateUserEntityList)
-                    );
-                }
-
-                if (!empty($updateUserBillEntityList)) {
-                    $this->batchUpdateUserSignGongxianDataByDataList(
-                        array_map(function (UserSignGongxianEntity $updateUserSignGongxianEntity) {
-                            return $updateUserSignGongxianEntity->toUnderlineArray();
-                        }, $updateUserScoreEntityList)
-                    );
-                }
-            } catch (DbException $e) {
+            if (!empty($updateUserEntityList)) {
+                $userRepository->batchUpdateUserDataByDataList(
+                    array_map(function (UserEntity $updateUserEntity) {
+                        return $updateUserEntity->toUnderlineArray();
+                    }, $updateUserEntityList)
+                );
+            }
 
+            if (!empty($updateUserBillEntityList)) {
+                $this->batchUpdateUserSignGongxianDataByDataList(
+                    array_map(function (UserSignGongxianEntity $updateUserSignGongxianEntity) {
+                        return $updateUserSignGongxianEntity->toUnderlineArray();
+                    }, $updateUserScoreEntityList)
+                );
             }
         }
         return $idList;

app/common/repositories/user/UserSignHongbaoRepository.php

@@ -6,7 +6,9 @@ use app\common\dao\user\UserSignHongbaoDao;
 use app\common\enum\user\UserSignHongbaoEnum;
 use app\common\repositories\BaseRepository;
 use app\common\repositories\store\order\StoreOrderRepository;
+use app\entity\data\user\UserEntity;
 use app\entity\data\user\UserSignHongbaoEntity;
+use think\db\exception\DbException;
 use think\exception\ValidateException;
 
 class UserSignHongbaoRepository extends BaseRepository
@@ -16,6 +18,41 @@ class UserSignHongbaoRepository extends BaseRepository
         $this->dao = $dao;
     }
 
+    /**
+     * @param int $id
+     * @return UserSignHongbaoEntity
+     */
+    public function getUserSignHongbaoEntityById(int $id): UserSignHongbaoEntity
+    {
+        $entityList = $this->getUserSignHongbaoEntityListByIdList([$id]);
+        $entity = array_shift($entityList);
+        if ($entity instanceof UserSignHongbaoEntity) {
+            return $entity;
+        } else {
+            /** @var UserSignHongbaoEntity */
+            return UserSignHongbaoEntity::newInstance();
+        }
+    }
+
+    /**
+     * @param array $idList
+     * @return UserSignHongbaoEntity[]
+     */
+    public function getUserSignHongbaoEntityListByIdList(array $idList): array
+    {
+        return $this->dao->getUserSignHongbaoEntityListByIdList($idList);
+    }
+
+    /**
+     * @param string $orderType
+     * @param array $orderIdList
+     * @return UserSignHongbaoEntity[]
+     */
+    public function getUserSignHongbaoEntityListByOrderIdListAndPending(string $orderType, array $orderIdList): array
+    {
+        return $this->dao->getUserSignHongbaoEntityListByOrderIdListAndPending($orderType, $orderIdList);
+    }
+
     public function create($data)
     {
         return $this->dao->create($data);
@@ -73,4 +110,109 @@ class UserSignHongbaoRepository extends BaseRepository
         return $this->createByEntity($userSignHongbaoEntity);
     }
 
+    /**
+     * 将 贡献值 直推贡献值 记录设置为生效状态 并对用户的 贡献值 直推贡献值 字段进行增减
+     * @param array $idList
+     * @return array
+     */
+    public function executeByIdList(array $idList): array
+    {
+        $userSignHongbaoEntityList = $this->getUserSignHongbaoEntityListByIdList($idList);
+        $userIdList = [];
+
+        // 忽略 已经生效的 记录
+        $userSignHongbaoEntityList = array_filter($userSignHongbaoEntityList, function ($entity) use (&$userIdList) {
+            // 积分数据不为空 用户不为空 状态属于待结算 并且结算字段为空
+            if ((!empty($entity->getId()) && !empty($entity->getUid()) && ($entity->getStatus() == UserSignHongbaoEnum::STATUS['PendingConfirmation']['code']) && empty($entity->getSettlementTime()))) {
+                $userIdList[] = $entity->getUid();
+                return true;
+            }
+            return false;
+        });
+
+        if (!empty($userSignHongbaoEntityList)) {
+            // 获取用户 映射信息
+            /** @var UserRepository $userRepository */
+            $userRepository = app()->make(UserRepository::class);
+            /** @var UserEntity[] $userEntityMapByUid */
+            $userEntityMapByUid = [];
+            if (!empty($userIdList)) {
+                $userEntityMapByUid = $userRepository->getUserEntityMapByUidList($userIdList);
+            }
+
+            /** @var UserEntity[] $updateUserEntityList */
+            $updateUserEntityList = [];
+            /** @var UserSignHongbaoEntity[] $updateUserSignHongbaoEntityList */
+            $updateUserSignHongbaoEntityList = [];
+            foreach ($userSignHongbaoEntityList as $userSignHongbaoEntity) {
+
+                $userEntity = $userEntityMapByUid[$userSignHongbaoEntity->getUid()];
+                if (empty($userEntity) || empty($userEntity->getUid())) {
+                    throw new ValidateException("未查询到用户信息(HongbaoId:{$userSignHongbaoEntity->getId()})");
+                }
+
+                // 组建 更新 用户信息
+                if (isset($updateUserEntityList[$userEntity->getUid()])) {
+                    $updateUserEntity = $updateUserEntityList[$userEntity->getUid()];
+                } else {
+                    /** @var UserEntity $updateUserEntity */
+                    $updateUserEntity = UserEntity::newInstance();
+                    $updateUserEntity
+                        ->setUid($userEntity->getUid())
+                        ->setHongbao($userEntity->getHongbao());
+                }
+                // 组建 账单 记录
+                if (isset($updateUserSignHongbaoEntityList[$userSignHongbaoEntity->getId()])) {
+                    $updateUserSignHongbaoEntity = $updateUserSignHongbaoEntityList[$userSignHongbaoEntity->getId()];
+                } else {
+                    /** @var UserSignHongbaoEntity $updateUserSignHongbaoEntity */
+                    $updateUserSignHongbaoEntity = UserSignHongbaoEntity::newInstance();
+                    // 更新 账单记录 状态
+                    $updateUserSignHongbaoEntity
+                        ->setId($userSignHongbaoEntity->getId())
+                        ->setStatus(UserSignHongbaoEnum::STATUS['Valid']['code'])
+                        ->setSettlementTime(date('Y-m-d H:i:s'));
+                }
+
+                if ($userSignHongbaoEntity->getType() == UserSignHongbaoEnum::TYPE['Consumption']['code']) {
+                    // 消耗
+                    $updateUserEntity->setHongbao(bcsub($updateUserEntity->getHongbao(), $userSignHongbaoEntity->getNumber(), 2));
+                    if ($updateUserEntity->getHongbao() < 0.00) {
+                        throw new ValidateException('用户红包不足');
+                    }
+                } else {
+                    $updateUserEntity->setHongbao(bcadd($updateUserEntity->getHongbao(), $userSignHongbaoEntity->getNumber(), 2));
+                }
+                $updateUserSignHongbaoEntity->setSurplus($updateUserEntity->getHongbao());
+
+                $updateUserEntityList[$userSignHongbaoEntity->getUid()] = $updateUserEntity;
+                $updateUserSignHongbaoEntityList[$userSignHongbaoEntity->getId()] = $updateUserSignHongbaoEntity;
+            }
+            if (!empty($updateUserEntityList)) {
+                $userRepository->batchUpdateUserDataByDataList(
+                    array_map(function (UserEntity $updateUserEntity) {
+                        return $updateUserEntity->toUnderlineArray();
+                    }, $updateUserEntityList)
+                );
+            }
+
+            if (!empty($updateUserBillEntityList)) {
+                $this->batchUpdateUserSignHongbaoDataByDataList(
+                    array_map(function (UserSignHongbaoEntity $updateUserSignHongbaoEntity) {
+                        return $updateUserSignHongbaoEntity->toUnderlineArray();
+                    }, $updateUserSignHongbaoEntityList)
+                );
+            }
+        }
+        return $idList;
+    }
+
+    /**
+     * @param $dataList
+     * @return array
+     */
+    public function batchUpdateUserSignHongbaoDataByDataList($dataList): array
+    {
+        return $this->dao->saveAll($dataList);
+    }
 }

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

@@ -710,14 +710,8 @@ class StoreOrder
     }
 
     /**
-     * 理解注释
-     * store_cart 购物车表，每个人购物车里 有多件商品，每个商品在这张表里 都是一条记录
      * @param StoreOrderCreateValidate $storeOrderCreateValidate
-     * @return false|string|\think\response\Json
-     * @throws DataNotFoundException
-     * @throws DbException
-     * @throws ModelNotFoundException
-     * @throws \Throwable
+     * @return mixed
      */
     public function createOrderNew(StoreOrderCreateValidate $storeOrderCreateValidate)
     {
@@ -727,362 +721,29 @@ class StoreOrder
         if ($storeOrderCreateValidateResult['status'] == 'error') {
             return app('json')->fail($storeOrderCreateValidateResult['message']);
         }
-        // 验证通过，继续处理数据
-        /** @var StoreOrderCreateRequestEntity $storeOrderCreateRequestEntity */
-        $storeOrderCreateRequestEntity = $storeOrderCreateValidateResult['data'];
+
         // 根据用户ID 获取用户实体信息
         // $uid = $this->request->uid();
         $uid = 1592;
+        // 验证通过，继续处理数据
+        /** @var StoreOrderCreateRequestEntity $storeOrderCreateRequestEntity */
+        $storeOrderCreateRequestEntity = $storeOrderCreateValidateResult['data'];
+        $storeOrderCreateRequestEntity->setUid($uid);
 
-        // 2、加锁，他之前加的锁好像在锁狗屎，毛线都没锁住, 而且为什么要锁用户
+        // 2、加锁
         // 增加锁，防止同一用户重读点击
         $redisHandler = Cache::store('redis')->handler();
         $cartIdList = $storeOrderCreateRequestEntity->getCartIdList();
         sort($cartIdList);
-        $isSet = $redisHandler->set('createOrder' . $uid . '-' . implode('-', $cartIdList), 1, ['nx', 'ex' => 30]);
+        $isSet = $redisHandler->set('createOrder' . '-' . implode('-', $cartIdList), 1, ['nx', 'ex' => 30]);
         if (!$isSet) {
             return app('json')->fail('请勿重复下单');
         }
 
-        /** @var UserRepository $userRepository */
-        $userRepository = app()->make(UserRepository::class);
-        $userEntity = $userRepository->getUserEntityByUid($uid);
-        if (empty($userEntity->getUid())) {
-            return app('json')->fail('获取当前用户信息失败');
-        }
-
-        // 目前购物车只能添加一件商品，据了解之前 写的购物车，添加多件商品组合支付时计算的 金额和 VR 积分之类的会有问题
-        /** @var StoreCartRepository $storeCartRepository */
-        $storeCartRepository = app()->make(StoreCartRepository::class);
-        $cartEntityList = $storeCartRepository->getCartEntityListByCartIdList($storeOrderCreateRequestEntity->getCartIdList());
-        if (empty($cartEntityList) || count($storeOrderCreateRequestEntity->getCartIdList()) != count($cartEntityList)) {
-            return app('json')->fail('获取购物车内容失败');
-        }
-        // 确认购物车内 微唯宝 的商品 是否满足发货
-        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']);
-            }
-        }
-
-        // 获取 用户收货地址
-        /** @var UserAddressRepository $userAddressRepository */
-        $userAddressRepository = app()->make(UserAddressRepository::class);
-        $addressEntity = $userAddressRepository->getAddressEntityByAddressId($storeOrderCreateRequestEntity->getAddressId());
-        if (empty($addressEntity->getAddressId()) || $addressEntity->getUid() != $uid) {
-            return app('json')->fail('请选择正确的收货地址');
-        }
-        if (empty($addressEntity->getCodeList())) {
-            return app('json')->fail('地址需要选择4级地址！请修改地址！');
-        }
-
-        // 判断是否分享
-        /** @var ShareRepository $shareRepository */
-        $shareRepository = app()->make(ShareRepository::class);
-        $shareEntity = $shareRepository->getShareEntityByShareId($storeOrderCreateRequestEntity->getShareId());
-
-
-
-
-        $result = $this->repository->createOrderNew($storeOrderCreateRequestEntity, $userEntity, $cartEntityList, $addressEntity, $shareEntity);
+        $result = $this->repository->createOrderNew2($storeOrderCreateRequestEntity);
         
         
         return app('json')->success('aaa', $result);
-        $uid = $this->request->uid();
-
-        $this->repository->createOrderNew($uid, $allParams);
-
-
-        $allParams = input();
-
-        $cartId = $allParams['cart_id'];
-
-        $fzonePayType = $allParams['fzone_paytype'];
-        $fzonePayTypeMap = $allParams['fzone_paytype'];
-        $addressId = (int)($allParams['address_id'] ?? 0); // 地址ID
-
-        $payType = $this->request->param('pay_type');// 5积分 6京豆
-        $share_id = $this->request->param('share_id', '');//分享id
-        $mer_id = $this->request->param('mer_id', '');//分享id
-        // 声明 引用
-
-
-
-
-        // 3、验证购物车内商品 是否已下架，是否无货，是否支持发货 是否满足数量
-        // 处理购物车 按照之前需求的意思，应该 每次下单 只能购买 一个SPU 的 一个SKU，而且只能买一件
-        //在提交订单之前会产出购物车cartid，其中会产生购买的数量，现在默认会员专区是只让购买一个商品，需要修改值为1
-        // try {
-        //     $storeCartDataList = Db::name('store_cart')
-        //         ->where('cart_id', $cartId)
-        //         ->select()
-        //         ->toArray();
-        // } catch (\Exception $e) {
-        //     return app('json')->fail('获取购物车内容失败');
-        // }
-        // 这块 限制还 欠完善考虑
-        if (count($storeCartDataList) > 1 || $storeCartDataList[0]['cart_num'] > 1) {
-            return app('json')->fail('购买数量默认为一件，请修改购买数量!');
-        }
-        // 确认购物车内 微唯宝 的商品 是否满足发货
-        /** @var ProductAttrValueRepository $productAttrValueRepository */
-        $productAttrValueRepository = app()->make(ProductAttrValueRepository::class);
-        foreach ($storeCartDataList as $k => $item) {
-            // 检查库存 查看 此商品已下架 此商品规格无货 此商品不支持该地区
-            // （按照代码中所写的逻辑来推理：从微唯宝拉取过来，从而上架到商品表的商品，都有SPUId，所以去走微唯宝提供的接口验证，而会员专区和商贸区的商品可能是商户自己加的，没有SPUId，所以也就不用走微唯宝的验证）
-            $checkGong = $productAttrValueRepository->checkGong($item['product_id'], $item['product_attr_unique'], $item['cart_num'], $uid, $addressId);
-            if (isset($checkGong['code']) && $checkGong['code'] == -1){
-                return app('json')->fail($checkGong['message']);
-            }
-        }
-
-        // 获取 用户收货地址
-        /** @var UserAddressRepository $userAddressRepository */
-        $userAddressRepository = app()->make(UserAddressRepository::class);
-        try {
-            $addressData = $userAddressRepository->getWhere(['uid' => $uid, 'address_id' => $addressId]);
-            // 如果不是会员专区的商品，则一定要用户完善的收货地址
-            if (empty($addressData['city_id'] ?? null)) {
-                return app('json')->fail('请选择正确的收货地址');
-            }
-            if (empty($addressData['code_list'] ?? null)) {
-                return app('json')->fail('地址需要选择4级地址！请修改地址！');
-            }
-        } catch (\Exception $e) {
-            return app('json')->fail('获取用户收货地址失败');
-        }
-
-
-        $array_fzone_paytype_all = [
-            'fzone_pay_jingdou' => 0,
-            'fzone_pay_vr' => 0,
-            'fzone_pay_jifen' => 0,
-            'fzone_pay_price' => 0,
-            'fzone_pay_other' => $fzonePayTypeMap['other'],
-            'fzone_pay_note' => $fzonePayTypeMap['note'],
-            'fzone_pay_type' => $fzonePayTypeMap['type'],
-        ];
-
-        //会员专区升级产生的user_of_goods订单ID赋值
-        $getuserofgoodsid = 1;
-
-        if (!empty($fzonePayTypeMap['type'])) {
-            if (!empty($fzonePayTypeMap['type'] == 'b1')) {
-                //精彩生活VR+积分
-                //vr+积分
-                $vrpri = $userData['vr'] - $fzonePayTypeMap['price'];
-                $pricepri = $userData['score'] - $fzonePayTypeMap['other'];
-                //vr+积分
-                if ($vrpri < 0 || $pricepri < 0) {
-                    return app('json')->fail("支付失败,VR或积分不足!");
-                }
-                $array_fzone_paytype_all['fzone_pay_vr'] = $fzonePayTypeMap['price'];
-                $array_fzone_paytype_all['fzone_pay_jifen'] = $fzonePayTypeMap['other'];
-
-            } else if (!empty($fzonePayTypeMap['type'] == 'b2')) {
-                //精彩生活现金+积分
-                //商贸区：现金+积分
-
-                $vrpri = $userData['score'] - $fzonePayTypeMap['other'];
-
-                // //现金+积分
-                if ($vrpri < 0) {
-                    return app('json')->fail("支付失败,积分不足!");
-                }
-                $array_fzone_paytype_all['fzone_pay_price'] = $fzonePayTypeMap['price'];
-                $array_fzone_paytype_all['fzone_pay_jifen'] = $fzonePayTypeMap['other'];
-
-            } else if (!empty($fzonePayTypeMap['type'] == 'b3')) {
-                //精彩生活区 VR+京豆
-                $vrpri = $userData['vr'] - $fzonePayTypeMap['price'];
-                $pricepri = $userData['jingdou'] - $fzonePayTypeMap['other'];
-                //vr+积分
-                if ($vrpri < 0 || $pricepri < 0) {
-                    return app('json')->fail("支付失败,VR或京豆不足!");
-                }
-                $array_fzone_paytype_all['fzone_pay_vr'] = $fzonePayTypeMap['price'];
-                $array_fzone_paytype_all['fzone_pay_jingdou'] = $fzonePayTypeMap['other'];
-            } else if (!empty($fzonePayTypeMap['type'] == 'b4')) {
-                //精彩生活区 现金+京豆
-                $pricepri = $userData['jingdou'] - $fzonePayTypeMap['other'];
-
-                // //现金+积分
-                if ($pricepri < 0) {
-                    return app('json')->fail("支付失败,京豆不足!");
-                }
-                $array_fzone_paytype_all['fzone_pay_price'] = $fzonePayTypeMap['price'];
-                $array_fzone_paytype_all['fzone_pay_jingdou'] = $fzonePayTypeMap['other'];
-                //                return app('json')->fail("开发中升级中！");
-
-            } else if (!empty($fzonePayTypeMap['type'] == 'b5')) {
-                //精彩生活 VR支付
-
-                $vrpri = $userData['vr'] - $fzonePayTypeMap['price'];
-
-                if ($vrpri < 0) {
-                    return app('json')->fail("支付失败,VR不足!");
-                }
-                $array_fzone_paytype_all['fzone_pay_vr'] = $fzonePayTypeMap['price'];
-            } else if (!empty($fzonePayTypeMap['type'] == 'a1')) {
-                //生活 VR支付
-
-                $vrpri = $userData['vr'] - $fzonePayTypeMap['price'];
-
-
-                if ($vrpri < 0) {
-                    return app('json')->fail("支付失败,VR不足!");
-                }
-                $array_fzone_paytype_all['fzone_pay_vr'] = $fzonePayTypeMap['price'];
-                // return app('json')->fail($userdatas['spread_old']);
-                //检查在旧表中是否有上级
-                if ($userData['spread_old'] != 0) {
-
-
-                    //查询当前用户的上级在1.0中是有数据的，那么老用户介绍新用户。
-                    $sf = Db::name('old_user_jbp')->where('id', $userData['uid'])->find();//父级在旧表有注册
-
-                    // $sf1 = Db::name('old_user_jbp')->where('id',$userdatas['id'])->find();
-
-                    // 当前用户是在2.0注册的新用户，父级是在1.0
-
-                    //当前用户在1.0中没有注册，但是父级在1.0系统中注册过。
-                    if (!empty($sf)) {
-
-                        //检查用户在旧表中是否与上级，有的话就是升级权限，要新增一个user_of_goods的表
-                        $data1['user_id'] = $uid;
-                        $data1['goods_list_id'] = 0;
-                        $data1['status'] = 0;
-                        $data1['spread_id'] = $sf['invite_id'];
-                        $data1['node_id'] = $sf['spread'];
-                        $data1['money'] = $fzonePayTypeMap['price'];
-                        $data1['order_id'] = 10;
-                        $data1['server_id'] = $userData['server_id_old'];
-                        $data1['pay_gb'] = 0;
-                        $data1['pay_vr'] = $fzonePayTypeMap['price'];
-                        $data1['pay_bt'] = 0;
-
-                        //return app('json')->fail("333");
-
-                        $sfe = Db::name('old_user_of_goods')->insertGetId($data1);
-
-                        if ($sfe) {
-                            $getuserofgoodsid = $sfe;
-                        }
-                    }
-
-
-                }
-
-
-                //Db::getLastInsID();
-
-            } else if (!empty($fzonePayTypeMap['type'] == 'a3')) {
-                //生活 现金 + VR支付
-
-
-                //检查在旧表中是否有上级
-                if ($userData['spread_old'] != 0) {
-
-
-                    //查询当前用户的上级在1.0中是有数据的，那么老用户介绍新用户。
-                    $sf = Db::name('old_user_jbp')->where('id', $userData['uid'])->find();//父级在旧表有注册
-                    //如果组合支付中，没有现金，只是用VR支付的情况下
-
-                    if ($fzonePayTypeMap['price'] <= 0.01) {
-                        return app('json')->fail("现金不足");
-                    }
-
-                    // 当前用户是在2.0注册的新用户，父级是在1.0
-
-                    //当前用户在1.0中没有注册，但是父级在1.0系统中注册过。
-                    if (!empty($sf)) {
-
-                        //检查用户在旧表中是否与上级，有的话就是升级权限，要新增一个user_of_goods的表
-                        $data1['user_id'] = $uid;
-                        $data1['goods_list_id'] = 0;
-                        $data1['status'] = 0;
-                        $data1['spread_id'] = $sf['invite_id'];
-                        $data1['node_id'] = $sf['spread'];
-                        $data1['money'] = $fzonePayTypeMap['price'];
-                        $data1['order_id'] = 10;
-                        $data1['server_id'] = $userData['server_id_old'];
-                        $data1['pay_gb'] = 0;
-                        $data1['pay_vr'] = $fzonePayTypeMap['price'];
-                        $data1['pay_bt'] = 0;
-
-                        //return app('json')->fail("333");
-
-                        $sfe = Db::name('old_user_of_goods')->insertGetId($data1);
-
-                        if ($sfe) {
-                            $getuserofgoodsid = $sfe;
-                        }
-                    }
-
-
-                }
-                $array_fzone_paytype_all['fzone_pay_price'] = $fzonePayTypeMap['price'];
-                $array_fzone_paytype_all['fzone_pay_vr'] = $fzonePayTypeMap['other'];
-
-            } else if (!empty($fzonePayTypeMap['type'] == 'c1')) {
-                //复购区 复购金支付
-                $fugoupri = $userData['fugou'] - $fzonePayTypeMap['price'];
-
-                if ($fugoupri < 0) {
-                    return app('json')->fail("支付失败,复购金不足!");
-                }
-                $array_fzone_paytype_all['fzone_pay_other'] = $fzonePayTypeMap['price'];
-            } else {
-                $array_fzone_paytype_all['fzone_pay_price'] = $fzonePayTypeMap['price'];
-            }
-        }
-
-
-        //end
-        //$getuserofgoodsid= 1;
-
-        makeLock()->lock();
-        try {
-            $groupOrder = $this->repository->createOrder($this->request->userInfo(), $payType, [$cartId], $addressId, 0, 0, 0, 0, 0, $share_id, 0, $mer_id, 0, 0, 0, 0, 0, 0, $fzonePayType, $getuserofgoodsid, $array_fzone_paytype_all);
-            //var_dump($groupOrder);
-        } catch (\Throwable $e) {
-            makeLock()->unlock();
-            throw $e;
-        }
-        makeLock()->unlock();
-
-
-        //删除缓存的优惠价格
-        // Cache::delete($uid.'_youhui_price_'.$product_type_id);
-
-        //return app('json')->status('success', '支付成功1', ['order_id' => $groupOrder['group_order_id']]);
-        //利润
-
-
-        if ($groupOrder['pay_price'] == 0) {
-            $this->repository->paySuccess($groupOrder);
-            return app('json')->status('success', '支付成功2', ['order_id' => $groupOrder['group_order_id']]);
-        }
-        try {
-            $groupOrder['pay_price'] = set_price_rtrim($groupOrder['pay_price']);
-            //
-            if ($groupOrder['er'] == 0) {
-
-                return app('json')->success(['order_id' => $groupOrder->group_order_id, "groupOrder" => $groupOrder]);
-            } else {
-                return json_encode(array("status" => 400, "message" => $groupOrder['er1']));
-            }
-
-
-            //            return $this->repository->pay($payType, $this->request->userInfo(), $groupOrder);
-        } catch (\Exception $e) {
-            return app('json')->status('error', $e->getMessage(), ['order_id' => $groupOrder->group_order_id]);
-        }
     }
 
     /**

app/entity/data/product/ProductSeckillEntity.php

@@ -0,0 +1,123 @@
+<?php
+
+namespace app\entity\data\product;
+
+use app\entity\data\DataEntity;
+
+class ProductSeckillEntity extends DataEntity
+{
+    public $id = null;  // 自增ID
+    public $productId = null;  // 秒杀商品ID
+    public $seckillDate = null;  // 秒杀时间段
+    public $status = null;  // 状态 1 开启  0 关闭 2 已结束
+    public $ctime = null;  // 创建时间
+    public $merId = null;  // 商户ID
+
+    /**
+     * @return mixed
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * @param mixed $id
+     * @return ProductSeckillEntity
+     */
+    public function setId($id): ProductSeckillEntity
+    {
+        $this->id = $id;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getProductId()
+    {
+        return $this->productId;
+    }
+
+    /**
+     * @param mixed $productId
+     * @return ProductSeckillEntity
+     */
+    public function setProductId($productId): ProductSeckillEntity
+    {
+        $this->productId = $productId;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getSeckillDate()
+    {
+        return $this->seckillDate;
+    }
+
+    /**
+     * @param mixed $seckillDate
+     * @return ProductSeckillEntity
+     */
+    public function setSeckillDate($seckillDate): ProductSeckillEntity
+    {
+        $this->seckillDate = $seckillDate;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getStatus()
+    {
+        return $this->status;
+    }
+
+    /**
+     * @param mixed $status
+     * @return ProductSeckillEntity
+     */
+    public function setStatus($status): ProductSeckillEntity
+    {
+        $this->status = $status;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getCtime()
+    {
+        return $this->ctime;
+    }
+
+    /**
+     * @param mixed $ctime
+     * @return ProductSeckillEntity
+     */
+    public function setCtime($ctime): ProductSeckillEntity
+    {
+        $this->ctime = $ctime;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getMerId()
+    {
+        return $this->merId;
+    }
+
+    /**
+     * @param mixed $merId
+     * @return ProductSeckillEntity
+     */
+    public function setMerId($merId): ProductSeckillEntity
+    {
+        $this->merId = $merId;
+        return $this;
+    }
+}

app/entity/data/product/SeckillEntity.php

@@ -1,95 +0,0 @@
-<?php
-
-namespace app\entity\data\product;
-
-use app\entity\data\DataEntity;
-
-class SeckillEntity extends DataEntity
-{
-    public $id = 0;  // 自增ID
-    public $productId = 0;  // 秒杀商品ID
-    public $seckillDate = null;  // 秒杀时间段
-    public $status = 1;  // 状态 1 开启  0 关闭 2 已结束
-    public $ctime = null;  // 创建时间
-    public $merId = 0;  // 商户ID
-
-    public function getId(): int
-    {
-        return $this->id;
-    }
-
-    public function setId(int $id): SeckillEntity
-    {
-        $this->id = $id;
-        return $this;
-    }
-
-    public function getProductId(): int
-    {
-        return $this->productId;
-    }
-
-    public function setProductId(int $productId): SeckillEntity
-    {
-        $this->productId = $productId;
-        return $this;
-    }
-
-    /**
-     * @return null
-     */
-    public function getSeckillDate()
-    {
-        return $this->seckillDate;
-    }
-
-    /**
-     * @param null $seckillDate
-     * @return SeckillEntity
-     */
-    public function setSeckillDate($seckillDate)
-    {
-        $this->seckillDate = $seckillDate;
-        return $this;
-    }
-
-    public function getStatus(): int
-    {
-        return $this->status;
-    }
-
-    public function setStatus(int $status): SeckillEntity
-    {
-        $this->status = $status;
-        return $this;
-    }
-
-    /**
-     * @return null
-     */
-    public function getCtime()
-    {
-        return $this->ctime;
-    }
-
-    /**
-     * @param null $ctime
-     * @return SeckillEntity
-     */
-    public function setCtime($ctime)
-    {
-        $this->ctime = $ctime;
-        return $this;
-    }
-
-    public function getMerId(): int
-    {
-        return $this->merId;
-    }
-
-    public function setMerId(int $merId): SeckillEntity
-    {
-        $this->merId = $merId;
-        return $this;
-    }
-}

app/entity/data/store/ProductAttrValueEntity.php

@@ -1,522 +0,0 @@
-<?php
-
-namespace app\entity\data\store;
-
-use app\entity\data\DataEntity;
-
-class ProductAttrValueEntity extends DataEntity
-{
-    public $productId = 0;  // 商品ID
-    public $detail = '';  // 商品属性详细
-    public $sku = '';  // 商品属性索引值
-    public $stock = 0;  // 属性对应的库存
-    public $sales = 0;  // 销量
-    public $image = null;  // 图片
-    public $barCode = '';  // 产品条码
-    public $cost = 0.00;  // 成本价
-    public $otPrice = 0.00;  // 原价
-    public $price = 0.00;  // 价格
-    public $volume = 0.00;  // 体积
-    public $weight = 0.00;  // 重量
-    public $type = 0;  // 活动类型 0=商品
-    public $extensionOne = null;  // 养老金
-    public $extensionTwo = null;  // 二级佣金
-    public $unique = '';  // 唯一值
-    public $dacangPrice = 0.00;  // 大仓会员价
-    public $costPrice = null;  // 供应链成本价
-    public $gongSkuId = null;  // 供应链sku_id
-    public $gongMerProfit = null;  // 供应链创客利润
-    public $gongPension = null;  // 供应链养老金
-    public $gongMarketPrice = null;  // 供应链销售价
-    public $plateMerProfit = null;  // 商户创客利润
-    public $pensionNum = '0';  // 养老金%
-    public $shareNum = '0';  // 分享奖%
-    public $stockNum = '0';  // 股权%
-    public $sharesNum = '0';  // 股票
-
-    /**
-     * @return int
-     */
-    public function getProductId(): int
-    {
-        return $this->productId;
-    }
-
-    /**
-     * @param int $productId
-     * @return ProductAttrValueEntity
-     */
-    public function setProductId(int $productId): ProductAttrValueEntity
-    {
-        $this->productId = $productId;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDetail(): string
-    {
-        return $this->detail;
-    }
-
-    /**
-     * @param string $detail
-     * @return ProductAttrValueEntity
-     */
-    public function setDetail(string $detail): ProductAttrValueEntity
-    {
-        $this->detail = $detail;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getSku(): string
-    {
-        return $this->sku;
-    }
-
-    /**
-     * @param string $sku
-     * @return ProductAttrValueEntity
-     */
-    public function setSku(string $sku): ProductAttrValueEntity
-    {
-        $this->sku = $sku;
-        return $this;
-    }
-
-    /**
-     * @return int
-     */
-    public function getStock(): int
-    {
-        return $this->stock;
-    }
-
-    /**
-     * @param int $stock
-     * @return ProductAttrValueEntity
-     */
-    public function setStock(int $stock): ProductAttrValueEntity
-    {
-        $this->stock = $stock;
-        return $this;
-    }
-
-    /**
-     * @return int
-     */
-    public function getSales(): int
-    {
-        return $this->sales;
-    }
-
-    /**
-     * @param int $sales
-     * @return ProductAttrValueEntity
-     */
-    public function setSales(int $sales): ProductAttrValueEntity
-    {
-        $this->sales = $sales;
-        return $this;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getImage()
-    {
-        return $this->image;
-    }
-
-    /**
-     * @param mixed $image
-     * @return ProductAttrValueEntity
-     */
-    public function setImage($image)
-    {
-        $this->image = $image;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getBarCode(): string
-    {
-        return $this->barCode;
-    }
-
-    /**
-     * @param string $barCode
-     * @return ProductAttrValueEntity
-     */
-    public function setBarCode(string $barCode): ProductAttrValueEntity
-    {
-        $this->barCode = $barCode;
-        return $this;
-    }
-
-    /**
-     * @return float
-     */
-    public function getCost(): float
-    {
-        return $this->cost;
-    }
-
-    /**
-     * @param float $cost
-     * @return ProductAttrValueEntity
-     */
-    public function setCost(float $cost): ProductAttrValueEntity
-    {
-        $this->cost = $cost;
-        return $this;
-    }
-
-    /**
-     * @return float
-     */
-    public function getOtPrice(): float
-    {
-        return $this->otPrice;
-    }
-
-    /**
-     * @param float $otPrice
-     * @return ProductAttrValueEntity
-     */
-    public function setOtPrice(float $otPrice): ProductAttrValueEntity
-    {
-        $this->otPrice = $otPrice;
-        return $this;
-    }
-
-    /**
-     * @return float
-     */
-    public function getPrice(): float
-    {
-        return $this->price;
-    }
-
-    /**
-     * @param float $price
-     * @return ProductAttrValueEntity
-     */
-    public function setPrice(float $price): ProductAttrValueEntity
-    {
-        $this->price = $price;
-        return $this;
-    }
-
-    /**
-     * @return float
-     */
-    public function getVolume(): float
-    {
-        return $this->volume;
-    }
-
-    /**
-     * @param float $volume
-     * @return ProductAttrValueEntity
-     */
-    public function setVolume(float $volume): ProductAttrValueEntity
-    {
-        $this->volume = $volume;
-        return $this;
-    }
-
-    /**
-     * @return float
-     */
-    public function getWeight(): float
-    {
-        return $this->weight;
-    }
-
-    /**
-     * @param float $weight
-     * @return ProductAttrValueEntity
-     */
-    public function setWeight(float $weight): ProductAttrValueEntity
-    {
-        $this->weight = $weight;
-        return $this;
-    }
-
-    /**
-     * @return int
-     */
-    public function getType(): int
-    {
-        return $this->type;
-    }
-
-    /**
-     * @param int $type
-     * @return ProductAttrValueEntity
-     */
-    public function setType(int $type): ProductAttrValueEntity
-    {
-        $this->type = $type;
-        return $this;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getExtensionOne()
-    {
-        return $this->extensionOne;
-    }
-
-    /**
-     * @param mixed $extensionOne
-     * @return ProductAttrValueEntity
-     */
-    public function setExtensionOne($extensionOne)
-    {
-        $this->extensionOne = $extensionOne;
-        return $this;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getExtensionTwo()
-    {
-        return is_null($this->extensionTwo) ? 0.00 : $this->extensionTwo;
-    }
-
-    /**
-     * @param mixed $extensionTwo
-     * @return ProductAttrValueEntity
-     */
-    public function setExtensionTwo($extensionTwo)
-    {
-        $this->extensionTwo = $extensionTwo;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getUnique(): string
-    {
-        return $this->unique;
-    }
-
-    /**
-     * @param string $unique
-     * @return ProductAttrValueEntity
-     */
-    public function setUnique(string $unique): ProductAttrValueEntity
-    {
-        $this->unique = $unique;
-        return $this;
-    }
-
-    /**
-     * @return float
-     */
-    public function getDacangPrice(): float
-    {
-        return $this->dacangPrice;
-    }
-
-    /**
-     * @param float $dacangPrice
-     * @return ProductAttrValueEntity
-     */
-    public function setDacangPrice(float $dacangPrice): ProductAttrValueEntity
-    {
-        $this->dacangPrice = $dacangPrice;
-        return $this;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getCostPrice()
-    {
-        return $this->costPrice;
-    }
-
-    /**
-     * @param mixed $costPrice
-     * @return ProductAttrValueEntity
-     */
-    public function setCostPrice($costPrice)
-    {
-        $this->costPrice = $costPrice;
-        return $this;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getGongSkuId()
-    {
-        return $this->gongSkuId;
-    }
-
-    /**
-     * @param mixed $gongSkuId
-     * @return ProductAttrValueEntity
-     */
-    public function setGongSkuId($gongSkuId)
-    {
-        $this->gongSkuId = $gongSkuId;
-        return $this;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getGongMerProfit()
-    {
-        return $this->gongMerProfit;
-    }
-
-    /**
-     * @param mixed $gongMerProfit
-     * @return ProductAttrValueEntity
-     */
-    public function setGongMerProfit($gongMerProfit)
-    {
-        $this->gongMerProfit = $gongMerProfit;
-        return $this;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getGongPension()
-    {
-        return $this->gongPension;
-    }
-
-    /**
-     * @param mixed $gongPension
-     * @return ProductAttrValueEntity
-     */
-    public function setGongPension($gongPension)
-    {
-        $this->gongPension = $gongPension;
-        return $this;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getGongMarketPrice()
-    {
-        return $this->gongMarketPrice;
-    }
-
-    /**
-     * @param mixed $gongMarketPrice
-     * @return ProductAttrValueEntity
-     */
-    public function setGongMarketPrice($gongMarketPrice)
-    {
-        $this->gongMarketPrice = $gongMarketPrice;
-        return $this;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getPlateMerProfit()
-    {
-        return $this->plateMerProfit;
-    }
-
-    /**
-     * @param mixed $plateMerProfit
-     * @return ProductAttrValueEntity
-     */
-    public function setPlateMerProfit($plateMerProfit)
-    {
-        $this->plateMerProfit = $plateMerProfit;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getPensionNum(): string
-    {
-        return $this->pensionNum;
-    }
-
-    /**
-     * @param string $pensionNum
-     * @return ProductAttrValueEntity
-     */
-    public function setPensionNum(string $pensionNum): ProductAttrValueEntity
-    {
-        $this->pensionNum = $pensionNum;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getShareNum(): string
-    {
-        return $this->shareNum;
-    }
-
-    /**
-     * @param string $shareNum
-     * @return ProductAttrValueEntity
-     */
-    public function setShareNum(string $shareNum): ProductAttrValueEntity
-    {
-        $this->shareNum = $shareNum;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getStockNum(): string
-    {
-        return $this->stockNum;
-    }
-
-    /**
-     * @param string $stockNum
-     * @return ProductAttrValueEntity
-     */
-    public function setStockNum(string $stockNum): ProductAttrValueEntity
-    {
-        $this->stockNum = $stockNum;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getSharesNum(): string
-    {
-        return $this->sharesNum;
-    }
-
-    /**
-     * @param string $sharesNum
-     * @return ProductAttrValueEntity
-     */
-    public function setSharesNum(string $sharesNum): ProductAttrValueEntity
-    {
-        $this->sharesNum = $sharesNum;
-        return $this;
-    }
-}

app/entity/data/store/ProductEntity.php

@@ -1,865 +0,0 @@
-<?php
-
-namespace app\entity\data\store;
-
-use app\entity\data\DataEntity;
-
-class ProductEntity extends DataEntity
-{
-    public $productId = 0;  // 商品id
-    public $merId = 0;  // 商户Id
-    public $image = '';  // 商品图片
-    public $sliderImage = '';  // 轮播图
-    public $storeName = '';  // 商品名称
-    public $storeInfo = '';  // 商品简介
-    public $keyword = '';  // 关键字
-    public $barCode = '';  // 产品条码（一维码）
-    public $brandId = null;  // 品牌 id
-    public $isShow = 1;  // 商户状态（0：未上架，1：上架）
-    public $status = 0;  // 管理员状态（0：审核中，1：审核通过 -1: 未通过 -2: 下架）
-    public $isDel = 0;  // 是否删除
-    public $cateId = 0;  // 分类id
-    public $unitName = '';  // 单位名
-    public $sort = 0;  // 排序
-    public $rank = 0;  // 总后台排序
-    public $sales = 0;  // 销量
-    public $price = null;  // 最低价格
-    public $cost = null;  // 成本价
-    public $otPrice = null;  // 原价
-    public $stock = 0;  // 总库存
-    public $isHot = 0;  // 是否热卖
-    public $isBenefit = 0;  // 促销单品
-    public $isBest = 0;  // 是否精品
-    public $isNew = 0;  // 是否新品
-    public $isGood = 0;  // 是否优品推荐
-    public $productType = 0;  // 0.普通商品 1.秒杀商品
-    public $ficti = 100;  // 虚拟销量
-    public $browse = 0;  // 浏览量
-    public $codePath = '';  // 产品二维码地址(用户小程序海报)
-    public $videoLink = '';  // 主图视频链接
-    public $tempId = 1;  // 运费模板ID
-    public $specType = 0;  // 规格 0单 1多
-    public $extensionType = 0;  // 佣金比例 0.系统，1.自定义
-    public $refusal = null;  // 审核拒绝理由
-    public $rate = 5;  // 评价分数
-    public $replyCount = 0;  // 评论数
-    public $merStatus = 1;  // 商铺状态是否 1.正常 0. 非正常
-    public $giveCouponIds = null;  // 赠送优惠券
-    public $isGiftBag = 0;  // 是否为礼包
-    public $createTime = null;  // 添加时间
-    public $careCount = null;  // 收藏数
-    public $isUsed = 1;  // 显示/隐藏
-    public $oldProductId = 0;  // 原商品ID
-    public $volunteer = 0;  // 志愿者商品
-    public $type = 1;  // 商品类型：1：普通商品。2：爆款商品。3：消费积分商品
-    public $pension = null;  // 养老金（非百分比）特定商品类型可用
-    public $commission = '0';  // 返佣（百分比）特定类型商品可用
-    public $dcId = 0;  // 所属大仓ID
-    public $dcPrice = null;  // 大仓价格
-    public $seckill = 0;  // 是否秒杀 1是 0不是
-    public $isHide = 0;  // 秒杀 1不显示 0显示
-    public $spuId = null;  // 供应链商品ID
-    public $costPrice = null;  // 成本价格
-    public $gongSkuId = null;  // 供应商SKU ID
-    public $plateMerProfit = null;  // 平台创客利润
-    public $yanglaojinScale = null;  // 养老金比例：养老金/销售价
-    public $pensionIs = 0;  // 养老金单独设置是否开启 0-不开 1-开
-    public $shareIs = 0;  // 分享奖单独设置是否开启 0-不开 1-开
-    public $concessionPri = 0.00;  // 商品分润(商家让利)
-    public $argument = null;  // 下架说明理由
-    public $isStatus = 0;  // 0系统下架 1手动下架
-
-    public function getProductId(): int
-    {
-        return $this->productId;
-    }
-
-    public function setProductId(int $productId): ProductEntity
-    {
-        $this->productId = $productId;
-        return $this;
-    }
-
-    public function getMerId(): int
-    {
-        return $this->merId;
-    }
-
-    public function setMerId(int $merId): ProductEntity
-    {
-        $this->merId = $merId;
-        return $this;
-    }
-
-    public function getImage(): string
-    {
-        return $this->image;
-    }
-
-    public function setImage(string $image): ProductEntity
-    {
-        $this->image = $image;
-        return $this;
-    }
-
-    public function getSliderImage(): string
-    {
-        return $this->sliderImage;
-    }
-
-    public function setSliderImage(string $sliderImage): ProductEntity
-    {
-        $this->sliderImage = $sliderImage;
-        return $this;
-    }
-
-    public function getStoreName(): string
-    {
-        return $this->storeName;
-    }
-
-    public function setStoreName(string $storeName): ProductEntity
-    {
-        $this->storeName = $storeName;
-        return $this;
-    }
-
-    public function getStoreInfo(): string
-    {
-        return $this->storeInfo;
-    }
-
-    public function setStoreInfo(string $storeInfo): ProductEntity
-    {
-        $this->storeInfo = $storeInfo;
-        return $this;
-    }
-
-    public function getKeyword(): string
-    {
-        return $this->keyword;
-    }
-
-    public function setKeyword(string $keyword): ProductEntity
-    {
-        $this->keyword = $keyword;
-        return $this;
-    }
-
-    public function getBarCode(): string
-    {
-        return $this->barCode;
-    }
-
-    public function setBarCode(string $barCode): ProductEntity
-    {
-        $this->barCode = $barCode;
-        return $this;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getBrandId()
-    {
-        return $this->brandId;
-    }
-
-    /**
-     * @param mixed $brandId
-     * @return ProductEntity
-     */
-    public function setBrandId($brandId)
-    {
-        $this->brandId = $brandId;
-        return $this;
-    }
-
-    public function getIsShow(): int
-    {
-        return $this->isShow;
-    }
-
-    public function setIsShow(int $isShow): ProductEntity
-    {
-        $this->isShow = $isShow;
-        return $this;
-    }
-
-    public function getStatus(): int
-    {
-        return $this->status;
-    }
-
-    public function setStatus(int $status): ProductEntity
-    {
-        $this->status = $status;
-        return $this;
-    }
-
-    public function getIsDel(): int
-    {
-        return $this->isDel;
-    }
-
-    public function setIsDel(int $isDel): ProductEntity
-    {
-        $this->isDel = $isDel;
-        return $this;
-    }
-
-    public function getCateId(): int
-    {
-        return $this->cateId;
-    }
-
-    public function setCateId(int $cateId): ProductEntity
-    {
-        $this->cateId = $cateId;
-        return $this;
-    }
-
-    public function getUnitName(): string
-    {
-        return $this->unitName;
-    }
-
-    public function setUnitName(string $unitName): ProductEntity
-    {
-        $this->unitName = $unitName;
-        return $this;
-    }
-
-    public function getSort(): int
-    {
-        return $this->sort;
-    }
-
-    public function setSort(int $sort): ProductEntity
-    {
-        $this->sort = $sort;
-        return $this;
-    }
-
-    public function getRank(): int
-    {
-        return $this->rank;
-    }
-
-    public function setRank(int $rank): ProductEntity
-    {
-        $this->rank = $rank;
-        return $this;
-    }
-
-    public function getSales(): int
-    {
-        return $this->sales;
-    }
-
-    public function setSales(int $sales): ProductEntity
-    {
-        $this->sales = $sales;
-        return $this;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getPrice()
-    {
-        return $this->price;
-    }
-
-    /**
-     * @param mixed $price
-     * @return ProductEntity
-     */
-    public function setPrice($price)
-    {
-        $this->price = $price;
-        return $this;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getCost()
-    {
-        return $this->cost;
-    }
-
-    /**
-     * @param mixed $cost
-     * @return ProductEntity
-     */
-    public function setCost($cost)
-    {
-        $this->cost = $cost;
-        return $this;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getOtPrice()
-    {
-        return $this->otPrice;
-    }
-
-    /**
-     * @param mixed $otPrice
-     * @return ProductEntity
-     */
-    public function setOtPrice($otPrice)
-    {
-        $this->otPrice = $otPrice;
-        return $this;
-    }
-
-    public function getStock(): int
-    {
-        return $this->stock;
-    }
-
-    public function setStock(int $stock): ProductEntity
-    {
-        $this->stock = $stock;
-        return $this;
-    }
-
-    public function getIsHot(): int
-    {
-        return $this->isHot;
-    }
-
-    public function setIsHot(int $isHot): ProductEntity
-    {
-        $this->isHot = $isHot;
-        return $this;
-    }
-
-    public function getIsBenefit(): int
-    {
-        return $this->isBenefit;
-    }
-
-    public function setIsBenefit(int $isBenefit): ProductEntity
-    {
-        $this->isBenefit = $isBenefit;
-        return $this;
-    }
-
-    public function getIsBest(): int
-    {
-        return $this->isBest;
-    }
-
-    public function setIsBest(int $isBest): ProductEntity
-    {
-        $this->isBest = $isBest;
-        return $this;
-    }
-
-    public function getIsNew(): int
-    {
-        return $this->isNew;
-    }
-
-    public function setIsNew(int $isNew): ProductEntity
-    {
-        $this->isNew = $isNew;
-        return $this;
-    }
-
-    public function getIsGood(): int
-    {
-        return $this->isGood;
-    }
-
-    public function setIsGood(int $isGood): ProductEntity
-    {
-        $this->isGood = $isGood;
-        return $this;
-    }
-
-    public function getProductType(): int
-    {
-        return $this->productType;
-    }
-
-    public function setProductType(int $productType): ProductEntity
-    {
-        $this->productType = $productType;
-        return $this;
-    }
-
-    public function getFicti(): int
-    {
-        return $this->ficti;
-    }
-
-    public function setFicti(int $ficti): ProductEntity
-    {
-        $this->ficti = $ficti;
-        return $this;
-    }
-
-    public function getBrowse(): int
-    {
-        return $this->browse;
-    }
-
-    public function setBrowse(int $browse): ProductEntity
-    {
-        $this->browse = $browse;
-        return $this;
-    }
-
-    public function getCodePath(): string
-    {
-        return $this->codePath;
-    }
-
-    public function setCodePath(string $codePath): ProductEntity
-    {
-        $this->codePath = $codePath;
-        return $this;
-    }
-
-    public function getVideoLink(): string
-    {
-        return $this->videoLink;
-    }
-
-    public function setVideoLink(string $videoLink): ProductEntity
-    {
-        $this->videoLink = $videoLink;
-        return $this;
-    }
-
-    public function getTempId(): int
-    {
-        return $this->tempId;
-    }
-
-    public function setTempId(int $tempId): ProductEntity
-    {
-        $this->tempId = $tempId;
-        return $this;
-    }
-
-    public function getSpecType(): int
-    {
-        return $this->specType;
-    }
-
-    public function setSpecType(int $specType): ProductEntity
-    {
-        $this->specType = $specType;
-        return $this;
-    }
-
-    public function getExtensionType(): int
-    {
-        return $this->extensionType;
-    }
-
-    public function setExtensionType(int $extensionType): ProductEntity
-    {
-        $this->extensionType = $extensionType;
-        return $this;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getRefusal()
-    {
-        return $this->refusal;
-    }
-
-    /**
-     * @param mixed $refusal
-     * @return ProductEntity
-     */
-    public function setRefusal($refusal)
-    {
-        $this->refusal = $refusal;
-        return $this;
-    }
-
-    public function getRate(): int
-    {
-        return $this->rate;
-    }
-
-    public function setRate(int $rate): ProductEntity
-    {
-        $this->rate = $rate;
-        return $this;
-    }
-
-    public function getReplyCount(): int
-    {
-        return $this->replyCount;
-    }
-
-    public function setReplyCount(int $replyCount): ProductEntity
-    {
-        $this->replyCount = $replyCount;
-        return $this;
-    }
-
-    public function getMerStatus(): int
-    {
-        return $this->merStatus;
-    }
-
-    public function setMerStatus(int $merStatus): ProductEntity
-    {
-        $this->merStatus = $merStatus;
-        return $this;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getGiveCouponIds()
-    {
-        return $this->giveCouponIds;
-    }
-
-    /**
-     * @param mixed $giveCouponIds
-     * @return ProductEntity
-     */
-    public function setGiveCouponIds($giveCouponIds)
-    {
-        $this->giveCouponIds = $giveCouponIds;
-        return $this;
-    }
-
-    public function getIsGiftBag(): int
-    {
-        return $this->isGiftBag;
-    }
-
-    public function setIsGiftBag(int $isGiftBag): ProductEntity
-    {
-        $this->isGiftBag = $isGiftBag;
-        return $this;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getCreateTime()
-    {
-        return $this->createTime;
-    }
-
-    /**
-     * @param mixed $createTime
-     * @return ProductEntity
-     */
-    public function setCreateTime($createTime)
-    {
-        $this->createTime = $createTime;
-        return $this;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getCareCount()
-    {
-        return $this->careCount;
-    }
-
-    /**
-     * @param mixed $careCount
-     * @return ProductEntity
-     */
-    public function setCareCount($careCount)
-    {
-        $this->careCount = $careCount;
-        return $this;
-    }
-
-    public function getIsUsed(): int
-    {
-        return $this->isUsed;
-    }
-
-    public function setIsUsed(int $isUsed): ProductEntity
-    {
-        $this->isUsed = $isUsed;
-        return $this;
-    }
-
-    public function getOldProductId(): int
-    {
-        return $this->oldProductId;
-    }
-
-    public function setOldProductId(int $oldProductId): ProductEntity
-    {
-        $this->oldProductId = $oldProductId;
-        return $this;
-    }
-
-    public function getVolunteer(): int
-    {
-        return $this->volunteer;
-    }
-
-    public function setVolunteer(int $volunteer): ProductEntity
-    {
-        $this->volunteer = $volunteer;
-        return $this;
-    }
-
-    public function getType(): int
-    {
-        return $this->type;
-    }
-
-    public function setType(int $type): ProductEntity
-    {
-        $this->type = $type;
-        return $this;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getPension()
-    {
-        return $this->pension;
-    }
-
-    /**
-     * @param mixed $pension
-     * @return ProductEntity
-     */
-    public function setPension($pension)
-    {
-        $this->pension = $pension;
-        return $this;
-    }
-
-    public function getCommission(): string
-    {
-        return $this->commission;
-    }
-
-    public function setCommission(string $commission): ProductEntity
-    {
-        $this->commission = $commission;
-        return $this;
-    }
-
-    public function getDcId(): int
-    {
-        return $this->dcId;
-    }
-
-    public function setDcId(int $dcId): ProductEntity
-    {
-        $this->dcId = $dcId;
-        return $this;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getDcPrice()
-    {
-        return $this->dcPrice;
-    }
-
-    /**
-     * @param mixed $dcPrice
-     * @return ProductEntity
-     */
-    public function setDcPrice($dcPrice)
-    {
-        $this->dcPrice = $dcPrice;
-        return $this;
-    }
-
-    public function getSeckill(): int
-    {
-        return $this->seckill;
-    }
-
-    public function setSeckill(int $seckill): ProductEntity
-    {
-        $this->seckill = $seckill;
-        return $this;
-    }
-
-    public function getIsHide(): int
-    {
-        return $this->isHide;
-    }
-
-    public function setIsHide(int $isHide): ProductEntity
-    {
-        $this->isHide = $isHide;
-        return $this;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getSpuId()
-    {
-        return $this->spuId;
-    }
-
-    /**
-     * @param mixed $spuId
-     * @return ProductEntity
-     */
-    public function setSpuId($spuId)
-    {
-        $this->spuId = $spuId;
-        return $this;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getCostPrice()
-    {
-        return $this->costPrice;
-    }
-
-    /**
-     * @param mixed $costPrice
-     * @return ProductEntity
-     */
-    public function setCostPrice($costPrice)
-    {
-        $this->costPrice = $costPrice;
-        return $this;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getGongSkuId()
-    {
-        return $this->gongSkuId;
-    }
-
-    /**
-     * @param mixed $gongSkuId
-     * @return ProductEntity
-     */
-    public function setGongSkuId($gongSkuId)
-    {
-        $this->gongSkuId = $gongSkuId;
-        return $this;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getPlateMerProfit()
-    {
-        return $this->plateMerProfit;
-    }
-
-    /**
-     * @param mixed $plateMerProfit
-     * @return ProductEntity
-     */
-    public function setPlateMerProfit($plateMerProfit)
-    {
-        $this->plateMerProfit = $plateMerProfit;
-        return $this;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getYanglaojinScale()
-    {
-        return $this->yanglaojinScale;
-    }
-
-    /**
-     * @param mixed $yanglaojinScale
-     * @return ProductEntity
-     */
-    public function setYanglaojinScale($yanglaojinScale)
-    {
-        $this->yanglaojinScale = $yanglaojinScale;
-        return $this;
-    }
-
-    public function getPensionIs(): int
-    {
-        return $this->pensionIs;
-    }
-
-    public function setPensionIs(int $pensionIs): ProductEntity
-    {
-        $this->pensionIs = $pensionIs;
-        return $this;
-    }
-
-    public function getShareIs(): int
-    {
-        return $this->shareIs;
-    }
-
-    public function setShareIs(int $shareIs): ProductEntity
-    {
-        $this->shareIs = $shareIs;
-        return $this;
-    }
-
-    public function getConcessionPri(): float
-    {
-        return $this->concessionPri;
-    }
-
-    public function setConcessionPri(float $concessionPri): ProductEntity
-    {
-        $this->concessionPri = $concessionPri;
-        return $this;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getArgument()
-    {
-        return $this->argument;
-    }
-
-    /**
-     * @param mixed $argument
-     * @return ProductEntity
-     */
-    public function setArgument($argument)
-    {
-        $this->argument = $argument;
-        return $this;
-    }
-
-    public function getIsStatus(): int
-    {
-        return $this->isStatus;
-    }
-
-    public function setIsStatus(int $isStatus): ProductEntity
-    {
-        $this->isStatus = $isStatus;
-        return $this;
-    }
-}

app/entity/data/store/StoreGroupOrderEntity.php

@@ -6,299 +6,299 @@ use app\entity\data\DataEntity;
 
 class StoreGroupOrderEntity extends DataEntity
 {
-    public $groupOrderId = 0;  // 订单ID
-    public $groupOrderSn = '';  // 订单号
-    public $uid = 0;  // 用户ID
-    public $totalPostage = 0.00;  // 邮费
-    public $totalPrice = 0.00;  // 订单总额
-    public $totalNum = 0;  // 商品数
-    public $couponPrice = 0.00;  // 优惠金额
-    public $realName = '';  // 联系人
-    public $userPhone = '';  // 联系电话
-    public $userAddress = '';  // 收货地址
-    public $payPrice = 0.00;  // 支付金额
-    public $payPostage = 0.00;  // 支付邮费
-    public $cost = 0.00;  // 成本价
-    public $giveCouponIds = '';  // 赠送优惠券
-    public $paid = 0;  // 是否支付
+    public $groupOrderId = null;  // 订单组id
+    public $groupOrderSn = null;  // 订单号
+    public $uid = null;  // 用户id
+    public $totalPostage = null;  // 邮费
+    public $totalPrice = null;  // 订单总额
+    public $totalNum = null;  // 商品数
+    public $couponPrice = null;  // 优惠金额
+    public $realName = null;  // 联系人
+    public $userPhone = null;  // 联系电话
+    public $userAddress = null;  // 收货地址
+    public $payPrice = null;  // 支付金额
+    public $payPostage = null;  // 支付邮费
+    public $cost = null;  // 成本价
+    public $giveCouponIds = null;  // 赠送优惠券
+    public $paid = null;  // 是否支付
     public $payTime = null;  // 支付时间
-    public $payType = 0;  // 支付方式
+    public $payType = null;  // 支付方式
     public $createTime = null;  // 创建时间
-    public $isRemind = 0;  // 是否提醒
-    public $isDel = 0;  // 是否删除
-    public $rand = '';  // 订单号随机数
+    public $isRemind = null;  // 是否提醒
+    public $isDel = null;  // 是否删除
+    public $rand = null;  // 订单号随机数
     public $split = null;  // 分账状态
-    public $serialNumber = '';  // 首信易交易流水号
-    public $testOrder = 0;  // 是否为测试订单
-    public $hfPayId = '';  // 汇付订单id
+    public $serialNumber = null;  // 首信易交易流水号
+    public $testOrder = null;  // 测试订单
+    public $hfPayId = null;  // 汇付订单id
     public $payWx = null;  // 微信支付渠道后台设置
-    public $fzonePaytype = '';  // 组合支付
+    public $fzonePaytype = null;
 
     /**
-     * @return int
+     * @return mixed
      */
-    public function getGroupOrderId(): int
+    public function getGroupOrderId()
     {
         return $this->groupOrderId;
     }
 
     /**
-     * @param int $groupOrderId
+     * @param mixed $groupOrderId
      * @return StoreGroupOrderEntity
      */
-    public function setGroupOrderId(int $groupOrderId): StoreGroupOrderEntity
+    public function setGroupOrderId($groupOrderId): StoreGroupOrderEntity
     {
         $this->groupOrderId = $groupOrderId;
         return $this;
     }
 
     /**
-     * @return string
+     * @return mixed
      */
-    public function getGroupOrderSn(): string
+    public function getGroupOrderSn()
     {
         return $this->groupOrderSn;
     }
 
     /**
-     * @param string $groupOrderSn
+     * @param mixed $groupOrderSn
      * @return StoreGroupOrderEntity
      */
-    public function setGroupOrderSn(string $groupOrderSn): StoreGroupOrderEntity
+    public function setGroupOrderSn($groupOrderSn): StoreGroupOrderEntity
     {
         $this->groupOrderSn = $groupOrderSn;
         return $this;
     }
 
     /**
-     * @return int
+     * @return mixed
      */
-    public function getUid(): int
+    public function getUid()
     {
         return $this->uid;
     }
 
     /**
-     * @param int $uid
+     * @param mixed $uid
      * @return StoreGroupOrderEntity
      */
-    public function setUid(int $uid): StoreGroupOrderEntity
+    public function setUid($uid): StoreGroupOrderEntity
     {
         $this->uid = $uid;
         return $this;
     }
 
     /**
-     * @return float
+     * @return mixed
      */
-    public function getTotalPostage(): float
+    public function getTotalPostage()
     {
         return $this->totalPostage;
     }
 
     /**
-     * @param float $totalPostage
+     * @param mixed $totalPostage
      * @return StoreGroupOrderEntity
      */
-    public function setTotalPostage(float $totalPostage): StoreGroupOrderEntity
+    public function setTotalPostage($totalPostage): StoreGroupOrderEntity
     {
         $this->totalPostage = $totalPostage;
         return $this;
     }
 
     /**
-     * @return float
+     * @return mixed
      */
-    public function getTotalPrice(): float
+    public function getTotalPrice()
     {
         return $this->totalPrice;
     }
 
     /**
-     * @param float $totalPrice
+     * @param mixed $totalPrice
      * @return StoreGroupOrderEntity
      */
-    public function setTotalPrice(float $totalPrice): StoreGroupOrderEntity
+    public function setTotalPrice($totalPrice): StoreGroupOrderEntity
     {
         $this->totalPrice = $totalPrice;
         return $this;
     }
 
     /**
-     * @return int
+     * @return mixed
      */
-    public function getTotalNum(): int
+    public function getTotalNum()
     {
         return $this->totalNum;
     }
 
     /**
-     * @param int $totalNum
+     * @param mixed $totalNum
      * @return StoreGroupOrderEntity
      */
-    public function setTotalNum(int $totalNum): StoreGroupOrderEntity
+    public function setTotalNum($totalNum): StoreGroupOrderEntity
     {
         $this->totalNum = $totalNum;
         return $this;
     }
 
     /**
-     * @return float
+     * @return mixed
      */
-    public function getCouponPrice(): float
+    public function getCouponPrice()
     {
         return $this->couponPrice;
     }
 
     /**
-     * @param float $couponPrice
+     * @param mixed $couponPrice
      * @return StoreGroupOrderEntity
      */
-    public function setCouponPrice(float $couponPrice): StoreGroupOrderEntity
+    public function setCouponPrice($couponPrice): StoreGroupOrderEntity
     {
         $this->couponPrice = $couponPrice;
         return $this;
     }
 
     /**
-     * @return string
+     * @return mixed
      */
-    public function getRealName(): string
+    public function getRealName()
     {
         return $this->realName;
     }
 
     /**
-     * @param string $realName
+     * @param mixed $realName
      * @return StoreGroupOrderEntity
      */
-    public function setRealName(string $realName): StoreGroupOrderEntity
+    public function setRealName($realName): StoreGroupOrderEntity
     {
         $this->realName = $realName;
         return $this;
     }
 
     /**
-     * @return string
+     * @return mixed
      */
-    public function getUserPhone(): string
+    public function getUserPhone()
     {
         return $this->userPhone;
     }
 
     /**
-     * @param string $userPhone
+     * @param mixed $userPhone
      * @return StoreGroupOrderEntity
      */
-    public function setUserPhone(string $userPhone): StoreGroupOrderEntity
+    public function setUserPhone($userPhone): StoreGroupOrderEntity
     {
         $this->userPhone = $userPhone;
         return $this;
     }
 
     /**
-     * @return string
+     * @return mixed
      */
-    public function getUserAddress(): string
+    public function getUserAddress()
     {
         return $this->userAddress;
     }
 
     /**
-     * @param string $userAddress
+     * @param mixed $userAddress
      * @return StoreGroupOrderEntity
      */
-    public function setUserAddress(string $userAddress): StoreGroupOrderEntity
+    public function setUserAddress($userAddress): StoreGroupOrderEntity
     {
         $this->userAddress = $userAddress;
         return $this;
     }
 
     /**
-     * @return float
+     * @return mixed
      */
-    public function getPayPrice(): float
+    public function getPayPrice()
     {
         return $this->payPrice;
     }
 
     /**
-     * @param float $payPrice
+     * @param mixed $payPrice
      * @return StoreGroupOrderEntity
      */
-    public function setPayPrice(float $payPrice): StoreGroupOrderEntity
+    public function setPayPrice($payPrice): StoreGroupOrderEntity
     {
         $this->payPrice = $payPrice;
         return $this;
     }
 
     /**
-     * @return float
+     * @return mixed
      */
-    public function getPayPostage(): float
+    public function getPayPostage()
     {
         return $this->payPostage;
     }
 
     /**
-     * @param float $payPostage
+     * @param mixed $payPostage
      * @return StoreGroupOrderEntity
      */
-    public function setPayPostage(float $payPostage): StoreGroupOrderEntity
+    public function setPayPostage($payPostage): StoreGroupOrderEntity
     {
         $this->payPostage = $payPostage;
         return $this;
     }
 
     /**
-     * @return float
+     * @return mixed
      */
-    public function getCost(): float
+    public function getCost()
     {
         return $this->cost;
     }
 
     /**
-     * @param float $cost
+     * @param mixed $cost
      * @return StoreGroupOrderEntity
      */
-    public function setCost(float $cost): StoreGroupOrderEntity
+    public function setCost($cost): StoreGroupOrderEntity
     {
         $this->cost = $cost;
         return $this;
     }
 
     /**
-     * @return string
+     * @return mixed
      */
-    public function getGiveCouponIds(): string
+    public function getGiveCouponIds()
     {
         return $this->giveCouponIds;
     }
 
     /**
-     * @param string $giveCouponIds
+     * @param mixed $giveCouponIds
      * @return StoreGroupOrderEntity
      */
-    public function setGiveCouponIds(string $giveCouponIds): StoreGroupOrderEntity
+    public function setGiveCouponIds($giveCouponIds): StoreGroupOrderEntity
     {
         $this->giveCouponIds = $giveCouponIds;
         return $this;
     }
 
     /**
-     * @return int
+     * @return mixed
      */
-    public function getPaid(): int
+    public function getPaid()
     {
         return $this->paid;
     }
 
     /**
-     * @param int $paid
+     * @param mixed $paid
      * @return StoreGroupOrderEntity
      */
-    public function setPaid(int $paid): StoreGroupOrderEntity
+    public function setPaid($paid): StoreGroupOrderEntity
     {
         $this->paid = $paid;
         return $this;
@@ -323,18 +323,18 @@ class StoreGroupOrderEntity extends DataEntity
     }
 
     /**
-     * @return int
+     * @return mixed
      */
-    public function getPayType(): int
+    public function getPayType()
     {
         return $this->payType;
     }
 
     /**
-     * @param int $payType
+     * @param mixed $payType
      * @return StoreGroupOrderEntity
      */
-    public function setPayType(int $payType): StoreGroupOrderEntity
+    public function setPayType($payType): StoreGroupOrderEntity
     {
         $this->payType = $payType;
         return $this;
@@ -359,54 +359,54 @@ class StoreGroupOrderEntity extends DataEntity
     }
 
     /**
-     * @return int
+     * @return mixed
      */
-    public function getIsRemind(): int
+    public function getIsRemind()
     {
         return $this->isRemind;
     }
 
     /**
-     * @param int $isRemind
+     * @param mixed $isRemind
      * @return StoreGroupOrderEntity
      */
-    public function setIsRemind(int $isRemind): StoreGroupOrderEntity
+    public function setIsRemind($isRemind): StoreGroupOrderEntity
     {
         $this->isRemind = $isRemind;
         return $this;
     }
 
     /**
-     * @return int
+     * @return mixed
      */
-    public function getIsDel(): int
+    public function getIsDel()
     {
         return $this->isDel;
     }
 
     /**
-     * @param int $isDel
+     * @param mixed $isDel
      * @return StoreGroupOrderEntity
      */
-    public function setIsDel(int $isDel): StoreGroupOrderEntity
+    public function setIsDel($isDel): StoreGroupOrderEntity
     {
         $this->isDel = $isDel;
         return $this;
     }
 
     /**
-     * @return string
+     * @return mixed
      */
-    public function getRand(): string
+    public function getRand()
     {
         return $this->rand;
     }
 
     /**
-     * @param string $rand
+     * @param mixed $rand
      * @return StoreGroupOrderEntity
      */
-    public function setRand(string $rand): StoreGroupOrderEntity
+    public function setRand($rand): StoreGroupOrderEntity
     {
         $this->rand = $rand;
         return $this;
@@ -424,61 +424,61 @@ class StoreGroupOrderEntity extends DataEntity
      * @param mixed $split
      * @return StoreGroupOrderEntity
      */
-    public function setSplit($split)
+    public function setSplit($split): StoreGroupOrderEntity
     {
         $this->split = $split;
         return $this;
     }
 
     /**
-     * @return string
+     * @return mixed
      */
-    public function getSerialNumber(): string
+    public function getSerialNumber()
     {
         return $this->serialNumber;
     }
 
     /**
-     * @param string $serialNumber
+     * @param mixed $serialNumber
      * @return StoreGroupOrderEntity
      */
-    public function setSerialNumber(string $serialNumber): StoreGroupOrderEntity
+    public function setSerialNumber($serialNumber): StoreGroupOrderEntity
     {
         $this->serialNumber = $serialNumber;
         return $this;
     }
 
     /**
-     * @return int
+     * @return mixed
      */
-    public function getTestOrder(): int
+    public function getTestOrder()
     {
         return $this->testOrder;
     }
 
     /**
-     * @param int $testOrder
+     * @param mixed $testOrder
      * @return StoreGroupOrderEntity
      */
-    public function setTestOrder(int $testOrder): StoreGroupOrderEntity
+    public function setTestOrder($testOrder): StoreGroupOrderEntity
     {
         $this->testOrder = $testOrder;
         return $this;
     }
 
     /**
-     * @return string
+     * @return mixed
      */
-    public function getHfPayId(): string
+    public function getHfPayId()
     {
         return $this->hfPayId;
     }
 
     /**
-     * @param string $hfPayId
+     * @param mixed $hfPayId
      * @return StoreGroupOrderEntity
      */
-    public function setHfPayId(string $hfPayId): StoreGroupOrderEntity
+    public function setHfPayId($hfPayId): StoreGroupOrderEntity
     {
         $this->hfPayId = $hfPayId;
         return $this;
@@ -503,9 +503,9 @@ class StoreGroupOrderEntity extends DataEntity
     }
 
     /**
-     * @return string
+     * @return mixed
      */
-    public function getFzonePaytype(): string
+    public function getFzonePaytype()
     {
         return $this->fzonePaytype;
     }
@@ -528,5 +528,6 @@ class StoreGroupOrderEntity extends DataEntity
         }
         $this->fzonePaytype = $fzonePaytype;
         return $this;
+
     }
 }

app/entity/data/store/StoreProductAttrValueEntity.php

@@ -0,0 +1,522 @@
+<?php
+
+namespace app\entity\data\store;
+
+use app\entity\data\DataEntity;
+
+class StoreProductAttrValueEntity extends DataEntity
+{
+    public $productId = null;  // 商品ID
+    public $detail = null;  // 商品详情
+    public $sku = null;  // 商品属性索引值
+    public $stock = null;  // 属性对应的库存
+    public $sales = null;  // 销量
+    public $image = null;  // 图片
+    public $barCode = null;  // 产品条码
+    public $cost = null;  // 成本价
+    public $otPrice = null;  // 原价
+    public $price = null;  // 价格
+    public $volume = null;  // 体积
+    public $weight = null;  // 重量
+    public $type = null;  // 活动类型
+    public $extensionOne = null;  // 养老金
+    public $extensionTwo = null;  // 二级佣金
+    public $unique = null;  // 唯一值
+    public $dacangPrice = null;  // 大仓会员价
+    public $costPrice = null;  // 供应链成本价
+    public $gongSkuId = null;  // 供应链sku_id
+    public $gongMerProfit = null;  // 供应链创客利润
+    public $gongPension = null;  // 供应链养老金
+    public $gongMarketPrice = null;  // 供应链销售价
+    public $plateMerProfit = null;  // 商户创客利润
+    public $pensionNum = null;  // 养老金%
+    public $shareNum = null;  // 分享奖%
+    public $stockNum = null;  // 股权%
+    public $sharesNum = null;  // 股票
+
+    /**
+     * @return mixed
+     */
+    public function getProductId()
+    {
+        return $this->productId;
+    }
+
+    /**
+     * @param mixed $productId
+     * @return StoreProductAttrValueEntity
+     */
+    public function setProductId($productId): StoreProductAttrValueEntity
+    {
+        $this->productId = $productId;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getDetail()
+    {
+        return $this->detail;
+    }
+
+    /**
+     * @param mixed $detail
+     * @return StoreProductAttrValueEntity
+     */
+    public function setDetail($detail): StoreProductAttrValueEntity
+    {
+        $this->detail = $detail;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getSku()
+    {
+        return $this->sku;
+    }
+
+    /**
+     * @param mixed $sku
+     * @return StoreProductAttrValueEntity
+     */
+    public function setSku($sku): StoreProductAttrValueEntity
+    {
+        $this->sku = $sku;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getStock()
+    {
+        return $this->stock;
+    }
+
+    /**
+     * @param mixed $stock
+     * @return StoreProductAttrValueEntity
+     */
+    public function setStock($stock): StoreProductAttrValueEntity
+    {
+        $this->stock = $stock;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getSales()
+    {
+        return $this->sales;
+    }
+
+    /**
+     * @param mixed $sales
+     * @return StoreProductAttrValueEntity
+     */
+    public function setSales($sales): StoreProductAttrValueEntity
+    {
+        $this->sales = $sales;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getImage()
+    {
+        return $this->image;
+    }
+
+    /**
+     * @param null $image
+     * @return StoreProductAttrValueEntity
+     */
+    public function setImage($image): StoreProductAttrValueEntity
+    {
+        $this->image = $image;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getBarCode()
+    {
+        return $this->barCode;
+    }
+
+    /**
+     * @param null $barCode
+     * @return StoreProductAttrValueEntity
+     */
+    public function setBarCode($barCode): StoreProductAttrValueEntity
+    {
+        $this->barCode = $barCode;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getCost()
+    {
+        return $this->cost;
+    }
+
+    /**
+     * @param null $cost
+     * @return StoreProductAttrValueEntity
+     */
+    public function setCost($cost): StoreProductAttrValueEntity
+    {
+        $this->cost = $cost;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getOtPrice()
+    {
+        return $this->otPrice;
+    }
+
+    /**
+     * @param null $otPrice
+     * @return StoreProductAttrValueEntity
+     */
+    public function setOtPrice($otPrice): StoreProductAttrValueEntity
+    {
+        $this->otPrice = $otPrice;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getPrice()
+    {
+        return $this->price;
+    }
+
+    /**
+     * @param null $price
+     * @return StoreProductAttrValueEntity
+     */
+    public function setPrice($price): StoreProductAttrValueEntity
+    {
+        $this->price = $price;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getVolume()
+    {
+        return $this->volume;
+    }
+
+    /**
+     * @param null $volume
+     * @return StoreProductAttrValueEntity
+     */
+    public function setVolume($volume): StoreProductAttrValueEntity
+    {
+        $this->volume = $volume;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getWeight()
+    {
+        return $this->weight;
+    }
+
+    /**
+     * @param null $weight
+     * @return StoreProductAttrValueEntity
+     */
+    public function setWeight($weight): StoreProductAttrValueEntity
+    {
+        $this->weight = $weight;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getType()
+    {
+        return $this->type;
+    }
+
+    /**
+     * @param null $type
+     * @return StoreProductAttrValueEntity
+     */
+    public function setType($type): StoreProductAttrValueEntity
+    {
+        $this->type = $type;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getExtensionOne()
+    {
+        return $this->extensionOne;
+    }
+
+    /**
+     * @param null $extensionOne
+     * @return StoreProductAttrValueEntity
+     */
+    public function setExtensionOne($extensionOne): StoreProductAttrValueEntity
+    {
+        $this->extensionOne = $extensionOne;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getExtensionTwo()
+    {
+        return $this->extensionTwo;
+    }
+
+    /**
+     * @param null $extensionTwo
+     * @return StoreProductAttrValueEntity
+     */
+    public function setExtensionTwo($extensionTwo): StoreProductAttrValueEntity
+    {
+        $this->extensionTwo = $extensionTwo;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getUnique()
+    {
+        return $this->unique;
+    }
+
+    /**
+     * @param null $unique
+     * @return StoreProductAttrValueEntity
+     */
+    public function setUnique($unique): StoreProductAttrValueEntity
+    {
+        $this->unique = $unique;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getDacangPrice()
+    {
+        return $this->dacangPrice;
+    }
+
+    /**
+     * @param null $dacangPrice
+     * @return StoreProductAttrValueEntity
+     */
+    public function setDacangPrice($dacangPrice): StoreProductAttrValueEntity
+    {
+        $this->dacangPrice = $dacangPrice;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getCostPrice()
+    {
+        return $this->costPrice;
+    }
+
+    /**
+     * @param null $costPrice
+     * @return StoreProductAttrValueEntity
+     */
+    public function setCostPrice($costPrice): StoreProductAttrValueEntity
+    {
+        $this->costPrice = $costPrice;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getGongSkuId()
+    {
+        return $this->gongSkuId;
+    }
+
+    /**
+     * @param null $gongSkuId
+     * @return StoreProductAttrValueEntity
+     */
+    public function setGongSkuId($gongSkuId): StoreProductAttrValueEntity
+    {
+        $this->gongSkuId = $gongSkuId;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getGongMerProfit()
+    {
+        return $this->gongMerProfit;
+    }
+
+    /**
+     * @param null $gongMerProfit
+     * @return StoreProductAttrValueEntity
+     */
+    public function setGongMerProfit($gongMerProfit): StoreProductAttrValueEntity
+    {
+        $this->gongMerProfit = $gongMerProfit;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getGongPension()
+    {
+        return $this->gongPension;
+    }
+
+    /**
+     * @param null $gongPension
+     * @return StoreProductAttrValueEntity
+     */
+    public function setGongPension($gongPension): StoreProductAttrValueEntity
+    {
+        $this->gongPension = $gongPension;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getGongMarketPrice()
+    {
+        return $this->gongMarketPrice;
+    }
+
+    /**
+     * @param null $gongMarketPrice
+     * @return StoreProductAttrValueEntity
+     */
+    public function setGongMarketPrice($gongMarketPrice): StoreProductAttrValueEntity
+    {
+        $this->gongMarketPrice = $gongMarketPrice;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getPlateMerProfit()
+    {
+        return $this->plateMerProfit;
+    }
+
+    /**
+     * @param null $plateMerProfit
+     * @return StoreProductAttrValueEntity
+     */
+    public function setPlateMerProfit($plateMerProfit): StoreProductAttrValueEntity
+    {
+        $this->plateMerProfit = $plateMerProfit;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getPensionNum()
+    {
+        return $this->pensionNum;
+    }
+
+    /**
+     * @param null $pensionNum
+     * @return StoreProductAttrValueEntity
+     */
+    public function setPensionNum($pensionNum): StoreProductAttrValueEntity
+    {
+        $this->pensionNum = $pensionNum;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getShareNum()
+    {
+        return $this->shareNum;
+    }
+
+    /**
+     * @param null $shareNum
+     * @return StoreProductAttrValueEntity
+     */
+    public function setShareNum($shareNum): StoreProductAttrValueEntity
+    {
+        $this->shareNum = $shareNum;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getStockNum()
+    {
+        return $this->stockNum;
+    }
+
+    /**
+     * @param null $stockNum
+     * @return StoreProductAttrValueEntity
+     */
+    public function setStockNum($stockNum): StoreProductAttrValueEntity
+    {
+        $this->stockNum = $stockNum;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getSharesNum()
+    {
+        return $this->sharesNum;
+    }
+
+    /**
+     * @param null $sharesNum
+     * @return StoreProductAttrValueEntity
+     */
+    public function setSharesNum($sharesNum): StoreProductAttrValueEntity
+    {
+        $this->sharesNum = $sharesNum;
+        return $this;
+    }
+}

app/entity/data/user/UserPvLogEntity.php

@@ -6,173 +6,173 @@ use app\entity\data\DataEntity;
 
 class UserPvLogEntity extends DataEntity
 {
-    public $id = 0;  // 自增id
-    public $uid = 0;  // 会员id
-    public $pv = 0.00;  // pv值
-    public $status = 0;  // pv状态: 1-有效 0-失效 -1待确认
-    public $mark = '';  // 备注
-    public $orderId = '';  // 订单id
-    public $orderType = '';  // 订单类型
-    public $settlementTime = null;  // 结算时间
-    public $addtime = 0;  // 添加时间
+    public $id = null;  // 自增id
+    public $uid = null;  // 会员id
+    public $pv = null;  // pv值
+    public $status = null;  // pv状态1-有效 0-失效 -1待确认
+    public $mark = null;  // 备注
+    public $order_id = null;  // 订单id
+    public $order_type = null;  // 订单类型。关联订单ID
+    public $settlement_time = null;  // 结算时间
+    public $addtime = null;  // 添加时间
 
     /**
-     * @return int
+     * @return mixed
      */
-    public function getId(): int
+    public function getId()
     {
         return $this->id;
     }
 
     /**
-     * @param int $id
+     * @param mixed $id
      * @return UserPvLogEntity
      */
-    public function setId(int $id): UserPvLogEntity
+    public function setId($id): UserPvLogEntity
     {
         $this->id = $id;
         return $this;
     }
 
     /**
-     * @return int
+     * @return mixed
      */
-    public function getUid(): int
+    public function getUid()
     {
         return $this->uid;
     }
 
     /**
-     * @param int $uid
+     * @param mixed $uid
      * @return UserPvLogEntity
      */
-    public function setUid(int $uid): UserPvLogEntity
+    public function setUid($uid): UserPvLogEntity
     {
         $this->uid = $uid;
         return $this;
     }
 
     /**
-     * @return float
+     * @return mixed
      */
-    public function getPv(): float
+    public function getPv()
     {
         return $this->pv;
     }
 
     /**
-     * @param float $pv
+     * @param mixed $pv
      * @return UserPvLogEntity
      */
-    public function setPv(float $pv): UserPvLogEntity
+    public function setPv($pv): UserPvLogEntity
     {
         $this->pv = $pv;
         return $this;
     }
 
     /**
-     * @return int
+     * @return mixed
      */
-    public function getStatus(): int
+    public function getStatus()
     {
         return $this->status;
     }
 
     /**
-     * @param int $status
+     * @param mixed $status
      * @return UserPvLogEntity
      */
-    public function setStatus(int $status): UserPvLogEntity
+    public function setStatus($status): UserPvLogEntity
     {
         $this->status = $status;
         return $this;
     }
 
     /**
-     * @return string
+     * @return mixed
      */
-    public function getMark(): string
+    public function getMark()
     {
         return $this->mark;
     }
 
     /**
-     * @param string $mark
+     * @param mixed $mark
      * @return UserPvLogEntity
      */
-    public function setMark(string $mark): UserPvLogEntity
+    public function setMark($mark): UserPvLogEntity
     {
         $this->mark = $mark;
         return $this;
     }
 
     /**
-     * @return string
+     * @return mixed
      */
-    public function getOrderId(): string
+    public function getOrderId()
     {
-        return $this->orderId;
+        return $this->order_id;
     }
 
     /**
-     * @param string $orderId
+     * @param mixed $order_id
      * @return UserPvLogEntity
      */
-    public function setOrderId(string $orderId): UserPvLogEntity
+    public function setOrderId($order_id): UserPvLogEntity
     {
-        $this->orderId = $orderId;
+        $this->order_id = $order_id;
         return $this;
     }
 
     /**
-     * @return string
+     * @return mixed
      */
-    public function getOrderType(): string
+    public function getOrderType()
     {
-        return $this->orderType;
+        return $this->order_type;
     }
 
     /**
-     * @param string $orderType
+     * @param mixed $order_type
      * @return UserPvLogEntity
      */
-    public function setOrderType(string $orderType): UserPvLogEntity
+    public function setOrderType($order_type): UserPvLogEntity
     {
-        $this->orderType = $orderType;
+        $this->order_type = $order_type;
         return $this;
     }
 
     /**
-     * @return null
+     * @return mixed
      */
     public function getSettlementTime()
     {
-        return $this->settlementTime;
+        return $this->settlement_time;
     }
 
     /**
-     * @param null $settlementTime
+     * @param mixed $settlement_time
      * @return UserPvLogEntity
      */
-    public function setSettlementTime($settlementTime)
+    public function setSettlementTime($settlement_time): UserPvLogEntity
     {
-        $this->settlementTime = $settlementTime;
+        $this->settlement_time = $settlement_time;
         return $this;
     }
 
     /**
-     * @return int
+     * @return mixed
      */
-    public function getAddtime(): int
+    public function getAddtime()
     {
         return $this->addtime;
     }
 
     /**
-     * @param int $addtime
+     * @param mixed $addtime
      * @return UserPvLogEntity
      */
-    public function setAddtime(int $addtime): UserPvLogEntity
+    public function setAddtime($addtime): UserPvLogEntity
     {
         $this->addtime = $addtime;
         return $this;

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

@@ -14,6 +14,7 @@ class StoreOrderCreateRequestEntity extends RequestCommonEntity
     public $distributionMode = 0;
     public $fzonePayType = [];
     public $shareId = 0;
+    public $uid = 0;
 
     public function getCartId(): int
     {
@@ -105,4 +106,22 @@ class StoreOrderCreateRequestEntity extends RequestCommonEntity
         $this->shareId = $shareId;
         return $this;
     }
+
+    /**
+     * @return int
+     */
+    public function getUid(): int
+    {
+        return $this->uid;
+    }
+
+    /**
+     * @param int $uid
+     * @return StoreOrderCreateRequestEntity
+     */
+    public function setUid(int $uid): StoreOrderCreateRequestEntity
+    {
+        $this->uid = $uid;
+        return $this;
+    }
 }