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

app/common/dao/product/SeckillDao.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace app\common\dao\product;
+
+use app\common\dao\BaseDao;
+use app\common\enum\product\SeckillEnum;
+use app\common\model\product\SeckillModel;
+use app\entity\CommonEntity;
+use app\entity\data\product\SeckillEntity;
+
+class SeckillDao extends BaseDao
+{
+    /**
+     * @return string
+     */
+    protected function getModel(): string
+    {
+        return SeckillModel::class;
+    }
+
+    /**
+     * 根据 shareId 获取分享实体
+     * @param int $productId
+     * @return CommonEntity
+     */
+    public function getSeckillEntityByProductId(int $productId): CommonEntity
+    {
+        $data = [];
+        try {
+            /** @var SeckillModel $model */
+            $model = $this->getModel();
+            $dataRes = $model::getDB()
+                ->where('product_id', '=', $productId)
+                ->where("`seckill_date` <= '" . date('Y-m-d H:i:s') . "'")
+                ->where("status", '=', SeckillEnum::STATUS['Open']['code'])
+                ->find();
+            if (!empty($dataRes)) {
+                $data = $dataRes->toArray();
+            }
+        } catch (\Exception $e) {
+
+        }
+        return SeckillEntity::newInstance($data);
+    }
+}

app/common/dao/product/ShareDao.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace app\common\dao\product;
+
+use app\common\dao\BaseDao;
+use app\common\model\product\ShareModel;
+use app\entity\CommonEntity;
+use app\entity\data\product\ShareEntity;
+
+class ShareDao extends BaseDao
+{
+    /**
+     * @return string
+     */
+    protected function getModel(): string
+    {
+        return ShareModel::class;
+    }
+
+    /**
+     * 根据 shareId 获取分享实体
+     * @param int $shareId
+     * @return CommonEntity
+     */
+    public function getShareEntityByShareId(int $shareId): CommonEntity
+    {
+        $shareData = [];
+        try {
+            /** @var ShareModel $model */
+            $model = $this->getModel();
+            $shareDataRes = $model::getDB()
+                ->where('id', '=', $shareId)
+                ->find();
+            if (!empty($shareDataRes)) {
+                $shareData = $shareDataRes->toArray();
+            }
+        } catch (\Exception $e) {
+
+        }
+        return ShareEntity::newInstance($shareData);
+    }
+}

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

@@ -166,9 +166,14 @@ class StoreCartDao extends BaseDao
     {
         $storeCartData = [];
         try {
-            $storeCartData = Db::name('store_cart')
+            /** @var StoreCart  $model */
+            $model = $this->getModel();
+            $storeCartDataRes = $model::getDB()
                 ->where('cart_id', $cartId)
                 ->find();
+            if (!empty($storeCartDataRes)) {
+                $storeCartData = $storeCartDataRes->toArray();
+            }
         } catch (\Exception $e) {
         }
         return CartEntity::newInstance($storeCartData);

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

@@ -9,6 +9,7 @@ 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 think\facade\Db;
 
 /**
@@ -256,4 +257,25 @@ class ProductAttrValueDao extends BaseDao
             });
         return $query;
     }
+
+    /**
+     * @param string $unique
+     * @return \app\entity\CommonEntity
+     */
+    public function getProductAttrValueEntityByUnique(string $unique): \app\entity\CommonEntity
+    {
+        $data = [];
+        try {
+            /** @var model $model */
+            $model = $this->getModel();
+            $dataRes = $model::getDb()
+                ->where('unique', '=', $unique)
+                ->find();
+            if (!empty($dataRes)) {
+                $data = $dataRes->toArray();
+            }
+        } catch (\Exception $e) {
+        }
+        return ProductAttrValueEntity::newInstance($data);
+    }
 }

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

@@ -8,8 +8,10 @@
 namespace app\common\dao\store\product;
 
 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 think\Exception;
 use think\facade\Db;
 
@@ -435,4 +437,30 @@ class ProductDao extends BaseDao
             'is_gift_bag'   => 0,
         ];
     }
+
+    /**
+     * @param int $productId
+     * @return \app\entity\CommonEntity
+     */
+    public function getProductEntityByProductId(int $productId): \app\entity\CommonEntity
+    {
+        $productData = [];
+        try {
+            /** @var model $model */
+            $model = $this->getModel();
+            $productDataRes = $model::getDb()
+                ->where('product_id', '=', $productId)
+                ->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();
+            }
+        } catch (\Exception $e) {
+        }
+        return ProductEntity::newInstance($productData);
+    }
 }

app/common/dao/user/UserAddressDao.php

@@ -12,7 +12,10 @@ namespace app\common\dao\user;
 
 
 use app\common\dao\BaseDao;
+use app\common\enum\CommonEnum;
 use app\common\model\user\UserAddress as model;
+use app\entity\CommonEntity;
+use app\entity\data\user\AddressEntity;
 
 class UserAddressDao extends BaseDao
 {
@@ -42,4 +45,28 @@ class UserAddressDao extends BaseDao
     {
         return (($this->getModel()::getDB())->where('uid',$uid));
     }
+
+    /**
+     * 根据 地址ID 获取地址实体
+     * @param int $addressId
+     * @return CommonEntity
+     */
+    public function getAddressEntityByAddressId(int $addressId): CommonEntity
+    {
+        $addressData = [];
+        try {
+            /** @var model $model */
+            $model = $this->getModel();
+            $addressDataRes = $model::getDB()
+                ->where('address_id', '=', $addressId)
+                ->where('is_del', '=', CommonEnum::IS_DEL['No']['code'])
+                ->find();
+            if (!empty($addressDataRes)) {
+                $addressData = $addressDataRes->toArray();
+            }
+        } catch (\Exception $e) {
+
+        }
+        return AddressEntity::newInstance($addressData);
+    }
 }

app/common/dao/user/UserDao.php

@@ -390,11 +390,14 @@ class UserDao extends BaseDao
     {
         $userData = [];
         try {
-            $userData = User::getDB()
+            $userDataRes = User::getDB()
                 ->where('uid', $uid)
                 ->where('is_del', '=', UserEnum::IS_DEL['No']['code'])
                 ->where('status', '=', UserEnum::STATUS['Normal']['code'])
                 ->find();
+            if (!empty($userDataRes)) {
+                $userData = $userDataRes->toArray();
+            }
         } catch (\Exception $e) {
         }
         return UserEntity::newInstance($userData);

app/common/enum/product/SeckillEnum.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace app\common\enum\product;
+
+use app\common\enum\CommonEnum;
+
+class SeckillEnum extends CommonEnum
+{
+    const STATUS = [
+        'Close' => ['code' => 0, 'name' => '关闭'],
+        'Open' => ['code' => 1, 'name' => '开启'],
+        'Over' => ['code' => 2, 'name' => '已结束']
+    ];
+}

app/common/enum/store/CartEnum.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace app\common\enum\store;
+
+use app\common\enum\CommonEnum;
+
+class CartEnum extends CommonEnum
+{
+    const PRODUCT_TYPE = [
+        'Ordinary' => ['code' => 0, 'name' => '普通产品']
+    ];
+
+    const IS_FAIL = [
+        'No' => ['code' => 0, 'name' => '未失效'],
+        'Yes' => ['code' => 1, 'name' => '失效']
+    ];
+}

app/common/enum/store/ProductEnum.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace app\common\enum\store;
+
+use app\common\enum\CommonEnum;
+
+class ProductEnum extends CommonEnum
+{
+    const STATUS = [
+        'Pending' => ['code' => 0, 'name' => '审核中'],
+        'Approved' => ['code' => 1, 'name' => '审核通过'],
+        'Rejected' => ['code' => -1, 'name' => '未通过'],
+        'Withdrawn' => ['code' => -2, 'name' => '下架'],
+    ];
+
+    const IS_SHOW = [
+        'No' => ['code' => 0, 'name' => '未上架'],
+        'Yes' => ['code' => 1, 'name' => '上架']
+    ];
+
+    const IS_USED = [
+        'No' => ['code' => 0, 'name' => '隐藏'],
+        'Yes' => ['code' => 1, 'name' => '显示']
+    ];
+
+    const MER_STATUS = [
+        'No' => ['code' => 0, 'name' => '非正常'],
+        'Yes' => ['code' => 1, 'name' => '正常']
+    ];
+}

app/common/model/product/SeckillModel.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace app\common\model\product;
+
+use app\common\model\BaseModel;
+
+class SeckillModel extends BaseModel
+{
+
+    public static function tablePk(): ?string
+    {
+        return 'id';
+    }
+
+    public static function tableName(): string
+    {
+        return 'product_seckill';
+    }
+}

app/common/model/product/ShareModel.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace app\common\model\product;
+
+use app\common\model\BaseModel;
+
+class ShareModel extends BaseModel
+{
+
+    public static function tablePk(): ?string
+    {
+        return 'id';
+    }
+
+    public static function tableName(): string
+    {
+        return 'product_share';
+    }
+}

app/common/repositories/product/SeckillRepository.php

@@ -0,0 +1,26 @@
+<?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/product/ShareRepository.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace app\common\repositories\product;
+
+use app\common\dao\product\ShareDao;
+use app\common\repositories\BaseRepository;
+use app\entity\data\product\ShareEntity;
+
+class ShareRepository extends BaseRepository
+{
+    public function __construct(ShareDao $dao)
+    {
+        $this->dao = $dao;
+    }
+
+    /**
+     * @param int $shareId
+     * @return ShareEntity
+     */
+    public function getShareEntityByShareId(int $shareId): ShareEntity
+    {
+        /** @var ShareEntity $shareEntity */
+        $shareEntity = $this->dao->getShareEntityByShareId($shareId);
+        return $shareEntity;
+    }
+}

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

@@ -8,6 +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\traits\GongApiRequest;
 use think\exception\ValidateException;
 use crmeb\exceptions\AuthException;
@@ -159,4 +160,15 @@ class ProductAttrValueRepository extends BaseRepository
         }
         return true;
     }
+
+    /**
+     * @param string $unique
+     * @return ProductAttrValueEntity
+     */
+    public function getProductAttrValueEntityByUnique(string $unique): ProductAttrValueEntity
+    {
+        /** @var ProductAttrValueEntity $productAttrValueEntity */
+        $productAttrValueEntity = $this->dao->getProductAttrValueEntityByUnique($unique);
+        return $productAttrValueEntity;
+    }
 }

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

@@ -23,6 +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\traits\ShouxinyiApiRequest;
 use crmeb\exceptions\ApiException;
 use crmeb\services\QrcodeService;
@@ -2107,4 +2108,15 @@ class ProductRepository extends BaseRepository
         //返佣总额 返利总额=（交易金额-手续费）*返利比例
         return decimal2(bcmul($price-$souxufees,$base_commission/100,3));
     }
+
+    /**
+     * @param int $productId
+     * @return ProductEntity
+     */
+    public function getProductEntityByProductId(int $productId): ProductEntity
+    {
+        /** @var ProductEntity $productEntity */
+        $productEntity = $this->dao->getProductEntityByProductId($productId);
+        return $productEntity;
+    }
 }

app/common/repositories/user/UserAddressRepository.php

@@ -10,6 +10,7 @@ namespace app\common\repositories\user;
 use app\common\repositories\BaseRepository;
 use app\common\dao\user\UserAddressDao as dao;
 use app\common\repositories\store\shipping\CityRepository;
+use app\entity\data\user\AddressEntity;
 
 /**
  * Class UserAddressRepository
@@ -122,4 +123,17 @@ class UserAddressRepository extends BaseRepository
         }
         return $address;
     }
+
+    /**
+     * 根据 地址ID 获取地址实体
+     *
+     * @param $addressId
+     * @return AddressEntity
+     */
+    public function getAddressEntityByAddressId($addressId): AddressEntity
+    {
+        /** @var AddressEntity $addressEntity */
+        $addressEntity = $this->dao->getAddressEntityByAddressId($addressId);
+        return $addressEntity;
+    }
 }

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

@@ -15,6 +15,7 @@ use app\common\enum\user\UserEnum;
 use app\common\model\store\order\StoreRefundOrder;
 use app\common\model\system\admin\Log;
 use app\common\repositories\merchant\MerchantRepository;
+use app\common\repositories\product\ShareRepository;
 use app\common\repositories\store\product\ProductAttrValueRepository;
 use app\common\repositories\user\UserAddressRepository;
 use app\common\repositories\user\UserRepository;
@@ -715,7 +716,8 @@ class StoreOrder extends BaseController
         /** @var StoreOrderCreateRequestEntity $storeOrderCreateRequestEntity */
         $storeOrderCreateRequestEntity = $storeOrderCreateValidateResult['data'];
         // 根据用户ID 获取用户实体信息
-        $uid = $this->request->uid();
+        // $uid = $this->request->uid();
+        $uid = 1592;
 
         // 2、加锁，他之前加的锁好像在锁狗屎，毛线都没锁住, 而且为什么要锁用户
         // 增加锁，防止同一用户重读点击
@@ -732,6 +734,7 @@ class StoreOrder extends BaseController
             return app('json')->fail('获取当前用户信息失败');
         }
 
+        // 目前购物车只能添加一件商品，据了解之前 写的购物车，添加多件商品组合支付时计算的 金额和 VR 积分之类的会有问题
         /** @var StoreCartRepository $storeCartRepository */
         $storeCartRepository = app()->make(StoreCartRepository::class);
         $cartEntity = $storeCartRepository->getCartEntityByCartId($storeOrderCreateRequestEntity->getCartId());
@@ -748,11 +751,27 @@ class StoreOrder extends BaseController
             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());
+
 
-        $this->repository->createOrderNew($storeOrderCreateRequestEntity, $userEntity, $cartEntity);
+        $result = $this->repository->createOrderNew($storeOrderCreateRequestEntity, $userEntity, $cartEntity, $addressEntity, $shareEntity);
         
         
-        return app('json')->success('aaa', $storeOrderCreateRequestEntity);
+        return app('json')->success('aaa', $result);
         $uid = $this->request->uid();
 
         $this->repository->createOrderNew($uid, $allParams);

app/entity/CommonEntity.php

@@ -2,6 +2,7 @@
 
 namespace app\entity;
 
+use app\utils\ArrayUtil;
 use ReflectionClass;
 
 class CommonEntity
@@ -17,6 +18,7 @@ class CommonEntity
             return new static();
         } else {
             $instance = new static();
+            $data = ArrayUtil::underline2CamelArr($data);
             foreach ($instance as $ik => $iv) {
                 if (isset($data[$ik])) {
                     $setFunctionName = 'set' . ucfirst($ik);

app/entity/aggregate/AggregateEntity.php

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

app/entity/aggregate/store/CartAggregateEntity.php

@@ -0,0 +1,188 @@
+<?php
+
+namespace app\entity\aggregate\store;
+
+use app\entity\aggregate\AggregateEntity;
+
+class CartAggregateEntity extends AggregateEntity
+{
+    public $cartId = 0;  // 购物车表ID
+    public $uid = 0;  // 用户ID
+    public $merId = 0;  // 商户ID
+    public $productType = 0;  // 类型 0=普通产品
+    public $productId = 0;  // 商品ID
+    public $productAttrUnique = '';  // 商品属性
+    public $cartNum = 0;  // 商品数量
+    public $createTime = null;  // 添加时间
+    public $source = 0;  // 来源 1=直播间
+    public $sourceId = 0;  // 来源关联ID
+    public $isPay = 0;  // 0 = 未购买 1 = 已购买
+    public $isDel = 0;  // 是否删除
+    public $isNew = 0;  // 是否为立即购买
+    public $isFail = 0;  // 是否失效
+
+
+
+
+
+    public function getCartId(): int
+    {
+        return $this->cartId;
+    }
+
+    public function setCartId(int $cartId): CartAggregateEntity
+    {
+        $this->cartId = $cartId;
+        return $this;
+    }
+
+    public function getUid(): int
+    {
+        return $this->uid;
+    }
+
+    public function setUid(int $uid): CartAggregateEntity
+    {
+        $this->uid = $uid;
+        return $this;
+    }
+
+    public function getMerId(): int
+    {
+        return $this->merId;
+    }
+
+    public function setMerId(int $merId): CartAggregateEntity
+    {
+        $this->merId = $merId;
+        return $this;
+    }
+
+    public function getProductType(): int
+    {
+        return $this->productType;
+    }
+
+    public function setProductType(int $productType): CartAggregateEntity
+    {
+        $this->productType = $productType;
+        return $this;
+    }
+
+    public function getProductId(): int
+    {
+        return $this->productId;
+    }
+
+    public function setProductId(int $productId): CartAggregateEntity
+    {
+        $this->productId = $productId;
+        return $this;
+    }
+
+    public function getProductAttrUnique(): string
+    {
+        return $this->productAttrUnique;
+    }
+
+    public function setProductAttrUnique(string $productAttrUnique): CartAggregateEntity
+    {
+        $this->productAttrUnique = $productAttrUnique;
+        return $this;
+    }
+
+    public function getCartNum(): int
+    {
+        return $this->cartNum;
+    }
+
+    public function setCartNum(int $cartNum): CartAggregateEntity
+    {
+        $this->cartNum = $cartNum;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getCreateTime()
+    {
+        return $this->createTime;
+    }
+
+    /**
+     * @param null $createTime
+     * @return CartAggregateEntity
+     */
+    public function setCreateTime($createTime)
+    {
+        $this->createTime = $createTime;
+        return $this;
+    }
+
+    public function getSource(): int
+    {
+        return $this->source;
+    }
+
+    public function setSource(int $source): CartAggregateEntity
+    {
+        $this->source = $source;
+        return $this;
+    }
+
+    public function getSourceId(): int
+    {
+        return $this->sourceId;
+    }
+
+    public function setSourceId(int $sourceId): CartAggregateEntity
+    {
+        $this->sourceId = $sourceId;
+        return $this;
+    }
+
+    public function getIsPay(): int
+    {
+        return $this->isPay;
+    }
+
+    public function setIsPay(int $isPay): CartAggregateEntity
+    {
+        $this->isPay = $isPay;
+        return $this;
+    }
+
+    public function getIsDel(): int
+    {
+        return $this->isDel;
+    }
+
+    public function setIsDel(int $isDel): CartAggregateEntity
+    {
+        $this->isDel = $isDel;
+        return $this;
+    }
+
+    public function getIsNew(): int
+    {
+        return $this->isNew;
+    }
+
+    public function setIsNew(int $isNew): CartAggregateEntity
+    {
+        $this->isNew = $isNew;
+        return $this;
+    }
+
+    public function getIsFail(): int
+    {
+        return $this->isFail;
+    }
+
+    public function setIsFail(int $isFail): CartAggregateEntity
+    {
+        $this->isFail = $isFail;
+        return $this;
+    }
+}

app/entity/data/product/SeckillEntity.php

@@ -0,0 +1,95 @@
+<?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/product/ShareEntity.php

@@ -0,0 +1,105 @@
+<?php
+
+namespace app\entity\data\product;
+
+use app\entity\data\DataEntity;
+
+class ShareEntity extends DataEntity
+{
+    public $id = 0;  // 分享记录id
+    public $uid = 0;  // 用户ID
+    public $productId = 0;  // 商品ID
+    public $shareChannel = 0;  // 分享渠道 1 微信好友 2微信朋友圈
+    public $clickNum = '0';  // 分享点击次数
+    public $buyNum = '0';  // 购买次数
+    public $ctime = '';  // 创建时间
+    public $url = '';   // 分享链接
+
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+    public function setId(int $id): ShareEntity
+    {
+        $this->id = $id;
+        return $this;
+    }
+
+    public function getUid(): int
+    {
+        return $this->uid;
+    }
+
+    public function setUid(int $uid): ShareEntity
+    {
+        $this->uid = $uid;
+        return $this;
+    }
+
+    public function getProductId(): int
+    {
+        return $this->productId;
+    }
+
+    public function setProductId(int $productId): ShareEntity
+    {
+        $this->productId = $productId;
+        return $this;
+    }
+
+    public function getShareChannel(): int
+    {
+        return $this->shareChannel;
+    }
+
+    public function setShareChannel(int $shareChannel): ShareEntity
+    {
+        $this->shareChannel = $shareChannel;
+        return $this;
+    }
+
+    public function getClickNum(): string
+    {
+        return $this->clickNum;
+    }
+
+    public function setClickNum(string $clickNum): ShareEntity
+    {
+        $this->clickNum = $clickNum;
+        return $this;
+    }
+
+    public function getBuyNum(): string
+    {
+        return $this->buyNum;
+    }
+
+    public function setBuyNum(string $buyNum): ShareEntity
+    {
+        $this->buyNum = $buyNum;
+        return $this;
+    }
+
+    public function getCtime(): string
+    {
+        return $this->ctime;
+    }
+
+    public function setCtime(string $ctime): ShareEntity
+    {
+        $this->ctime = $ctime;
+        return $this;
+    }
+
+    public function getUrl(): string
+    {
+        return $this->url;
+    }
+
+    public function setUrl(string $url): ShareEntity
+    {
+        $this->url = $url;
+        return $this;
+    }
+}

app/entity/data/store/ProductAttrValueEntity.php

@@ -0,0 +1,396 @@
+<?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';  // 股票
+
+    public function getProductId(): int
+    {
+        return $this->productId;
+    }
+
+    public function setProductId(int $productId): ProductAttrValueEntity
+    {
+        $this->productId = $productId;
+        return $this;
+    }
+
+    public function getDetail(): string
+    {
+        return $this->detail;
+    }
+
+    public function setDetail(string $detail): ProductAttrValueEntity
+    {
+        $this->detail = $detail;
+        return $this;
+    }
+
+    public function getSku(): string
+    {
+        return $this->sku;
+    }
+
+    public function setSku(string $sku): ProductAttrValueEntity
+    {
+        $this->sku = $sku;
+        return $this;
+    }
+
+    public function getStock(): int
+    {
+        return $this->stock;
+    }
+
+    public function setStock(int $stock): ProductAttrValueEntity
+    {
+        $this->stock = $stock;
+        return $this;
+    }
+
+    public function getSales(): int
+    {
+        return $this->sales;
+    }
+
+    public function setSales(int $sales): ProductAttrValueEntity
+    {
+        $this->sales = $sales;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getImage()
+    {
+        return $this->image;
+    }
+
+    /**
+     * @param null $image
+     * @return ProductAttrValueEntity
+     */
+    public function setImage($image)
+    {
+        $this->image = $image;
+        return $this;
+    }
+
+    public function getBarCode(): string
+    {
+        return $this->barCode;
+    }
+
+    public function setBarCode(string $barCode): ProductAttrValueEntity
+    {
+        $this->barCode = $barCode;
+        return $this;
+    }
+
+    public function getCost(): float
+    {
+        return $this->cost;
+    }
+
+    public function setCost(float $cost): ProductAttrValueEntity
+    {
+        $this->cost = $cost;
+        return $this;
+    }
+
+    public function getOtPrice(): float
+    {
+        return $this->otPrice;
+    }
+
+    public function setOtPrice(float $otPrice): ProductAttrValueEntity
+    {
+        $this->otPrice = $otPrice;
+        return $this;
+    }
+
+    public function getPrice(): float
+    {
+        return $this->price;
+    }
+
+    public function setPrice(float $price): ProductAttrValueEntity
+    {
+        $this->price = $price;
+        return $this;
+    }
+
+    public function getVolume(): float
+    {
+        return $this->volume;
+    }
+
+    public function setVolume(float $volume): ProductAttrValueEntity
+    {
+        $this->volume = $volume;
+        return $this;
+    }
+
+    public function getWeight(): float
+    {
+        return $this->weight;
+    }
+
+    public function setWeight(float $weight): ProductAttrValueEntity
+    {
+        $this->weight = $weight;
+        return $this;
+    }
+
+    public function getType(): int
+    {
+        return $this->type;
+    }
+
+    public function setType(int $type): ProductAttrValueEntity
+    {
+        $this->type = $type;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getExtensionOne()
+    {
+        return $this->extensionOne;
+    }
+
+    /**
+     * @param null $extensionOne
+     * @return ProductAttrValueEntity
+     */
+    public function setExtensionOne($extensionOne)
+    {
+        $this->extensionOne = $extensionOne;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getExtensionTwo()
+    {
+        return $this->extensionTwo;
+    }
+
+    /**
+     * @param null $extensionTwo
+     * @return ProductAttrValueEntity
+     */
+    public function setExtensionTwo($extensionTwo)
+    {
+        $this->extensionTwo = $extensionTwo;
+        return $this;
+    }
+
+    public function getUnique(): string
+    {
+        return $this->unique;
+    }
+
+    public function setUnique(string $unique): ProductAttrValueEntity
+    {
+        $this->unique = $unique;
+        return $this;
+    }
+
+    public function getDacangPrice(): float
+    {
+        return $this->dacangPrice;
+    }
+
+    public function setDacangPrice(float $dacangPrice): ProductAttrValueEntity
+    {
+        $this->dacangPrice = $dacangPrice;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getCostPrice()
+    {
+        return $this->costPrice;
+    }
+
+    /**
+     * @param null $costPrice
+     * @return ProductAttrValueEntity
+     */
+    public function setCostPrice($costPrice)
+    {
+        $this->costPrice = $costPrice;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getGongSkuId()
+    {
+        return $this->gongSkuId;
+    }
+
+    /**
+     * @param null $gongSkuId
+     * @return ProductAttrValueEntity
+     */
+    public function setGongSkuId($gongSkuId)
+    {
+        $this->gongSkuId = $gongSkuId;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getGongMerProfit()
+    {
+        return $this->gongMerProfit;
+    }
+
+    /**
+     * @param null $gongMerProfit
+     * @return ProductAttrValueEntity
+     */
+    public function setGongMerProfit($gongMerProfit)
+    {
+        $this->gongMerProfit = $gongMerProfit;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getGongPension()
+    {
+        return $this->gongPension;
+    }
+
+    /**
+     * @param null $gongPension
+     * @return ProductAttrValueEntity
+     */
+    public function setGongPension($gongPension)
+    {
+        $this->gongPension = $gongPension;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getGongMarketPrice()
+    {
+        return $this->gongMarketPrice;
+    }
+
+    /**
+     * @param null $gongMarketPrice
+     * @return ProductAttrValueEntity
+     */
+    public function setGongMarketPrice($gongMarketPrice)
+    {
+        $this->gongMarketPrice = $gongMarketPrice;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getPlateMerProfit()
+    {
+        return $this->plateMerProfit;
+    }
+
+    /**
+     * @param null $plateMerProfit
+     * @return ProductAttrValueEntity
+     */
+    public function setPlateMerProfit($plateMerProfit)
+    {
+        $this->plateMerProfit = $plateMerProfit;
+        return $this;
+    }
+
+    public function getPensionNum(): string
+    {
+        return $this->pensionNum;
+    }
+
+    public function setPensionNum(string $pensionNum): ProductAttrValueEntity
+    {
+        $this->pensionNum = $pensionNum;
+        return $this;
+    }
+
+    public function getShareNum(): string
+    {
+        return $this->shareNum;
+    }
+
+    public function setShareNum(string $shareNum): ProductAttrValueEntity
+    {
+        $this->shareNum = $shareNum;
+        return $this;
+    }
+
+    public function getStockNum(): string
+    {
+        return $this->stockNum;
+    }
+
+    public function setStockNum(string $stockNum): ProductAttrValueEntity
+    {
+        $this->stockNum = $stockNum;
+        return $this;
+    }
+
+    public function getSharesNum(): string
+    {
+        return $this->sharesNum;
+    }
+
+    public function setSharesNum(string $sharesNum): ProductAttrValueEntity
+    {
+        $this->sharesNum = $sharesNum;
+        return $this;
+    }
+}

app/entity/data/store/ProductEntity.php

@@ -0,0 +1,865 @@
+<?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 null
+     */
+    public function getBrandId()
+    {
+        return $this->brandId;
+    }
+
+    /**
+     * @param null $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 null
+     */
+    public function getPrice()
+    {
+        return $this->price;
+    }
+
+    /**
+     * @param null $price
+     * @return ProductEntity
+     */
+    public function setPrice($price)
+    {
+        $this->price = $price;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getCost()
+    {
+        return $this->cost;
+    }
+
+    /**
+     * @param null $cost
+     * @return ProductEntity
+     */
+    public function setCost($cost)
+    {
+        $this->cost = $cost;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getOtPrice()
+    {
+        return $this->otPrice;
+    }
+
+    /**
+     * @param null $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 null
+     */
+    public function getRefusal()
+    {
+        return $this->refusal;
+    }
+
+    /**
+     * @param null $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 null
+     */
+    public function getGiveCouponIds()
+    {
+        return $this->giveCouponIds;
+    }
+
+    /**
+     * @param null $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 null
+     */
+    public function getCreateTime()
+    {
+        return $this->createTime;
+    }
+
+    /**
+     * @param null $createTime
+     * @return ProductEntity
+     */
+    public function setCreateTime($createTime)
+    {
+        $this->createTime = $createTime;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getCareCount()
+    {
+        return $this->careCount;
+    }
+
+    /**
+     * @param null $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 null
+     */
+    public function getPension()
+    {
+        return $this->pension;
+    }
+
+    /**
+     * @param null $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 null
+     */
+    public function getDcPrice()
+    {
+        return $this->dcPrice;
+    }
+
+    /**
+     * @param null $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 null
+     */
+    public function getSpuId()
+    {
+        return $this->spuId;
+    }
+
+    /**
+     * @param null $spuId
+     * @return ProductEntity
+     */
+    public function setSpuId($spuId)
+    {
+        $this->spuId = $spuId;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getCostPrice()
+    {
+        return $this->costPrice;
+    }
+
+    /**
+     * @param null $costPrice
+     * @return ProductEntity
+     */
+    public function setCostPrice($costPrice)
+    {
+        $this->costPrice = $costPrice;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getGongSkuId()
+    {
+        return $this->gongSkuId;
+    }
+
+    /**
+     * @param null $gongSkuId
+     * @return ProductEntity
+     */
+    public function setGongSkuId($gongSkuId)
+    {
+        $this->gongSkuId = $gongSkuId;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getPlateMerProfit()
+    {
+        return $this->plateMerProfit;
+    }
+
+    /**
+     * @param null $plateMerProfit
+     * @return ProductEntity
+     */
+    public function setPlateMerProfit($plateMerProfit)
+    {
+        $this->plateMerProfit = $plateMerProfit;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getYanglaojinScale()
+    {
+        return $this->yanglaojinScale;
+    }
+
+    /**
+     * @param null $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 null
+     */
+    public function getArgument()
+    {
+        return $this->argument;
+    }
+
+    /**
+     * @param null $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/user/AddressEntity.php

@@ -0,0 +1,247 @@
+<?php
+
+namespace app\entity\data\user;
+
+use app\entity\data\DataEntity;
+
+class AddressEntity extends DataEntity
+{
+    public $addressId = 0;  // 用户地址id
+    public $uid = 0;  // 用户id
+    public $realName = '';  // 收货人姓名
+    public $phone = '';  // 收货人电话
+    public $province = '';  // 收货人所在省
+    public $city = '';  // 收货人所在市
+    public $cityId = 0;  // 城市id
+    public $district = '';  // 收货人所在区
+    public $village = '';  // 收货人所在村
+    public $villageId = 0;  // 村id
+    public $detail = '';  // 收货人详细地址
+    public $postCode = 0;  // 邮编
+    public $longitude = '0';  // 经度
+    public $latitude = '0';  // 纬度
+    public $isDefault = 0;  // 是否默认
+    public $isDel = 0;  // 是否删除
+    public $createTime = null;  // 添加时间
+    public $codeList = '';  // 地址id（regions）
+
+    public $codeListByDecode = [];  // 地址id（regions）
+
+    public function getAddressId(): int
+    {
+        return $this->addressId;
+    }
+
+    public function setAddressId(int $addressId): AddressEntity
+    {
+        $this->addressId = $addressId;
+        return $this;
+    }
+
+    public function getUid(): int
+    {
+        return $this->uid;
+    }
+
+    public function setUid(int $uid): AddressEntity
+    {
+        $this->uid = $uid;
+        return $this;
+    }
+
+    public function getRealName(): string
+    {
+        return $this->realName;
+    }
+
+    public function setRealName(string $realName): AddressEntity
+    {
+        $this->realName = $realName;
+        return $this;
+    }
+
+    public function getPhone(): string
+    {
+        return $this->phone;
+    }
+
+    public function setPhone(string $phone): AddressEntity
+    {
+        $this->phone = $phone;
+        return $this;
+    }
+
+    public function getProvince(): string
+    {
+        return $this->province;
+    }
+
+    public function setProvince(string $province): AddressEntity
+    {
+        $this->province = $province;
+        return $this;
+    }
+
+    public function getCity(): string
+    {
+        return $this->city;
+    }
+
+    public function setCity(string $city): AddressEntity
+    {
+        $this->city = $city;
+        return $this;
+    }
+
+    public function getCityId(): int
+    {
+        return $this->cityId;
+    }
+
+    public function setCityId(int $cityId): AddressEntity
+    {
+        $this->cityId = $cityId;
+        return $this;
+    }
+
+    public function getDistrict(): string
+    {
+        return $this->district;
+    }
+
+    public function setDistrict(string $district): AddressEntity
+    {
+        $this->district = $district;
+        return $this;
+    }
+
+    public function getVillage(): string
+    {
+        return $this->village;
+    }
+
+    public function setVillage(string $village): AddressEntity
+    {
+        $this->village = $village;
+        return $this;
+    }
+
+    public function getVillageId(): int
+    {
+        return $this->villageId;
+    }
+
+    public function setVillageId(int $villageId): AddressEntity
+    {
+        $this->villageId = $villageId;
+        return $this;
+    }
+
+    public function getDetail(): string
+    {
+        return $this->detail;
+    }
+
+    public function setDetail(string $detail): AddressEntity
+    {
+        $this->detail = $detail;
+        return $this;
+    }
+
+    public function getPostCode(): int
+    {
+        return $this->postCode;
+    }
+
+    public function setPostCode(int $postCode): AddressEntity
+    {
+        $this->postCode = $postCode;
+        return $this;
+    }
+
+    public function getLongitude(): string
+    {
+        return $this->longitude;
+    }
+
+    public function setLongitude(string $longitude): AddressEntity
+    {
+        $this->longitude = $longitude;
+        return $this;
+    }
+
+    public function getLatitude(): string
+    {
+        return $this->latitude;
+    }
+
+    public function setLatitude(string $latitude): AddressEntity
+    {
+        $this->latitude = $latitude;
+        return $this;
+    }
+
+    public function getIsDefault(): int
+    {
+        return $this->isDefault;
+    }
+
+    public function setIsDefault(int $isDefault): AddressEntity
+    {
+        $this->isDefault = $isDefault;
+        return $this;
+    }
+
+    public function getIsDel(): int
+    {
+        return $this->isDel;
+    }
+
+    public function setIsDel(int $isDel): AddressEntity
+    {
+        $this->isDel = $isDel;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getCreateTime(): ?string
+    {
+        return $this->createTime;
+    }
+
+    /**
+     * @param string $createTime
+     * @return AddressEntity
+     */
+    public function setCreateTime(string $createTime): AddressEntity
+    {
+        $this->createTime = $createTime;
+        return $this;
+    }
+
+    public function getCodeList(): string
+    {
+        return $this->codeList;
+    }
+
+    public function setCodeList(string $codeList): AddressEntity
+    {
+        $this->codeListByDecode = explode(',', $codeList);
+        $this->codeList = $codeList;
+        return $this;
+    }
+
+    public function getCodeListByDecode(): array
+    {
+        return $this->codeListByDecode;
+    }
+
+    public function setCodeListByDecode(array $codeListByDecode): AddressEntity
+    {
+        $this->codeListByDecode = $codeListByDecode;
+        $this->codeList = implode(',', $codeListByDecode);
+        return $this;
+    }
+}

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

@@ -45,13 +45,11 @@ class StoreOrderCreateValidate extends CommonValidate
         if (!$this->check($data)) {
             return ['status' => 'error', 'message' => $this->getError()];
         }
-        var_dump($data);
 
-        $data['fzonePayType'] = json_decode($data['fzone_paytype'], true);
+        $data['fzonePayType'] = is_array($data['fzone_paytype']) ? $data['fzone_paytype'] : (is_string($data['fzone_paytype']) ? json_decode($data['fzone_paytype'], true) : []);
         if (empty($data['fzonePayType']['type'] ?? null)) {
             return ['status' => 'error', 'message' => '请选择支付方式!'];
         }
-        $data = ArrayUtil::underline2CamelArr($data);
         return ['status' => 'success', 'data' => StoreOrderCreateRequestEntity::newInstance($data)];
     }
 }