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

app/common/dao/user/UserAddressDao.php

@@ -15,7 +15,7 @@ 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;
+use app\entity\data\user\UserAddressEntity;
 
 class UserAddressDao extends BaseDao
 {
@@ -67,6 +67,6 @@ class UserAddressDao extends BaseDao
         } catch (\Exception $e) {
 
         }
-        return AddressEntity::newInstance($addressData);
+        return UserAddressEntity::newInstance($addressData);
     }
 }

app/common/dao/user/UserBillDao.php

@@ -249,7 +249,7 @@ class UserBillDao extends BaseDao
     public function saveAll($dataList): array
     {
         try {
-            return $this->getModel()->saveAll($dataList)->toArray();
+            return $this->getModel()::getInstance()->allowField(array_keys(reset($dataList)))->saveAll($dataList)->toArray();
         } catch (\Exception $e) {
             return [];
         }

app/common/dao/user/UserDao.php

@@ -441,7 +441,7 @@ class UserDao extends BaseDao
     public function saveAll($dataList): array
     {
         try {
-            return $this->getModel()->saveAll($dataList)->toArray();
+            return $this->getModel()::getInstance()->allowField(array_keys(reset($dataList)))->saveAll($dataList)->toArray();
         } catch (\Exception $e) {
             return [];
         }

app/common/dao/user/UserPvLogDao.php

@@ -81,7 +81,7 @@ class UserPvLogDao extends BaseDao
     public function saveAll($dataList): array
     {
         try {
-            return $this->getModel()->saveAll($dataList)->toArray();
+            return $this->getModel()::getInstance()->allowField(array_keys(reset($dataList)))->saveAll($dataList)->toArray();
         } catch (\Exception $e) {
             return [];
         }

app/common/dao/user/UserSignGongxianDao.php

@@ -81,7 +81,7 @@ class UserSignGongxianDao extends BaseDao
     public function saveAll($dataList): array
     {
         try {
-            return $this->getModel()->saveAll($dataList)->toArray();
+            return $this->getModel()::getInstance()->allowField(array_keys(reset($dataList)))->saveAll($dataList)->toArray();
         } catch (\Exception $e) {
             return [];
         }

app/common/dao/user/UserSignHongbaoDao.php

@@ -81,7 +81,7 @@ class UserSignHongbaoDao extends BaseDao
     public function saveAll($dataList): array
     {
         try {
-            return $this->getModel()->saveAll($dataList)->toArray();
+            return $this->getModel()::getInstance()->allowField(array_keys(reset($dataList)))->saveAll($dataList)->toArray();
         } catch (\Exception $e) {
             return [];
         }

app/common/dao/user/UserSignScoreDao.php

@@ -37,8 +37,6 @@ class UserSignScoreDao extends BaseDao
                 ->whereIn('id', $idList)
                 ->select()
                 ->toArray();
-            Log::info('$dataRes - getUserSignScoreEntityListByIdList');
-            Log::info($dataRes);
             if (!empty($dataRes)) {
                 $entityList = array_map(function ($data) {
                     return UserSignScoreEntity::newInstance($data);
@@ -84,7 +82,7 @@ class UserSignScoreDao extends BaseDao
     public function saveAll($dataList): array
     {
         try {
-            return $this->getModel()->saveAll($dataList)->toArray();
+            return $this->getModel()::getInstance()->allowField(array_keys(reset($dataList)))->saveAll($dataList)->toArray();
         } catch (\Exception $e) {
             return [];
         }

app/common/dao/user/UserSignVrDao.php

@@ -3,12 +3,16 @@
 namespace app\common\dao\user;
 
 use app\common\dao\BaseDao;
+use app\common\model\BaseModel;
 use app\common\model\user\UserSignVr;
 use app\entity\CommonEntity;
 use app\entity\data\user\UserSignVrEntity;
 
 class UserSignVrDao extends BaseDao
 {
+    /**
+     * @return BaseModel
+     */
     protected function getModel(): string
     {
         return UserSignVr::class;
@@ -18,7 +22,7 @@ class UserSignVrDao extends BaseDao
      * @param array $idList
      * @return CommonEntity[]
      */
-    public function getStoreSignVrEntityListByIdList(array $idList): array
+    public function getUserSignVrEntityListByIdList(array $idList): array
     {
         $entityList = [];
         try {
@@ -38,4 +42,18 @@ class UserSignVrDao extends BaseDao
         }
         return $entityList;
     }
+
+    /**
+     * 批量更新
+     * @param $dataList
+     * @return array
+     */
+    public function saveAll($dataList): array
+    {
+        try {
+            return $this->getModel()::getInstance()->allowField(array_keys(reset($dataList)))->saveAll($dataList)->toArray();
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
 }

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

@@ -81,7 +81,7 @@ use app\entity\data\store\StoreProductAttrValueEntity;
 use app\entity\data\store\StoreProductEntity;
 use app\entity\data\store\StoreGroupOrderEntity;
 use app\entity\data\store\StoreOrderEntity;
-use app\entity\data\user\AddressEntity;
+use app\entity\data\user\UserAddressEntity;
 use app\entity\data\user\UserBillEntity;
 use app\entity\data\user\UserEntity;
 use app\entity\monomer\store\FzonePayTypeEntity;
@@ -10719,17 +10719,17 @@ class StoreOrderRepository extends BaseRepository
     /**
      * 根据 用户信息 订单信息 支付信息 判断用户是否满足支付条件，并进行扣款
      * @param UserEntity $userEntity
-     * @param StoreGroupOrderEntity $storeGroupOrderEntity
+     * @param StoreOrderEntity $storeOrderEntity
      * @param FzonePayTypeEntity $fzonePayTypeEntity
      * @return bool
      */
-    public function abatement(UserEntity $userEntity, StoreGroupOrderEntity $storeGroupOrderEntity, FzonePayTypeEntity $fzonePayTypeEntity): bool
+    public function abatement(UserEntity $userEntity, StoreOrderEntity $storeOrderEntity, FzonePayTypeEntity $fzonePayTypeEntity): bool
     {
         if (empty($userEntity->getUid())) {
             throw new ValidateException('未查询到用户信息');
         }
 
-        if (empty($storeGroupOrderEntity->getGroupOrderId())) {
+        if (empty($storeOrderEntity->getOrderId())) {
             throw new ValidateException('未查询到订单信息');
         }
 
@@ -10753,9 +10753,9 @@ class StoreOrderRepository extends BaseRepository
                 $userEntity->getUid(),
                 UserSignVrEnum::TYPE['Consume']['code'],
                 $fzonePayTypeEntity->getPrice(),
-                '购买商品，订单编号：' . $storeGroupOrderEntity->getGroupOrderSn(),
-                CommonEnum::ORDER_TYPE['Platform-Group']['code'],
-                $storeGroupOrderEntity->getGroupOrderId()
+                '购买商品，订单编号：' . $storeOrderEntity->getOrderSn(),
+                UserSignVrEnum::ORDER_TYPE['Platform']['code'],
+                $storeOrderEntity->getOrderId()
             );
             // 执行 Vr 增减 操作
             $userSignVrRepository->execute($userSignVrEntity->getId());
@@ -10766,9 +10766,9 @@ class StoreOrderRepository extends BaseRepository
                 UserSignScoreEnum::SOURCE_TYPE['SelfOrder']['code'],
                 UserSignScoreEnum::PM['Expend']['code'],
                 $fzonePayTypeEntity->getOther(),
-                '购买商品，订单编号：' . $storeGroupOrderEntity->getGroupOrderSn(),
-                UserSignHongbaoEnum::ORDER_TYPE['Platform']['code'],
-                $storeGroupOrderEntity->getGroupOrderId()
+                '购买商品，订单编号：' . $storeOrderEntity->getOrderSn(),
+                UserSignScoreEnum::ORDER_TYPE['Platform']['code'],
+                $storeOrderEntity->getOrderId()
             );
             $userSignScoreRepository->execute($userSignScoreEntity->getId());
 
@@ -10787,9 +10787,9 @@ class StoreOrderRepository extends BaseRepository
                 $userEntity->getUid(),
                 UserSignVrEnum::TYPE['Consume']['code'],
                 $fzonePayTypeEntity->getPrice(),
-                '购买商品，订单编号：' . $storeGroupOrderEntity->getGroupOrderSn(),
-                CommonEnum::ORDER_TYPE['Platform-Group']['code'],
-                $storeGroupOrderEntity->getGroupOrderId()
+                '购买商品，订单编号：' . $storeOrderEntity->getOrderSn(),
+                UserSignVrEnum::ORDER_TYPE['Platform']['code'],
+                $storeOrderEntity->getOrderId()
             );
             // 执行 Vr 增减 操作
             $userSignVrRepository->execute($userSignVrEntity->getId());
@@ -10800,9 +10800,9 @@ class StoreOrderRepository extends BaseRepository
                 UserSignJingdouEnum::TYPE['Consume']['code'],
                 $fzonePayTypeEntity->getOther(),
                 0,
-                '购买商品，订单编号：' . $storeGroupOrderEntity->getGroupOrderSn(),
-                CommonEnum::ORDER_TYPE['Platform-Group']['code'],
-                $storeGroupOrderEntity->getGroupOrderId()
+                '购买商品，订单编号：' . $storeOrderEntity->getOrderSn(),
+                CommonEnum::ORDER_TYPE['Platform']['code'],
+                $storeOrderEntity->getOrderId()
             );
             // 执行 京豆 增减 操作
             $userSignJingdouRepository->execute($userSignJingdouEntity->getId());
@@ -10821,9 +10821,9 @@ class StoreOrderRepository extends BaseRepository
                 $userEntity->getUid(),
                 UserSignVrEnum::TYPE['Consume']['code'],
                 $fzonePayTypeEntity->getPrice(),
-                '购买商品，订单编号：' . $storeGroupOrderEntity->getGroupOrderSn(),
-                CommonEnum::ORDER_TYPE['Platform-Group']['code'],
-                $storeGroupOrderEntity->getGroupOrderId()
+                '购买商品，订单编号：' . $storeOrderEntity->getOrderSn(),
+                CommonEnum::ORDER_TYPE['Platform']['code'],
+                $storeOrderEntity->getOrderId()
             );
             // 执行 Vr 增减 操作
             $userSignVrRepository->execute($userSignVrEntity->getId());
@@ -10837,9 +10837,9 @@ class StoreOrderRepository extends BaseRepository
                 $userEntity->getUid(),
                 UserSignVrEnum::TYPE['Consume']['code'],
                 $fzonePayTypeEntity->getPrice(),
-                '购买商品，订单编号：' . $storeGroupOrderEntity->getGroupOrderSn(),
-                CommonEnum::ORDER_TYPE['Platform-Group']['code'],
-                $storeGroupOrderEntity->getGroupOrderId()
+                '购买商品，订单编号：' . $storeOrderEntity->getOrderSn(),
+                CommonEnum::ORDER_TYPE['Platform']['code'],
+                $storeOrderEntity->getOrderId()
             );
             // 执行 Vr 增减 操作
             $userSignVrRepository->execute($userSignVrEntity->getId());
@@ -10861,9 +10861,9 @@ class StoreOrderRepository extends BaseRepository
                 UserSignFugouEnum::TYPE['Give']['code'],
                 $fzonePayTypeEntity->getPrice(),
                 UserSignFugouEnum::COMMISSION_TYPE['DIRECT_REFERRAL']['code'],
-                '购买商品，订单编号：' . $storeGroupOrderEntity->getGroupOrderSn(),
-                CommonEnum::ORDER_TYPE['Platform-Group']['code'],
-                $storeGroupOrderEntity->getGroupOrderId()
+                '购买商品，订单编号：' . $storeOrderEntity->getOrderSn(),
+                CommonEnum::ORDER_TYPE['Platform']['code'],
+                $storeOrderEntity->getOrderId()
             );
             // 执行
             $userSignFugouRepository->execute($userSignFugouEntity->getId());
@@ -11708,7 +11708,7 @@ class StoreOrderRepository extends BaseRepository
         $cartEntityList = $verifyResult['cartEntityList'];
         $cartEntityMap = array_column($cartEntityList, null, 'cartId');
         $cartIdList = array_keys($cartEntityMap);
-        /** @var AddressEntity $addressEntity 地址信息 */
+        /** @var UserAddressEntity $addressEntity 地址信息 */
         $addressEntity = $verifyResult['addressEntity'];
         /** @var ShareEntity $shareEntity 订单所带的分享信息 */
         $shareEntity = $verifyResult['shareEntity'];
@@ -11993,33 +11993,29 @@ class StoreOrderRepository extends BaseRepository
             ->setFzonePaytype($storeOrderCreateRequestEntity->getFzonePayType());
 
         // 4、写入数据
-        Db::startTrans();
+        // Db::startTrans();
         try {
             // 4.1 更细库存
-            foreach ($productStockList as $item) {
-                $productRepository->descStock($item['productId'], $item['cartNum']);
-            }
-            foreach ($productAttrValueStockList as $item) {
-                $productAttrValueRepository->descStock($item['productId'], $item['unique'], $item['cartNum']);
-            }
+            // foreach ($productStockList as $item) {
+            //     $productRepository->descStock($item['productId'], $item['cartNum']);
+            // }
+            // foreach ($productAttrValueStockList as $item) {
+            //     $productAttrValueRepository->descStock($item['productId'], $item['unique'], $item['cartNum']);
+            // }
 
             // 4.2 修改 购物车状态
-            $storeCartRepository->updateIsPayByCartIdList($cartIdList);
+            // $storeCartRepository->updateIsPayByCartIdList($cartIdList);
 
             // 4.3 写入 组合订单 (支付订单)
             /** @var StoreGroupOrderRepository $storeGroupOrderRepository */
             $storeGroupOrderRepository = app()->make(StoreGroupOrderRepository::class);
             $storeGroupOrderEntity = $storeGroupOrderRepository->createByEntity($storeGroupOrderEntity);
 
-            // 4.4 验证是否 可以进行支付
-            /** @var FzonePayTypeEntity $fzonePayTypeEntity */
-            $fzonePayTypeEntity = FzonePayTypeEntity::newInstance($storeOrderCreateRequestEntity->getFzonePayType());
-            $paySuccess = $this->abatement($userEntity, $storeGroupOrderEntity, $fzonePayTypeEntity);
-
             // 4.5 写入订单数据
             $storeOrderStatusDataList = [];
             $storeOrderProductDataList = [];
             $storeOrderIdList = [];
+            $paySuccess = true; // 是否已完成支付 并支付成功
             foreach ($storeOrderEntityList as $key => $storeOrderEntity) {
                 // 获取当前 订单绑定的购物车
                 $cartEntity = $cartEntityMap[$storeOrderEntity->getCartId()];
@@ -12031,6 +12027,14 @@ class StoreOrderRepository extends BaseRepository
                 $storeOrderEntityList[$key] = $storeOrderEntity;
                 $storeOrderIdList[] = $storeOrderEntity->getOrderId();
 
+                // 4.4 验证是否 可以进行支付 因为历史的 用户资金（佣金、养老金、积分、VR等）扣减所绑定的orderId都是订单ID
+                /** @var FzonePayTypeEntity $fzonePayTypeEntity */
+                $fzonePayTypeEntity = FzonePayTypeEntity::newInstance($storeOrderCreateRequestEntity->getFzonePayType());
+                // 当有一笔支付失败时，默认整个 订单组 没有支付成功
+                if (!$this->abatement($userEntity, $storeOrderEntity, $fzonePayTypeEntity)) {
+                    $paySuccess = false;
+                }
+
                 // 将每件商品设计到的优惠券要取消掉
 
                 // 准备订单的 状态数据
@@ -12083,7 +12087,7 @@ class StoreOrderRepository extends BaseRepository
                     'paid' => StoreOrderEnum::PAID['YES']['code'],
                     'pay_time' => date('Y-m-d H:i:s'),
                     'status' => StoreOrderEnum::STATUS['WAITING_SHIPMENT']['code'],
-                    'distribution_mode' => StoreOrderEnum::DISTRIBUTION_MODE['ExpressDelivery']
+                    'distribution_mode' => StoreOrderEnum::DISTRIBUTION_MODE['ExpressDelivery']['code']
                 ]);
                 $settlementOrderIdList = [];
                 foreach ($storeOrderEntityList as $storeOrderEntity) {
@@ -12100,9 +12104,9 @@ class StoreOrderRepository extends BaseRepository
                 }
             }
 
-            Db::commit();
+            // Db::commit();
         } catch (DbException $e) {
-            Db::rollback();
+            // Db::rollback();
         }
         return ['order_id' => $storeGroupOrderEntity->getGroupOrderId(), 'groupOrder' => $storeGroupOrderEntity->toArray()];
 

app/common/repositories/user/UserAddressRepository.php

@@ -10,7 +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;
+use app\entity\data\user\UserAddressEntity;
 
 /**
  * Class UserAddressRepository
@@ -128,11 +128,11 @@ class UserAddressRepository extends BaseRepository
      * 根据 地址ID 获取地址实体
      *
      * @param $addressId
-     * @return AddressEntity
+     * @return UserAddressEntity
      */
-    public function getAddressEntityByAddressId($addressId): AddressEntity
+    public function getAddressEntityByAddressId($addressId): UserAddressEntity
     {
-        /** @var AddressEntity $addressEntity */
+        /** @var UserAddressEntity $addressEntity */
         $addressEntity = $this->dao->getAddressEntityByAddressId($addressId);
         return $addressEntity;
     }

app/common/repositories/user/UserRepository.php

@@ -4575,7 +4575,7 @@ class UserRepository extends BaseRepository
             $userSignScoreEntity = UserSignScoreEntity::newInstance();
             $userSignScoreEntity->setUid($uid)
                 ->setPm($type)
-                ->setRewardScore($score)
+                ->setRewardSocre($score)
                 ->setAddtime(time())
                 ->setStatus(UserSignScoreEnum::STATUS['Valid']['code'])
                 ->setOrderType($orderType)

app/common/repositories/user/UserSignScoreRepository.php

@@ -65,7 +65,7 @@ class UserSignScoreRepository extends BaseRepository
      */
     public function createByEntity(UserSignScoreEntity $userSignScoreEntity): UserSignScoreEntity
     {
-        $result = $this->dao->create($userSignScoreEntity->toUnderlineArray())->toArray();
+        $result = $this->create($userSignScoreEntity->toUnderlineArray())->toArray();
         /** @var UserSignScoreEntity $entity */
         $entity = UserSignScoreEntity::newInstance($result);
         return $entity;
@@ -103,7 +103,7 @@ class UserSignScoreRepository extends BaseRepository
         $userSignScoreEntity->setUid($uid)
             ->setSourceType($sourceType)
             ->setPm($type)
-            ->setRewardScore($number)
+            ->setRewardSocre($number)
             ->setMark($mark)
             ->setOrderType($orderType)
             ->setOrderId($orderId)
@@ -200,12 +200,12 @@ class UserSignScoreRepository extends BaseRepository
 
                 if ($userSignScoreEntity->getPm() == UserSignScoreEnum::PM['Expend']['code']) {
                     // 支出
-                    $updateUserEntity->setScore(bcsub($updateUserEntity->getScore(), $userSignScoreEntity->getRewardScore(), 2));
+                    $updateUserEntity->setScore(bcsub($updateUserEntity->getScore(), $userSignScoreEntity->getRewardSocre(), 2));
                     if ($updateUserEntity->getScore() < 0.00) {
                         throw new ValidateException('用户积分不足');
                     }
                 } else {
-                    $updateUserEntity->setScore(bcadd($updateUserEntity->getScore(), $userSignScoreEntity->getRewardScore(), 2));
+                    $updateUserEntity->setScore(bcadd($updateUserEntity->getScore(), $userSignScoreEntity->getRewardSocre(), 2));
                 }
                 $updateUserSignScoreEntity->setSurplus($updateUserEntity->getScore());
 
@@ -221,7 +221,7 @@ class UserSignScoreRepository extends BaseRepository
                     );
                 }
 
-                if (!empty($updateUserBillEntityList)) {
+                if (!empty($updateUserScoreEntityList)) {
                     $this->batchUpdateUserSignScoreDataByDataList(
                         array_map(function (UserSignScoreEntity $updateUserSignScoreEntity) {
                             return $updateUserSignScoreEntity->toUnderlineArray();

app/common/repositories/user/UserSignVrRepository.php

@@ -6,6 +6,7 @@ use app\common\dao\user\UserSignVrDao;
 use app\common\enum\user\UserSignVrEnum;
 use app\common\repositories\BaseRepository;
 use app\common\repositories\store\order\StoreOrderRepository;
+use app\entity\data\user\UserEntity;
 use app\entity\data\user\UserSignVrEntity;
 use think\db\exception\DbException;
 use think\exception\ValidateException;
@@ -26,9 +27,9 @@ class UserSignVrRepository extends BaseRepository
      * @param int $id
      * @return UserSignVrEntity
      */
-    public function getStoreSignVrEntityById(int $id): UserSignVrEntity
+    public function getUserSignVrEntityById(int $id): UserSignVrEntity
     {
-        $entityList = $this->getStoreSignVrEntityListByIdList([$id]);
+        $entityList = $this->getUserSignVrEntityListByIdList([$id]);
         $entity = array_shift($entityList);
         if ($entity instanceof UserSignVrEntity) {
             return $entity;
@@ -42,9 +43,9 @@ class UserSignVrRepository extends BaseRepository
      * @param array $idList
      * @return UserSignVrEntity[]
      */
-    public function getStoreSignVrEntityListByIdList(array $idList): array
+    public function getUserSignVrEntityListByIdList(array $idList): array
     {
-        return $this->dao->getStoreSignVrEntityListByIdList($idList);
+        return $this->dao->getUserSignVrEntityListByIdList($idList);
     }
 
     /**
@@ -102,44 +103,121 @@ class UserSignVrRepository extends BaseRepository
     /**
      * 将 Vr 记录设置为生效状态 并对用户的 Vr 字段进行增减
      * @param int $id
-     * @return UserSignVrEntity
+     * @return int
      */
-    public function execute(int $id): UserSignVrEntity
+    public function execute(int $id): int
     {
-        $userSignVrEntity = $this->getStoreSignVrEntityById($id);
-        if (empty($userSignVrEntity->getId()) || empty($userSignVrEntity->getUid())) {
-            throw new ValidateException('无效的Vr记录');
-        }
-        if (!empty($userSignVrEntity->getSettlementTime())) {
-            throw new ValidateException('该Vr记录已更新，请勿重复操作');
-        }
+        $result = $this->executeByIdList([$id]);
+        return array_shift($result);
+    }
 
-        /** @var UserRepository $userRepository */
-        $userRepository = app()->make(UserRepository::class);
-        $userEntity = $userRepository->getUserEntityByUid($userSignVrEntity->getUid());
-        if (empty($userEntity->getUid())) {
-            throw new ValidateException('未查询到用户信息');
-        }
-        if ($userSignVrEntity->getType() == UserSignVrEnum::TYPE['Consume']['code']) {
-            $surplus = bcsub($userEntity->getVr(), $userSignVrEntity->getNumber(), 2);
-            if ($surplus < 0.00) {
-                throw new ValidateException('用户VR不足');
+    /**
+     * @param array $idList
+     * @return array
+     */
+    public function executeByIdList(array $idList): array
+    {
+        $userSignVrEntityList = $this->getUserSignVrEntityListByIdList($idList);
+        $userIdList = [];
+
+        // 忽略 已经生效的 记录
+        $userSignVrEntityList = array_filter($userSignVrEntityList, function ($entity) use (&$userIdList) {
+            // VR 结算字段为空
+            if (empty($entity->getSettlementTime()) && !empty($entity->getUid())) {
+                $userIdList[] = $entity->getUid();
+                return true;
             }
-        } else {
-            $surplus = bcadd($userEntity->getVr(), $userSignVrEntity->getNumber(), 2);
-        }
-        try {
-            $userSignVrEntity
-                ->setSurplus($surplus)
-                ->setSettlementTime(date('Y-m-d H:i:s'));
-            $userRepository->update($userEntity->getUid(), ['vr' => $surplus]);
-            $this->dao->update($userSignVrEntity->getId(), [
-                'surplus' => $userSignVrEntity->getSurplus(),
-                'settlement_time' => $userSignVrEntity->getSettlementTime()
-            ]);
-        } catch (DbException $e) {
+            return false;
+        });
+
+        if (!empty($userSignVrEntityList)) {
+            // 获取用户 映射信息
+            /** @var UserRepository $userRepository */
+            $userRepository = app()->make(UserRepository::class);
+            /** @var UserEntity[] $userEntityMapByUid */
+            $userEntityMapByUid = [];
+            if (!empty($userIdList)) {
+                $userEntityMapByUid = $userRepository->getUserEntityMapByUidList($userIdList);
+            }
+
+            /** @var UserEntity[] $updateUserEntityList */
+            $updateUserEntityList = [];
+            /** @var UserSignVrEntity[] $updateUserVrEntityList */
+            $updateUserVrEntityList = [];
+            foreach ($userSignVrEntityList as $userSignVrEntity) {
+
+                $userEntity = $userEntityMapByUid[$userSignVrEntity->getUid()];
+                if (empty($userEntity) || empty($userEntity->getUid())) {
+                    throw new ValidateException("未查询到用户信息(vrId:{$userSignVrEntity->getId()})");
+                }
+
+                // 组建 更新 用户信息
+                if (isset($updateUserEntityList[$userEntity->getUid()])) {
+                    $updateUserEntity = $updateUserEntityList[$userEntity->getUid()];
+                } else {
+                    /** @var UserEntity $updateUserEntity */
+                    $updateUserEntity = UserEntity::newInstance();
+                    $updateUserEntity
+                        ->setUid($userEntity->getUid())
+                        ->setVr($userEntity->getVr());
 
+                }
+                // 组建 账单 记录
+                if (isset($updateUserVrEntityList[$userSignVrEntity->getId()])) {
+                    $updateUserSignVrEntity = $updateUserVrEntityList[$userSignVrEntity->getId()];
+                } else {
+                    /** @var UserSignVrEntity $updateUserSignVrEntity */
+                    $updateUserSignVrEntity = UserSignVrEntity::newInstance();
+                    // 更新 账单记录 状态
+                    $updateUserSignVrEntity
+                        ->setId($userSignVrEntity->getId())
+                        ->setSettlementTime(date('Y-m-d H:i:s'));
+                }
+
+                if ($userSignVrEntity->getType() == UserSignVrEnum::TYPE['Consume']['code']) {
+                    // 消耗
+                    $updateUserEntity->setVr(bcsub($updateUserEntity->getVr(), $userSignVrEntity->getNumber(), 2));
+                    if ($updateUserEntity->getVr() < 0.00) {
+                        throw new ValidateException('用户Vr不足');
+                    }
+                } else {
+                    $updateUserEntity->setVr(bcadd($updateUserEntity->getVr(), $userSignVrEntity->getNumber(), 2));
+                }
+                $updateUserSignVrEntity->setSurplus($updateUserEntity->getVr());
+
+                $updateUserEntityList[$userSignVrEntity->getUid()] = $updateUserEntity;
+                $updateUserVrEntityList[$userSignVrEntity->getId()] = $updateUserSignVrEntity;
+            }
+
+            try {
+                if (!empty($updateUserEntityList)) {
+                    $userRepository->batchUpdateUserDataByDataList(
+                        array_map(function (UserEntity $updateUserEntity) {
+                            return $updateUserEntity->toUnderlineArray();
+                        }, $updateUserEntityList)
+                    );
+                }
+
+                if (!empty($updateUserVrEntityList)) {
+                    $this->batchUpdateUserSignVrDataByDataList(
+                        array_map(function (UserSignVrEntity $updateUserSignVrEntity) {
+                            return $updateUserSignVrEntity->toUnderlineArray();
+                        }, $updateUserVrEntityList)
+                    );
+                }
+            } catch (DbException $e) {
+
+            }
         }
-        return $userSignVrEntity;
+        return $idList;
+    }
+
+    /**
+     * @param $dataList
+     * @return array
+     */
+    public function batchUpdateUserSignVrDataByDataList($dataList): array
+    {
+        return $this->dao->saveAll($dataList);
     }
 }

app/controller/api/Auth.php

@@ -63,7 +63,7 @@ use think\Response;
  * @author xaboy
  * @day 2020-05-06
  */
-class Auth extends BaseController
+class Auth
 {
     use HaikeApiRequest;
     use HuiPay;
@@ -72,9 +72,9 @@ class Auth extends BaseController
     protected $source;
     public function __construct(App $app)
     {
-        parent::__construct($app);
-        $this->source = $this->request->header('source');
-        $this->merId =  $this->request->header('merId');
+        // parent::__construct($app);
+        // $this->source = $this->request->header('source');
+        // $this->merId =  $this->request->header('merId');
     }
 
     /**
@@ -1559,12 +1559,12 @@ class Auth extends BaseController
     }
     public function smsLogin(UserAuthValidate $validate, UserRepository $repository)
     {
-        $data = $this->request->params(['phone', 'sms_code', 'spread', 'share_id']);
+        $data = request()->only(['phone', 'sms_code', 'spread', 'share_id']);
 //        $data = $this->request->params(['phone', 'sms_code']);
 
         $validate->sceneSmslogin()->check($data);
 
-        $domain = $this->request->domain();
+        // $domain = $this->request->domain();
 
         //如果手机验证码错误并且验证码不是6865,进入查验团队验证码环节
         if (!$this->checkSmsCode($data['phone'], $data['sms_code']) && $data['sms_code'] !== '6865') {

app/entity/data/store/StoreOrderEntity.php

@@ -2,7 +2,9 @@
 
 namespace app\entity\data\store;
 
+use app\common\enum\store\StoreOrderEnum;
 use app\entity\data\DataEntity;
+use app\entity\monomer\store\FzonePayTypeEntity;
 
 class StoreOrderEntity extends DataEntity
 {
@@ -1617,6 +1619,7 @@ class StoreOrderEntity extends DataEntity
             unset($fzonePaytypePre);
         }
         $this->fzonePaytype = $fzonePaytype;
+        $this->deconstructionFzonePaytype();
         return $this;
     }
 
@@ -1745,4 +1748,39 @@ class StoreOrderEntity extends DataEntity
         $this->fzonePayType = $fzonePayType;
         return $this;
     }
+
+    public function deconstructionFzonePaytype()
+    {
+        if (!empty($this->getFzonePayType()) && is_array(json_decode($this->getFzonePayType(), true))) {
+            /** @var FzonePayTypeEntity $fzonePayTypeEntity */
+            $fzonePayTypeEntity = FzonePayTypeEntity::newInstance(json_decode($this->getFzonePayType(), true));
+            $this->setFzonePayNote($fzonePayTypeEntity->getNote());
+            $this->setFzonePayTypeBySplit($fzonePayTypeEntity->getType());
+            // 验证支付方式
+            if ($fzonePayTypeEntity->getType() == StoreOrderEnum::FZONE_PAY_TYPE['B1-VR+Score']['code']) {
+                $this->setFzonePayVr($fzonePayTypeEntity->getPrice());
+                $this->setFzonePayJifen($fzonePayTypeEntity->getOther());
+            } else if ($fzonePayTypeEntity->getType() == StoreOrderEnum::FZONE_PAY_TYPE['B2-Cash+Score']['code']) {
+                $this->setFzonePayPrice($fzonePayTypeEntity->getPrice());
+                $this->setFzonePayJifen($fzonePayTypeEntity->getOther());
+            } else if ($fzonePayTypeEntity->getType() == StoreOrderEnum::FZONE_PAY_TYPE['B3-VR+Jingdou']['code']) {
+                $this->setFzonePayVr($fzonePayTypeEntity->getPrice());
+                $this->setFzonePayJingdou($fzonePayTypeEntity->getOther());
+            } else if ($fzonePayTypeEntity->getType() == StoreOrderEnum::FZONE_PAY_TYPE['B4-Cash+Jingdou']['code']) {
+                $this->setFzonePayPrice($fzonePayTypeEntity->getPrice());
+                $this->setFzonePayJingdou($fzonePayTypeEntity->getOther());
+            } else if ($fzonePayTypeEntity->getType() == StoreOrderEnum::FZONE_PAY_TYPE['B5-VR']['code']) {
+                $this->setFzonePayVr($fzonePayTypeEntity->getPrice());
+            } else if ($fzonePayTypeEntity->getType() == StoreOrderEnum::FZONE_PAY_TYPE['A1-VR']['code']) {
+                $this->setFzonePayVr($fzonePayTypeEntity->getPrice());
+            } else if ($fzonePayTypeEntity->getType() == StoreOrderEnum::FZONE_PAY_TYPE['A2-Cash']['code']) {
+                $this->setFzonePayPrice($fzonePayTypeEntity->getPrice());
+            } else if ($fzonePayTypeEntity->getType() == StoreOrderEnum::FZONE_PAY_TYPE['A3-Cash+VR']['code']) {
+                $this->setFzonePayPrice($fzonePayTypeEntity->getPrice());
+                $this->setFzonePayVr($fzonePayTypeEntity->getOther());
+            } else if ($fzonePayTypeEntity->getType() == StoreOrderEnum::FZONE_PAY_TYPE['C1-Fugou']['code']) {
+                $this->setFzonePayOther($fzonePayTypeEntity->getPrice());
+            }
+        }
+    }
 }

app/entity/data/user/AddressEntity.php

@@ -1,247 +0,0 @@
-<?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/entity/data/user/UserAddressEntity.php

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

app/entity/data/user/UserSignFenrunEntity.php

@@ -6,156 +6,156 @@ use app\entity\data\DataEntity;
 
 class UserSignFenrunEntity extends DataEntity
 {
-    public $id = 0;  // 自增id
-    public $uid = 0;  // 会员id
-    public $number = 0.00;  // 数量
-    public $status = 0;  // 状态1已结算 0-已失效 -1未结算
-    public $mark = '';  // 备注
-    public $desc = '';  // 描述
-    public $orderId = '';  // 订单id
-    public $orderType = '';  // 订单类型。关联订单ID
+    public $id = null;  // 自增id
+    public $uid = null;  // 会员id
+    public $number = null;  // 数量
+    public $status = null;  // 状态1已结算 0-已失效 -1未结算
+    public $mark = null;  // 备注
+    public $desc = null;  // 描述
+    public $orderId = null;  // 订单id
+    public $orderType = null;  // 订单类型。关联订单ID
     public $settlementTime = null;  // 结算时间
-    public $addtime = 0;
+    public $addtime = null;  // 添加时间
 
     /**
-     * @return int
+     * @return mixed
      */
-    public function getId(): int
+    public function getId()
     {
         return $this->id;
     }
 
     /**
-     * @param int $id
+     * @param mixed $id
      * @return UserSignFenrunEntity
      */
-    public function setId(int $id): UserSignFenrunEntity
+    public function setId($id): UserSignFenrunEntity
     {
         $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 UserSignFenrunEntity
      */
-    public function setUid(int $uid): UserSignFenrunEntity
+    public function setUid($uid): UserSignFenrunEntity
     {
         $this->uid = $uid;
         return $this;
     }
 
     /**
-     * @return float
+     * @return mixed
      */
-    public function getNumber(): float
+    public function getNumber()
     {
         return $this->number;
     }
 
     /**
-     * @param float $number
+     * @param mixed $number
      * @return UserSignFenrunEntity
      */
-    public function setNumber(float $number): UserSignFenrunEntity
+    public function setNumber($number): UserSignFenrunEntity
     {
         $this->number = $number;
         return $this;
     }
 
     /**
-     * @return int
+     * @return mixed
      */
-    public function getStatus(): int
+    public function getStatus()
     {
         return $this->status;
     }
 
     /**
-     * @param int $status
+     * @param mixed $status
      * @return UserSignFenrunEntity
      */
-    public function setStatus(int $status): UserSignFenrunEntity
+    public function setStatus($status): UserSignFenrunEntity
     {
         $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 UserSignFenrunEntity
      */
-    public function setMark(string $mark): UserSignFenrunEntity
+    public function setMark($mark): UserSignFenrunEntity
     {
         $this->mark = $mark;
         return $this;
     }
 
     /**
-     * @return string
+     * @return mixed
      */
-    public function getDesc(): string
+    public function getDesc()
     {
         return $this->desc;
     }
 
     /**
-     * @param string $desc
+     * @param mixed $desc
      * @return UserSignFenrunEntity
      */
-    public function setDesc(string $desc): UserSignFenrunEntity
+    public function setDesc($desc): UserSignFenrunEntity
     {
         $this->desc = $desc;
         return $this;
     }
 
     /**
-     * @return string
+     * @return mixed
      */
-    public function getOrderId(): string
+    public function getOrderId()
     {
         return $this->orderId;
     }
 
     /**
-     * @param string $orderId
+     * @param mixed $orderId
      * @return UserSignFenrunEntity
      */
-    public function setOrderId(string $orderId): UserSignFenrunEntity
+    public function setOrderId($orderId): UserSignFenrunEntity
     {
         $this->orderId = $orderId;
         return $this;
     }
 
     /**
-     * @return string
+     * @return mixed
      */
-    public function getOrderType(): string
+    public function getOrderType()
     {
         return $this->orderType;
     }
 
     /**
-     * @param string $orderType
+     * @param mixed $orderType
      * @return UserSignFenrunEntity
      */
-    public function setOrderType(string $orderType): UserSignFenrunEntity
+    public function setOrderType($orderType): UserSignFenrunEntity
     {
         $this->orderType = $orderType;
         return $this;
@@ -180,20 +180,20 @@ class UserSignFenrunEntity extends DataEntity
     }
 
     /**
-     * @return int
+     * @return mixed
      */
-    public function getAddtime(): int
+    public function getAddtime()
     {
         return $this->addtime;
     }
 
     /**
-     * @param int $addtime
+     * @param mixed $addtime
      * @return UserSignFenrunEntity
      */
-    public function setAddtime(int $addtime): UserSignFenrunEntity
+    public function setAddtime($addtime): UserSignFenrunEntity
     {
         $this->addtime = $addtime;
         return $this;
-    }  // 添加时间
+    }
 }

app/entity/data/user/UserSignFugouEntity.php

@@ -6,202 +6,202 @@ use app\entity\data\DataEntity;
 
 class UserSignFugouEntity extends DataEntity
 {
-    public $id = 0;  // 自增id
-    public $uid = 0;  // 会员id
-    public $number = 0.00;  // 赠送数量
-    public $status = 0;  // 复购金状态：1-有效 0-失效 -1待确认
-    public $mark = '';  // 备注
-    public $desc = '';  // 描述
-    public $orderId = '';  // 订单id
-    public $surplus = 0.00;  // 剩余
-    public $orderType = '';  // 订单类型。关联订单ID
-    public $commissionType = 0;  // 佣金类型：1代理费 2 消费佣金 3直推奖 4辖区佣金 5养老金 6广告费 7锁客收益 8平台奖励 9渠道商 10推广店铺收益 11合伙人分红 12联创分红 13股权分红
-    public $type = null;  // 复购金类型：1赠送，2消耗
+    public $id = null;  // 自增id
+    public $uid = null;  // 会员id
+    public $number = null;  // 赠送数量
+    public $status = null;  // 复购金状态1-有效 0-失效 -1待确认
+    public $mark = null;  // 备注
+    public $desc = null;  // 描述
+    public $orderId = null;  // 订单id
+    public $surplus = null;  // 剩余
+    public $orderType = null;  // 订单类型。关联订单ID
+    public $commissionType = null;  // 佣金类型
+    public $type = null;  // 复购金类型 :1赠送，2消耗
     public $settlementTime = null;  // 结算时间
-    public $addtime = 0;  // 添加时间
+    public $addtime = null;  // 添加时间
 
     /**
-     * @return int
+     * @return mixed
      */
-    public function getId(): int
+    public function getId()
     {
         return $this->id;
     }
 
     /**
-     * @param int $id
+     * @param mixed $id
      * @return UserSignFugouEntity
      */
-    public function setId(int $id): UserSignFugouEntity
+    public function setId($id): UserSignFugouEntity
     {
         $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 UserSignFugouEntity
      */
-    public function setUid(int $uid): UserSignFugouEntity
+    public function setUid($uid): UserSignFugouEntity
     {
         $this->uid = $uid;
         return $this;
     }
 
     /**
-     * @return float
+     * @return mixed
      */
-    public function getNumber(): float
+    public function getNumber()
     {
         return $this->number;
     }
 
     /**
-     * @param float $number
+     * @param mixed $number
      * @return UserSignFugouEntity
      */
-    public function setNumber(float $number): UserSignFugouEntity
+    public function setNumber($number): UserSignFugouEntity
     {
         $this->number = $number;
         return $this;
     }
 
     /**
-     * @return int
+     * @return mixed
      */
-    public function getStatus(): int
+    public function getStatus()
     {
         return $this->status;
     }
 
     /**
-     * @param int $status
+     * @param mixed $status
      * @return UserSignFugouEntity
      */
-    public function setStatus(int $status): UserSignFugouEntity
+    public function setStatus($status): UserSignFugouEntity
     {
         $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 UserSignFugouEntity
      */
-    public function setMark(string $mark): UserSignFugouEntity
+    public function setMark($mark): UserSignFugouEntity
     {
         $this->mark = $mark;
         return $this;
     }
 
     /**
-     * @return string
+     * @return mixed
      */
-    public function getDesc(): string
+    public function getDesc()
     {
         return $this->desc;
     }
 
     /**
-     * @param string $desc
+     * @param mixed $desc
      * @return UserSignFugouEntity
      */
-    public function setDesc(string $desc): UserSignFugouEntity
+    public function setDesc($desc): UserSignFugouEntity
     {
         $this->desc = $desc;
         return $this;
     }
 
     /**
-     * @return string
+     * @return mixed
      */
-    public function getOrderId(): string
+    public function getOrderId()
     {
         return $this->orderId;
     }
 
     /**
-     * @param string $orderId
+     * @param mixed $orderId
      * @return UserSignFugouEntity
      */
-    public function setOrderId(string $orderId): UserSignFugouEntity
+    public function setOrderId($orderId): UserSignFugouEntity
     {
         $this->orderId = $orderId;
         return $this;
     }
 
     /**
-     * @return float
+     * @return mixed
      */
-    public function getSurplus(): float
+    public function getSurplus()
     {
         return $this->surplus;
     }
 
     /**
-     * @param float $surplus
+     * @param mixed $surplus
      * @return UserSignFugouEntity
      */
-    public function setSurplus(float $surplus): UserSignFugouEntity
+    public function setSurplus($surplus): UserSignFugouEntity
     {
         $this->surplus = $surplus;
         return $this;
     }
 
     /**
-     * @return string
+     * @return mixed
      */
-    public function getOrderType(): string
+    public function getOrderType()
     {
         return $this->orderType;
     }
 
     /**
-     * @param string $orderType
+     * @param mixed $orderType
      * @return UserSignFugouEntity
      */
-    public function setOrderType(string $orderType): UserSignFugouEntity
+    public function setOrderType($orderType): UserSignFugouEntity
     {
         $this->orderType = $orderType;
         return $this;
     }
 
     /**
-     * @return int
+     * @return mixed
      */
-    public function getCommissionType(): int
+    public function getCommissionType()
     {
         return $this->commissionType;
     }
 
     /**
-     * @param int $commissionType
+     * @param mixed $commissionType
      * @return UserSignFugouEntity
      */
-    public function setCommissionType(int $commissionType): UserSignFugouEntity
+    public function setCommissionType($commissionType): UserSignFugouEntity
     {
         $this->commissionType = $commissionType;
         return $this;
     }
 
     /**
-     * @return null
+     * @return mixed
      */
     public function getType()
     {
@@ -209,17 +209,17 @@ class UserSignFugouEntity extends DataEntity
     }
 
     /**
-     * @param null $type
+     * @param mixed $type
      * @return UserSignFugouEntity
      */
-    public function setType($type)
+    public function setType($type): UserSignFugouEntity
     {
         $this->type = $type;
         return $this;
     }
 
     /**
-     * @return null
+     * @return mixed
      */
     public function getSettlementTime()
     {
@@ -227,28 +227,28 @@ class UserSignFugouEntity extends DataEntity
     }
 
     /**
-     * @param null $settlementTime
+     * @param mixed $settlementTime
      * @return UserSignFugouEntity
      */
-    public function setSettlementTime($settlementTime)
+    public function setSettlementTime($settlementTime): UserSignFugouEntity
     {
         $this->settlementTime = $settlementTime;
         return $this;
     }
 
     /**
-     * @return int
+     * @return mixed
      */
-    public function getAddtime(): int
+    public function getAddtime()
     {
         return $this->addtime;
     }
 
     /**
-     * @param int $addtime
+     * @param mixed $addtime
      * @return UserSignFugouEntity
      */
-    public function setAddtime(int $addtime): UserSignFugouEntity
+    public function setAddtime($addtime): UserSignFugouEntity
     {
         $this->addtime = $addtime;
         return $this;

app/entity/data/user/UserSignGongxianEntity.php

@@ -6,203 +6,203 @@ use app\entity\data\DataEntity;
 
 class UserSignGongxianEntity extends DataEntity
 {
-    public $id = 0;  // 自增id
-    public $uid = 0;  // 会员id
-    public $merId = 0;  // 商户id
-    public $number = 0.00;  // 赠送数量
-    public $status = 0;  // 贡献值状态: 1-有效 0-失效 -1待确认
-    public $mark = '';  // 备注
-    public $desc = '';  // 描述
-    public $orderId = '';  // 订单id
-    public $surplus = 0.00;  // 剩余
-    public $orderType = '';  // 订单类型
-    public $type = null;  // 贡献值类型: 1-赠送 2-消耗
+    public $id = null;  // 自增id
+    public $uid = null;  // 会员id
+    public $merId = null;  // 商户id
+    public $number = null;  // 赠送数量
+    public $status = null;  // 贡献值状态1-有效 0-失效 -1待确认
+    public $mark = null;  // 备注
+    public $desc = null;  // 描述
+    public $orderId = null;  // 订单id
+    public $surplus = null;  // 剩余
+    public $orderType = null;  // 订单类型。关联订单ID
+    public $type = null;  // 贡献值类型 :1赠送，2消耗
     public $settlementTime = null;  // 结算时间
-    public $addtime = 0;  // 添加时间
-    public $pv = 0.00;  // pv值
+    public $addtime = null;  // 添加时间
+    public $pv = null;  // pv值
 
     /**
-     * @return int
+     * @return mixed
      */
-    public function getId(): int
+    public function getId()
     {
         return $this->id;
     }
 
     /**
-     * @param int $id
+     * @param mixed $id
      * @return UserSignGongxianEntity
      */
-    public function setId(int $id): UserSignGongxianEntity
+    public function setId($id): UserSignGongxianEntity
     {
         $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 UserSignGongxianEntity
      */
-    public function setUid(int $uid): UserSignGongxianEntity
+    public function setUid($uid): UserSignGongxianEntity
     {
         $this->uid = $uid;
         return $this;
     }
 
     /**
-     * @return int
+     * @return mixed
      */
-    public function getMerId(): int
+    public function getMerId()
     {
         return $this->merId;
     }
 
     /**
-     * @param int $merId
+     * @param mixed $merId
      * @return UserSignGongxianEntity
      */
-    public function setMerId(int $merId): UserSignGongxianEntity
+    public function setMerId($merId): UserSignGongxianEntity
     {
         $this->merId = $merId;
         return $this;
     }
 
     /**
-     * @return float
+     * @return mixed
      */
-    public function getNumber(): float
+    public function getNumber()
     {
         return $this->number;
     }
 
     /**
-     * @param float $number
+     * @param mixed $number
      * @return UserSignGongxianEntity
      */
-    public function setNumber(float $number): UserSignGongxianEntity
+    public function setNumber($number): UserSignGongxianEntity
     {
         $this->number = $number;
         return $this;
     }
 
     /**
-     * @return int
+     * @return mixed
      */
-    public function getStatus(): int
+    public function getStatus()
     {
         return $this->status;
     }
 
     /**
-     * @param int $status
+     * @param mixed $status
      * @return UserSignGongxianEntity
      */
-    public function setStatus(int $status): UserSignGongxianEntity
+    public function setStatus($status): UserSignGongxianEntity
     {
         $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 UserSignGongxianEntity
      */
-    public function setMark(string $mark): UserSignGongxianEntity
+    public function setMark($mark): UserSignGongxianEntity
     {
         $this->mark = $mark;
         return $this;
     }
 
     /**
-     * @return string
+     * @return mixed
      */
-    public function getDesc(): string
+    public function getDesc()
     {
         return $this->desc;
     }
 
     /**
-     * @param string $desc
+     * @param mixed $desc
      * @return UserSignGongxianEntity
      */
-    public function setDesc(string $desc): UserSignGongxianEntity
+    public function setDesc($desc): UserSignGongxianEntity
     {
         $this->desc = $desc;
         return $this;
     }
 
     /**
-     * @return string
+     * @return mixed
      */
-    public function getOrderId(): string
+    public function getOrderId()
     {
         return $this->orderId;
     }
 
     /**
-     * @param string $orderId
+     * @param mixed $orderId
      * @return UserSignGongxianEntity
      */
-    public function setOrderId(string $orderId): UserSignGongxianEntity
+    public function setOrderId($orderId): UserSignGongxianEntity
     {
         $this->orderId = $orderId;
         return $this;
     }
 
     /**
-     * @return float
+     * @return mixed
      */
-    public function getSurplus(): float
+    public function getSurplus()
     {
         return $this->surplus;
     }
 
     /**
-     * @param float $surplus
+     * @param mixed $surplus
      * @return UserSignGongxianEntity
      */
-    public function setSurplus(float $surplus): UserSignGongxianEntity
+    public function setSurplus($surplus): UserSignGongxianEntity
     {
         $this->surplus = $surplus;
         return $this;
     }
 
     /**
-     * @return string
+     * @return mixed
      */
-    public function getOrderType(): string
+    public function getOrderType()
     {
         return $this->orderType;
     }
 
     /**
-     * @param string $orderType
+     * @param mixed $orderType
      * @return UserSignGongxianEntity
      */
-    public function setOrderType(string $orderType): UserSignGongxianEntity
+    public function setOrderType($orderType): UserSignGongxianEntity
     {
         $this->orderType = $orderType;
         return $this;
     }
 
     /**
-     * @return null
+     * @return mixed
      */
     public function getType()
     {
@@ -220,7 +220,7 @@ class UserSignGongxianEntity extends DataEntity
     }
 
     /**
-     * @return null
+     * @return mixed
      */
     public function getSettlementTime()
     {
@@ -238,36 +238,36 @@ class UserSignGongxianEntity extends DataEntity
     }
 
     /**
-     * @return int
+     * @return mixed
      */
-    public function getAddtime(): int
+    public function getAddtime()
     {
         return $this->addtime;
     }
 
     /**
-     * @param int $addtime
+     * @param mixed $addtime
      * @return UserSignGongxianEntity
      */
-    public function setAddtime(int $addtime): UserSignGongxianEntity
+    public function setAddtime($addtime): UserSignGongxianEntity
     {
         $this->addtime = $addtime;
         return $this;
     }
 
     /**
-     * @return float
+     * @return mixed
      */
-    public function getPv(): float
+    public function getPv()
     {
         return $this->pv;
     }
 
     /**
-     * @param float $pv
+     * @param mixed $pv
      * @return UserSignGongxianEntity
      */
-    public function setPv(float $pv): UserSignGongxianEntity
+    public function setPv($pv): UserSignGongxianEntity
     {
         $this->pv = $pv;
         return $this;

app/entity/data/user/UserSignHongbaoEntity.php

@@ -6,183 +6,183 @@ use app\entity\data\DataEntity;
 
 class UserSignHongbaoEntity extends DataEntity
 {
-    public $id = 0;  // 自增id
-    public $uid = 0;  // 会员id
-    public $number = 0.00;  // 赠送数量
-    public $status = 0;  // 红包状态: 1-有效 0-失效 -1待确认
-    public $mark = '';  // 备注
-    public $desc = '';  // 描述
-    public $orderId = '';  // 订单id
-    public $surplus = 0.00;  // 剩余
-    public $orderType = '';  // 订单类型
-    public $type = null;  // 京豆类型: 1-消费赠送，2-消耗
+    public $id = null;  // 自增id
+    public $uid = null;  // 会员id
+    public $number = null;  // 赠送数量
+    public $status = null;  // 红包状态1-有效 0-失效 -1待确认
+    public $mark = null;  // 备注
+    public $desc = null;  // 描述
+    public $orderId = null;  // 订单id
+    public $surplus = null;  // 剩余
+    public $orderType = null;  // 订单类型。关联订单ID
+    public $type = null;  // 京豆类型 :1消费赠送，2消耗
     public $settlementTime = null;  // 结算时间
-    public $addtime = 0;  // 添加时间
+    public $addtime = null;  // 添加时间
 
     /**
-     * @return int
+     * @return mixed
      */
-    public function getId(): int
+    public function getId()
     {
         return $this->id;
     }
 
     /**
-     * @param int $id
+     * @param mixed $id
      * @return UserSignHongbaoEntity
      */
-    public function setId(int $id): UserSignHongbaoEntity
+    public function setId($id): UserSignHongbaoEntity
     {
         $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 UserSignHongbaoEntity
      */
-    public function setUid(int $uid): UserSignHongbaoEntity
+    public function setUid($uid): UserSignHongbaoEntity
     {
         $this->uid = $uid;
         return $this;
     }
 
     /**
-     * @return float
+     * @return mixed
      */
-    public function getNumber(): float
+    public function getNumber()
     {
         return $this->number;
     }
 
     /**
-     * @param float $number
+     * @param mixed $number
      * @return UserSignHongbaoEntity
      */
-    public function setNumber(float $number): UserSignHongbaoEntity
+    public function setNumber($number): UserSignHongbaoEntity
     {
         $this->number = $number;
         return $this;
     }
 
     /**
-     * @return int
+     * @return mixed
      */
-    public function getStatus(): int
+    public function getStatus()
     {
         return $this->status;
     }
 
     /**
-     * @param int $status
+     * @param mixed $status
      * @return UserSignHongbaoEntity
      */
-    public function setStatus(int $status): UserSignHongbaoEntity
+    public function setStatus($status): UserSignHongbaoEntity
     {
         $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 UserSignHongbaoEntity
      */
-    public function setMark(string $mark): UserSignHongbaoEntity
+    public function setMark($mark): UserSignHongbaoEntity
     {
         $this->mark = $mark;
         return $this;
     }
 
     /**
-     * @return string
+     * @return mixed
      */
-    public function getDesc(): string
+    public function getDesc()
     {
         return $this->desc;
     }
 
     /**
-     * @param string $desc
+     * @param mixed $desc
      * @return UserSignHongbaoEntity
      */
-    public function setDesc(string $desc): UserSignHongbaoEntity
+    public function setDesc($desc): UserSignHongbaoEntity
     {
         $this->desc = $desc;
         return $this;
     }
 
     /**
-     * @return string
+     * @return mixed
      */
-    public function getOrderId(): string
+    public function getOrderId()
     {
         return $this->orderId;
     }
 
     /**
-     * @param string $orderId
+     * @param mixed $orderId
      * @return UserSignHongbaoEntity
      */
-    public function setOrderId(string $orderId): UserSignHongbaoEntity
+    public function setOrderId($orderId): UserSignHongbaoEntity
     {
         $this->orderId = $orderId;
         return $this;
     }
 
     /**
-     * @return float
+     * @return mixed
      */
-    public function getSurplus(): float
+    public function getSurplus()
     {
         return $this->surplus;
     }
 
     /**
-     * @param float $surplus
+     * @param mixed $surplus
      * @return UserSignHongbaoEntity
      */
-    public function setSurplus(float $surplus): UserSignHongbaoEntity
+    public function setSurplus($surplus): UserSignHongbaoEntity
     {
         $this->surplus = $surplus;
         return $this;
     }
 
     /**
-     * @return string
+     * @return mixed
      */
-    public function getOrderType(): string
+    public function getOrderType()
     {
         return $this->orderType;
     }
 
     /**
-     * @param string $orderType
+     * @param mixed $orderType
      * @return UserSignHongbaoEntity
      */
-    public function setOrderType(string $orderType): UserSignHongbaoEntity
+    public function setOrderType($orderType): UserSignHongbaoEntity
     {
         $this->orderType = $orderType;
         return $this;
     }
 
     /**
-     * @return null
+     * @return mixed
      */
     public function getType()
     {
@@ -190,17 +190,17 @@ class UserSignHongbaoEntity extends DataEntity
     }
 
     /**
-     * @param null $type
+     * @param mixed $type
      * @return UserSignHongbaoEntity
      */
-    public function setType($type)
+    public function setType($type): UserSignHongbaoEntity
     {
         $this->type = $type;
         return $this;
     }
 
     /**
-     * @return null
+     * @return mixed
      */
     public function getSettlementTime()
     {
@@ -208,28 +208,28 @@ class UserSignHongbaoEntity extends DataEntity
     }
 
     /**
-     * @param null $settlementTime
+     * @param mixed $settlementTime
      * @return UserSignHongbaoEntity
      */
-    public function setSettlementTime($settlementTime)
+    public function setSettlementTime($settlementTime): UserSignHongbaoEntity
     {
         $this->settlementTime = $settlementTime;
         return $this;
     }
 
     /**
-     * @return int
+     * @return mixed
      */
-    public function getAddtime(): int
+    public function getAddtime()
     {
         return $this->addtime;
     }
 
     /**
-     * @param int $addtime
+     * @param mixed $addtime
      * @return UserSignHongbaoEntity
      */
-    public function setAddtime(int $addtime): UserSignHongbaoEntity
+    public function setAddtime($addtime): UserSignHongbaoEntity
     {
         $this->addtime = $addtime;
         return $this;

app/entity/data/user/UserSignJingdouEntity.php

@@ -6,202 +6,202 @@ use app\entity\data\DataEntity;
 
 class UserSignJingdouEntity extends DataEntity
 {
-    public $id = 0;  // 自增id
-    public $uid = 0;  // 会员id
-    public $merId = 0;  // 商户id
-    public $number = 0.00;  // 赠送数量
-    public $status = 0;  // 京豆状态：1-有效 0-失效 -1待确认
-    public $mark = '';  // 备注
-    public $desc = '';  // 描述
-    public $orderId = '';  // 订单id
-    public $surplus = 0.00;  // 剩余
-    public $orderType = '';  // 订单类型。关联订单ID
-    public $type = null;  // 京豆类型：1赠送，2消耗
+    public $id = null;  // 自增id
+    public $uid = null;  // 会员id
+    public $merId = null;  // 商户id
+    public $number = null;  // 赠送数量
+    public $status = null;  // 京豆状态1-有效 0-失效 -1待确认
+    public $mark = null;  // 备注
+    public $desc = null;  // 描述
+    public $orderId = null;  // 订单id
+    public $surplus = null;  // 剩余
+    public $orderType = null;  // 订单类型。关联订单ID
+    public $type = null;  // 京豆类型 :1赠送，2消耗
     public $settlementTime = null;  // 结算时间
-    public $addtime = 0;  // 添加时间
+    public $addtime = null;  // 添加时间
 
     /**
-     * @return int
+     * @return mixed
      */
-    public function getId(): int
+    public function getId()
     {
         return $this->id;
     }
 
     /**
-     * @param int $id
+     * @param mixed $id
      * @return UserSignJingdouEntity
      */
-    public function setId(int $id): UserSignJingdouEntity
+    public function setId($id): UserSignJingdouEntity
     {
         $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 UserSignJingdouEntity
      */
-    public function setUid(int $uid): UserSignJingdouEntity
+    public function setUid($uid): UserSignJingdouEntity
     {
         $this->uid = $uid;
         return $this;
     }
 
     /**
-     * @return int
+     * @return mixed
      */
-    public function getMerId(): int
+    public function getMerId()
     {
         return $this->merId;
     }
 
     /**
-     * @param int $merId
+     * @param mixed $merId
      * @return UserSignJingdouEntity
      */
-    public function setMerId(int $merId): UserSignJingdouEntity
+    public function setMerId($merId): UserSignJingdouEntity
     {
         $this->merId = $merId;
         return $this;
     }
 
     /**
-     * @return float
+     * @return mixed
      */
-    public function getNumber(): float
+    public function getNumber()
     {
         return $this->number;
     }
 
     /**
-     * @param float $number
+     * @param mixed $number
      * @return UserSignJingdouEntity
      */
-    public function setNumber(float $number): UserSignJingdouEntity
+    public function setNumber($number): UserSignJingdouEntity
     {
         $this->number = $number;
         return $this;
     }
 
     /**
-     * @return int
+     * @return mixed
      */
-    public function getStatus(): int
+    public function getStatus()
     {
         return $this->status;
     }
 
     /**
-     * @param int $status
+     * @param mixed $status
      * @return UserSignJingdouEntity
      */
-    public function setStatus(int $status): UserSignJingdouEntity
+    public function setStatus($status): UserSignJingdouEntity
     {
         $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 UserSignJingdouEntity
      */
-    public function setMark(string $mark): UserSignJingdouEntity
+    public function setMark($mark): UserSignJingdouEntity
     {
         $this->mark = $mark;
         return $this;
     }
 
     /**
-     * @return string
+     * @return mixed
      */
-    public function getDesc(): string
+    public function getDesc()
     {
         return $this->desc;
     }
 
     /**
-     * @param string $desc
+     * @param mixed $desc
      * @return UserSignJingdouEntity
      */
-    public function setDesc(string $desc): UserSignJingdouEntity
+    public function setDesc($desc): UserSignJingdouEntity
     {
         $this->desc = $desc;
         return $this;
     }
 
     /**
-     * @return string
+     * @return mixed
      */
-    public function getOrderId(): string
+    public function getOrderId()
     {
         return $this->orderId;
     }
 
     /**
-     * @param string $orderId
+     * @param mixed $orderId
      * @return UserSignJingdouEntity
      */
-    public function setOrderId(string $orderId): UserSignJingdouEntity
+    public function setOrderId($orderId): UserSignJingdouEntity
     {
         $this->orderId = $orderId;
         return $this;
     }
 
     /**
-     * @return float
+     * @return mixed
      */
-    public function getSurplus(): float
+    public function getSurplus()
     {
         return $this->surplus;
     }
 
     /**
-     * @param float $surplus
+     * @param mixed $surplus
      * @return UserSignJingdouEntity
      */
-    public function setSurplus(float $surplus): UserSignJingdouEntity
+    public function setSurplus($surplus): UserSignJingdouEntity
     {
         $this->surplus = $surplus;
         return $this;
     }
 
     /**
-     * @return string
+     * @return mixed
      */
-    public function getOrderType(): string
+    public function getOrderType()
     {
         return $this->orderType;
     }
 
     /**
-     * @param string $orderType
+     * @param mixed $orderType
      * @return UserSignJingdouEntity
      */
-    public function setOrderType(string $orderType): UserSignJingdouEntity
+    public function setOrderType($orderType): UserSignJingdouEntity
     {
         $this->orderType = $orderType;
         return $this;
     }
 
     /**
-     * @return null
+     * @return mixed
      */
     public function getType()
     {
@@ -209,17 +209,17 @@ class UserSignJingdouEntity extends DataEntity
     }
 
     /**
-     * @param null $type
+     * @param mixed $type
      * @return UserSignJingdouEntity
      */
-    public function setType($type)
+    public function setType($type): UserSignJingdouEntity
     {
         $this->type = $type;
         return $this;
     }
 
     /**
-     * @return null
+     * @return mixed
      */
     public function getSettlementTime()
     {
@@ -227,28 +227,28 @@ class UserSignJingdouEntity extends DataEntity
     }
 
     /**
-     * @param null $settlementTime
+     * @param mixed $settlementTime
      * @return UserSignJingdouEntity
      */
-    public function setSettlementTime($settlementTime)
+    public function setSettlementTime($settlementTime): UserSignJingdouEntity
     {
         $this->settlementTime = $settlementTime;
         return $this;
     }
 
     /**
-     * @return int
+     * @return mixed
      */
-    public function getAddtime(): int
+    public function getAddtime()
     {
         return $this->addtime;
     }
 
     /**
-     * @param int $addtime
+     * @param mixed $addtime
      * @return UserSignJingdouEntity
      */
-    public function setAddtime(int $addtime): UserSignJingdouEntity
+    public function setAddtime($addtime): UserSignJingdouEntity
     {
         $this->addtime = $addtime;
         return $this;

app/entity/data/user/UserSignScoreEntity.php

@@ -9,7 +9,7 @@ class UserSignScoreEntity extends DataEntity
     public $id = null;  // 自增id
     public $uid = null;  // 会员id
     public $continuityDay = null;  // 连续签到几天
-    public $rewardScore = null;  // 赠送积分数量
+    public $rewardSocre = null;  // 赠送积分数量
     public $signinTime = null;  // 签到时间
     public $sourceUid = null;  // 赠送积分来源用户id
     public $status = null;  // 积分状态1-有效 0-失效 -1待确认
@@ -79,18 +79,18 @@ class UserSignScoreEntity extends DataEntity
     /**
      * @return mixed
      */
-    public function getRewardScore()
+    public function getRewardSocre()
     {
-        return $this->rewardScore;
+        return $this->rewardSocre;
     }
 
     /**
-     * @param mixed $rewardScore
+     * @param mixed $rewardSocre
      * @return UserSignScoreEntity
      */
-    public function setRewardScore($rewardScore): UserSignScoreEntity
+    public function setRewardSocre($rewardSocre): UserSignScoreEntity
     {
-        $this->rewardScore = $rewardScore;
+        $this->rewardSocre = $rewardSocre;
         return $this;
     }
 

app/entity/data/user/UserSignVrEntity.php

@@ -6,182 +6,182 @@ use app\entity\data\DataEntity;
 
 class UserSignVrEntity extends DataEntity
 {
-    public $id = 0;  // 自增id
-    public $uid = 0;  // 会员id
-    public $number = 0.00;  // 赠送数量
-    public $mark = '';  // 备注
-    public $desc = '';  // 描述
-    public $orderId = '';  // 订单id
-    public $surplus = 0.00;  // 剩余
-    public $orderType = '';  // 订单类型，关联订单ID
-    public $type = 0;  // vr类型：1兑换，2消耗
+    public $id = null;  // 自增id
+    public $uid = null;  // 会员id
+    public $number = null;  // 赠送数量
+    public $mark = null;  // 备注
+    public $desc = null;  // 描述
+    public $orderId = null;  // 订单id
+    public $surplus = null;  // 剩余
+    public $orderType = null;  // 订单类型。关联订单ID
+    public $type = null;  // vr类型 :1兑换，2消耗
     public $settlementTime = null;  // 结算时间
-    public $addtime = 0;  // 添加时间
+    public $addtime = null;  // 添加时间
 
     /**
-     * @return int
+     * @return mixed
      */
-    public function getId(): int
+    public function getId()
     {
         return $this->id;
     }
 
     /**
-     * @param int $id
+     * @param mixed $id
      * @return UserSignVrEntity
      */
-    public function setId(int $id): UserSignVrEntity
+    public function setId($id): UserSignVrEntity
     {
         $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 UserSignVrEntity
      */
-    public function setUid(int $uid): UserSignVrEntity
+    public function setUid($uid): UserSignVrEntity
     {
         $this->uid = $uid;
         return $this;
     }
 
     /**
-     * @return float
+     * @return mixed
      */
-    public function getNumber(): float
+    public function getNumber()
     {
         return $this->number;
     }
 
     /**
-     * @param float $number
+     * @param mixed $number
      * @return UserSignVrEntity
      */
-    public function setNumber(float $number): UserSignVrEntity
+    public function setNumber($number): UserSignVrEntity
     {
         $this->number = $number;
         return $this;
     }
 
     /**
-     * @return string
+     * @return mixed
      */
-    public function getMark(): string
+    public function getMark()
     {
         return $this->mark;
     }
 
     /**
-     * @param string $mark
+     * @param mixed $mark
      * @return UserSignVrEntity
      */
-    public function setMark(string $mark): UserSignVrEntity
+    public function setMark($mark): UserSignVrEntity
     {
         $this->mark = $mark;
         return $this;
     }
 
     /**
-     * @return string
+     * @return mixed
      */
-    public function getDesc(): string
+    public function getDesc()
     {
         return $this->desc;
     }
 
     /**
-     * @param string $desc
+     * @param mixed $desc
      * @return UserSignVrEntity
      */
-    public function setDesc(string $desc): UserSignVrEntity
+    public function setDesc($desc): UserSignVrEntity
     {
         $this->desc = $desc;
         return $this;
     }
 
     /**
-     * @return string
+     * @return mixed
      */
-    public function getOrderId(): string
+    public function getOrderId()
     {
         return $this->orderId;
     }
 
     /**
-     * @param string $orderId
+     * @param mixed $orderId
      * @return UserSignVrEntity
      */
-    public function setOrderId(string $orderId): UserSignVrEntity
+    public function setOrderId($orderId): UserSignVrEntity
     {
         $this->orderId = $orderId;
         return $this;
     }
 
     /**
-     * @return float
+     * @return mixed
      */
-    public function getSurplus(): float
+    public function getSurplus()
     {
         return $this->surplus;
     }
 
     /**
-     * @param float $surplus
+     * @param mixed $surplus
      * @return UserSignVrEntity
      */
-    public function setSurplus(float $surplus): UserSignVrEntity
+    public function setSurplus($surplus): UserSignVrEntity
     {
         $this->surplus = $surplus;
         return $this;
     }
 
     /**
-     * @return string
+     * @return mixed
      */
-    public function getOrderType(): string
+    public function getOrderType()
     {
         return $this->orderType;
     }
 
     /**
-     * @param string $orderType
+     * @param mixed $orderType
      * @return UserSignVrEntity
      */
-    public function setOrderType(string $orderType): UserSignVrEntity
+    public function setOrderType($orderType): UserSignVrEntity
     {
         $this->orderType = $orderType;
         return $this;
     }
 
     /**
-     * @return int
+     * @return mixed
      */
-    public function getType(): int
+    public function getType()
     {
         return $this->type;
     }
 
     /**
-     * @param int $type
+     * @param mixed $type
      * @return UserSignVrEntity
      */
-    public function setType(int $type): UserSignVrEntity
+    public function setType($type): UserSignVrEntity
     {
         $this->type = $type;
         return $this;
     }
 
     /**
-     * @return null
+     * @return mixed
      */
     public function getSettlementTime()
     {
@@ -189,28 +189,28 @@ class UserSignVrEntity extends DataEntity
     }
 
     /**
-     * @param null $settlementTime
+     * @param mixed $settlementTime
      * @return UserSignVrEntity
      */
-    public function setSettlementTime($settlementTime)
+    public function setSettlementTime($settlementTime): UserSignVrEntity
     {
         $this->settlementTime = $settlementTime;
         return $this;
     }
 
     /**
-     * @return int
+     * @return mixed
      */
-    public function getAddtime(): int
+    public function getAddtime()
     {
         return $this->addtime;
     }
 
     /**
-     * @param int $addtime
+     * @param mixed $addtime
      * @return UserSignVrEntity
      */
-    public function setAddtime(int $addtime): UserSignVrEntity
+    public function setAddtime($addtime): UserSignVrEntity
     {
         $this->addtime = $addtime;
         return $this;