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

app/common/dao/gzc/GzcLogDao.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace app\common\dao\gzc;
+
+use app\common\dao\BaseDao;
+use app\common\model\gzc\GzcLog;
+
+class GzcLogDao extends BaseDao
+{
+    protected function getModel(): string
+    {
+        return GzcLog::class;
+    }
+}

app/common/dao/user/UserBillDao.php

@@ -14,6 +14,8 @@ namespace app\common\dao\user;
 use app\common\dao\BaseDao;
 use app\common\model\BaseModel;
 use app\common\model\user\UserBill;
+use app\entity\CommonEntity;
+use app\entity\data\user\UserBillEntity;
 
 /**
  * Class UserBillDao
@@ -186,4 +188,22 @@ class UserBillDao extends BaseDao
         return UserBill::getDB()->group('type')->column('title,type');
     }
 
+    /**
+     * @param $uid
+     * @return CommonEntity
+     */
+    public function getUserBillEntityByBillId($uid): CommonEntity
+    {
+        $data = [];
+        try {
+            $dataRes = UserBill::getDB()
+                ->where('id', $uid)
+                ->find();
+            if (!empty($dataRes)) {
+                $data = $dataRes->toArray();
+            }
+        } catch (\Exception $e) {
+        }
+        return UserBillEntity::newInstance($data);
+    }
 }

app/common/dao/user/UserPvLogDao.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace app\common\dao\user;
+
+use app\common\dao\BaseDao;
+use app\common\model\user\UserPvLog;
+
+class UserPvLogDao extends BaseDao
+{
+    protected function getModel(): string
+    {
+        return UserPvLog::class;
+    }
+}

app/common/dao/user/UserSignGongxianDao.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace app\common\dao\user;
+
+use app\common\dao\BaseDao;
+use app\common\model\user\UserSignGongxian;
+
+class UserSignGongxianDao extends BaseDao
+{
+    protected function getModel(): string
+    {
+        return UserSignGongxian::class;
+    }
+}

app/common/dao/user/UserSignHongbaoDao.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace app\common\dao\user;
+
+use app\common\dao\BaseDao;
+use app\common\model\user\UserSignHongbao;
+
+class UserSignHongbaoDao extends BaseDao
+{
+    protected function getModel(): string
+    {
+        return UserSignHongbao::class;
+    }
+}

app/common/enum/CommonEnum.php

@@ -36,12 +36,58 @@ class CommonEnum
         'XingfuXiaodian' => ['code' => 2001, 'name' => '幸福小店'],
     ];
 
-    CONST YANGLAOJIN = [
-        'Ratio' => ['code' => 0.3, 'name' => '30%']
+    // 直推奖励的分配比例
+    const DIRECT_REFERRAL_BONUS = [
+        'BrokeragePrice' => ['code' => 0.9, 'name' => '直推奖励的佣金部分'],
+        'Fugou' => ['code' => 0.1, 'name' => '直推奖励的佣金部分']
     ];
 
-    CONST PV = [
-        'Ratio' => ['code' => 0.35, 'name' => '35%']
+    // 计算式小数点保留位数 超出位数 舍弃
+    const CALCULATE_THE_NUMBER_OF_DECIMAL_PLACES = 5;
+    // 金额保留小数点位 超出部分舍弃
+    const DECIMAL_PLACES_OF_THE_AMOUNT = 2;
+
+    // 订单 收益 的分配
+    const ORDER_EARNING_ALLOCATION = [
+        // 精彩生活区
+        'WonderfulLiving' => [
+            'Self' => [
+                // 养老金比例
+                'YangLaoJin' => [
+                    'Ratio' => ['code' => 0.3, 'name' => '将利润的30%，当做养老金分配给下单人']
+                ],
+                'Pv' => [
+                    'Ratio' => ['code' => 0.35, 'name' => '将利润的35%，当做PV值分配给下单人']
+                ],
+                'Gongxian' => [
+                    'Ratio' => ['code' => 0.35, 'name' => '将利润的35%，当做贡献值分配给下单人']
+                ],
+                'Score' => [
+                    'Ratio' => ['code' => 0.35, 'name' => '将利润的35%，当做积分值分配给下单人']
+                ],
+                'Hongbao' => [
+                    'Ratio' => ['code' => 0.35, 'name' => '将利润的35%，当做红包分配给下单人，前提下单人是老用户']
+                ]
+            ],
+            'Spread' => [
+                'Basics' => [
+                    'Ratio' => ['code' => 0.35, 'name' => '将利润的35%，当做推荐人利润分配的基础，目前绑定的是下单人的PV值']
+                ],
+                'BrokeragePrice' =>[
+                    'Ratio' => ['code' => 0.9, 'name' => '直推奖励的佣金部分'],
+                ],
+                'Fugou' =>[
+                    'Ratio' => ['code' => 0.1, 'name' => '直推奖励的佣金部分'],
+                ],
+                'Gongxian' => [
+                    'Ratio' => ['code' => 0.35, 'name' => '将利润的35%，当做贡献值分配给推荐人']
+                ],
+                'Score' => [
+                    'Ratio' => ['code' => 0.35, 'name' => '将利润的35%，当做积分值分配给推荐人']
+                ]
+            ]
+        ]
+
     ];
 
 }

app/common/enum/gzc/GzcLogEnum.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace app\common\enum\gzc;
+
+use app\common\enum\CommonEnum;
+
+class GzcLogEnum extends CommonEnum
+{
+    // 账号类型
+    const ACCOUNT_TYPE = [
+        'Bank' => ['code' => 1, 'name' => '银行卡'],
+        'Alipay' => ['code' => 2, 'name' => '支付宝'],
+        'Wxpay' => ['code' => 3, 'name' => '微信'],
+    ];
+
+    // 公证处是否已发起入账
+    const GZC_STATUS = [
+        'NotInitiated' => ['code' => 0, 'name' => '未发起'],
+        'Initiated' => ['code' => 1, 'name' => '已发起'],
+    ];
+
+    // 是否入账成功
+    const SUCCESS_STATUS = [
+        'Failed' => ['code' => 0, 'name' => '入账失败'],
+        'Success' => ['code' => 1, 'name' => '入账成功'],
+    ];
+}

app/common/enum/user/UserEnum.php

@@ -6,6 +6,8 @@ use app\common\enum\CommonEnum;
 
 class UserEnum extends CommonEnum
 {
+    const IS_DEL = parent::IS_DEL;
+
     const STATUS = [
         'Disabled' => ['code' => 0, 'name' => '禁用'],
         'Normal' => ['code' => 1, 'name' => '正常']

app/common/enum/user/UserPvLogEnum.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace app\common\enum\user;
+
+use app\common\enum\CommonEnum;
+
+class UserPvLogEnum extends CommonEnum
+{
+    // 1-有效，0-失效，-1-待确认
+    const STATUS = [
+        'Valid' => ['code' => 1, 'name' => '有效'],
+        'Invalid' => ['code' => 0, 'name' => '失效'],
+        'PendingConfirmation' => ['code' => -1, 'name' => '待确认'],
+    ];
+
+    const ORDER_TYPE = parent::ORDER_TYPE;
+}

app/common/enum/user/UserSignFugouEnum.php

@@ -35,4 +35,6 @@ class UserSignFugouEnum extends CommonEnum
         'Give' => ['code' => 1, 'name' => '赠送'],
         'Consume' => ['code' => 2, 'name' => '消耗'],
     ];
+
+    const ORDER_TYPE = parent::ORDER_TYPE;
 }

app/common/enum/user/UserSignGongxianEnum.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace app\common\enum\user;
+
+use app\common\enum\CommonEnum;
+
+class UserSignGongxianEnum extends CommonEnum
+{
+    // 贡献值状态
+    const STATUS = [
+        'Valid' => ['code' => 1, 'name' => '有效'],
+        'Invalid' => ['code' => 0, 'name' => '失效'],
+        'PendingConfirmation' => ['code' => -1, 'name' => '待确认'],
+    ];
+
+    // 贡献值类型
+    const TYPE = [
+        'Give' => ['code' => 1, 'name' => '赠送'],
+        'Consume' => ['code' => 2, 'name' => '消耗'],
+    ];
+
+    // 订单类型（可以根据实际需求扩展订单类型）
+    const ORDER_TYPE = parent::ORDER_TYPE;
+}

app/common/enum/user/UserSignHongbaoEnum.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace app\common\enum\user;
+
+use app\common\enum\CommonEnum;
+
+class UserSignHongbaoEnum extends CommonEnum
+{
+    // 1-有效，0-失效，-1-待确认
+    const STATUS = [
+        'Valid' => ['code' => 1, 'name' => '有效'],
+        'Invalid' => ['code' => 0, 'name' => '失效'],
+        'PendingConfirmation' => ['code' => -1, 'name' => '待确认'],
+    ];
+
+    // 1-消费赠送，2-消耗
+    const TYPE = [
+        'ConsumptionGift' => ['code' => 1, 'name' => '消费赠送'],
+        'Consumption' => ['code' => 2, 'name' => '消耗'],
+    ];
+
+    // 订单类型（可以根据实际需求扩展订单类型）
+    const ORDER_TYPE = parent::ORDER_TYPE;
+}

app/common/enum/user/UserSignScoreEnum.php

@@ -27,4 +27,6 @@ class UserSignScoreEnum extends CommonEnum
         'FriendOrder' => ['code' => 4, 'name' => '好友下单赠送'],
         'BuyProduct' => ['code' => 5, 'name' => '购买产品消耗'],
     ];
+
+    const ORDER_TYPE = parent::ORDER_TYPE;
 }

app/common/model/gzc/GzcLog.php

@@ -0,0 +1,27 @@
+<?php
+/**
+ * @package merchant
+ *
+ * @author xaboy
+ * @day 2020/5/30
+ *
+ *
+ */
+
+namespace app\common\model\gzc;
+
+use app\common\model\BaseModel;
+
+class GzcLog extends BaseModel
+{
+
+    public static function tablePk(): string
+    {
+        return 'id';
+    }
+
+    public static function tableName(): string
+    {
+        return 'gzc_logs';
+    }
+}

app/common/model/user/UserPvLog.php

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

app/common/model/user/UserSignGongxian.php

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

app/common/model/user/UserSignHongbao.php

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

app/common/repositories/gzc/GzcLogRepository.php

@@ -0,0 +1,85 @@
+<?php
+
+namespace app\common\repositories\gzc;
+
+use app\common\dao\gzc\GzcLogDao;
+use app\common\enum\CommonEnum;
+use app\common\repositories\BaseRepository;
+use app\common\repositories\store\order\StoreOrderRepository;
+use app\entity\data\gzc\GzcLogEntity;
+use think\exception\ValidateException;
+
+class GzcLogRepository extends BaseRepository
+{
+    public function __construct(GzcLogDao $dao)
+    {
+        $this->dao = $dao;
+    }
+
+    public function create($data)
+    {
+        return $this->dao->create($data);
+    }
+
+    /**
+     * @param GzcLogEntity $gzcLogEntity
+     * @return GzcLogEntity
+     */
+    public function createByEntity(GzcLogEntity $gzcLogEntity): GzcLogEntity
+    {
+        $result = $this->create($gzcLogEntity->toUnderlineArray())->toArray();
+        /** @var GzcLogEntity $entity */
+        $entity = GzcLogEntity::newInstance($result);
+        return $entity;
+    }
+
+    /**
+     * 添加 公证处记录
+     * @param int $uid
+     * @param string $userName
+     * @param string $mobile
+     * @param string $userCard
+     * @param int $orderType
+     * @param string $orderId
+     * @param float $pension
+     * @param int $payType
+     * @return GzcLogEntity
+     */
+    public function addGzcLog(int $uid, string $userName, string $mobile, string $userCard, int $orderType, string $orderId, float $pension, int $payType): GzcLogEntity
+    {
+        $orderSn = '';
+        $payTime = '';
+        if ($orderType == CommonEnum::ORDER_TYPE['Platform']['code']) {
+            /** @var StoreOrderRepository $storeOrderRepository */
+            $storeOrderRepository = app()->make(StoreOrderRepository::class);
+            $storeOrderEntity = $storeOrderRepository->getStoreOrderEntityByOrderId((int)$orderId);
+            if (empty($storeOrderEntity->getOrderId())) {
+                throw new ValidateException('未查询到订单信息');
+            }
+            $orderSn = $storeOrderEntity->getOrderSn();
+            $payTime = $storeOrderEntity->getPayTime();
+            $payType = 3;// 默认是微信
+            if ($storeOrderEntity->getFzonePayNote() != "现金") {
+                $payType = 4;
+            }
+        }
+
+        $createTime = date('Y-m-d H:i:s');
+        /** @var GzcLogEntity $gzcLogEntity */
+        $gzcLogEntity = GzcLogEntity::newInstance();
+        $gzcLogEntity->setUid($uid)
+            ->setUserName($userName)
+            ->setMobile($mobile)
+            ->setUserCard($userCard)
+            ->setPension($pension)
+            ->setOutTradeNo($orderSn)
+            ->setAccountType($payType)
+            ->setOrderType($orderType)
+            ->setPayTime($payTime)
+            ->setCreateTime($createTime)
+            ->setUpdateTime($createTime);
+
+        return $this->createByEntity($gzcLogEntity);
+    }
+
+}

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

@@ -20,6 +20,11 @@ use app\common\enum\store\ProductEnum;
 use app\common\enum\store\StoreGroupOrderEnum;
 use app\common\enum\store\StoreOrderEnum;
 use app\common\enum\user\UserBillEnum;
+use app\common\enum\user\UserEnum;
+use app\common\enum\user\UserPvLogEnum;
+use app\common\enum\user\UserSignFugouEnum;
+use app\common\enum\user\UserSignGongxianEnum;
+use app\common\enum\user\UserSignHongbaoEnum;
 use app\common\enum\user\UserSignJingdouEnum;
 use app\common\enum\user\UserSignScoreEnum;
 use app\common\enum\user\UserSignVrEnum;
@@ -51,7 +56,12 @@ use app\common\repositories\system\merchant\MerchantRepository;
 use app\common\repositories\merchant\MerchantRepository as m;
 use app\common\repositories\user\UserAddressRepository;
 use app\common\repositories\user\UserBillRepository;
+use app\common\repositories\user\UserPvLogRepository;
 use app\common\repositories\user\UserRepository;
+use app\common\repositories\user\UserSignFugouRepository;
+use app\common\repositories\user\UserSignGongxianRepository;
+use app\common\repositories\user\UserSignHongbaoRepository;
+use app\common\repositories\user\UserSignScoreRepository;
 use app\common\repositories\user\UserThirdRepository;
 use app\common\repositories\wechat\RoutineQrcodeRepository;
 use app\common\repositories\wechat\WechatUserRepository;
@@ -11235,14 +11245,7 @@ class StoreOrderRepository extends BaseRepository
 
 
             foreach ($storeOrderEntityList as $storeOrderEntity) {
-                // 精彩生活区
-                if ($storeOrderEntity->getMerId() == CommonEnum::DESIGN_MERCHANT_ID['WonderfulLiving']['code']) {
-                    $ylj_pri = bcmul($storeOrderEntity->getConPri(), CommonEnum::YANGLAOJIN['Ratio']['code'], 2);
 
-                    $pv = bcmul($storeOrderEntity->getConPri(), CommonEnum::PV['Ratio']['code'], 2);
-
-
-                }
             }
         }
 
@@ -11260,60 +11263,163 @@ class StoreOrderRepository extends BaseRepository
         return $storeOrderEntity;
     }
 
-    public function addGzcLog(int $uid, string $userName, string $mobile, string $userCard, float $pension, string $orderSn, int $payType, int $orderType)
-    {
-
-    }
-
-    public function addUserBillLog(int $uid, int $typeShop, int $orderId, int $commissionType, float $number, string $mark, int $status = 0, int $gzc = 0)
+    public function createCommissionByStoreOrderEntity(StoreOrderEntity $storeOrderEntity)
     {
         /** @var UserRepository $userRepository */
         $userRepository = app()->make(UserRepository::class);
-        $userEntity = $userRepository->getUserEntityByUid($uid);
-        if (empty($userEntity->getUid())) {
-            throw new ValidateException('未查询到用户信息');
-        }
-
-        $orderSn = '';
-        $merId = 0;
-
-        if ($typeShop == UserBillEnum::TYPE_SHOP['Platform']['code']) {
-            /** @var StoreOrderRepository $storeOrderRepository */
-            $storeOrderRepository = app()->make(StoreOrderRepository::class);
-            $storeOrderEntity = $storeOrderRepository->getStoreOrderEntityByOrderId($orderId);
-            if (empty($storeOrderEntity->getOrderId())) {
-                throw new ValidateException('未查询到订单信息');
-            }
-            $orderId = $storeOrderEntity->getOrderId();
-            $orderSn = $storeOrderEntity->getOrderSn();
-            $merId = $storeOrderEntity->getMerId();
-        }
-
-
-        $takeTime = 0;
-        if ($status == UserBillEnum::STATUS['VALID']['code']) {
-            $takeTime = time();
-        }
-
-        /** @var UserBillEntity $userBillEntity */
-        $userBillEntity = UserBillEntity::newInstance();
-        $userBillEntity->setUid($userEntity->getUid())
-            ->setLinkId($orderId)
-            ->setPm(UserBillEnum::PM['INCOME']['code'])
-            ->setTitle(ArrayUtil::getEnumNameByCode($commissionType, UserBillEnum::COMMISSION_TYPE))
-            ->setCategory('now_money')
-            ->setType('commission')
-            ->setNumber($number)
-            ->setMark($mark)
-            ->setStatus($status)
-            ->setCommissionType($commissionType)
-            ->setOrderSn($orderSn)
-            ->setTypeShop($typeShop)
-            ->setMerId($merId)
-            ->setSource(UserBillEnum::SOURCE['ONLINE']['code'])
-            ->setOrderType(UserBillEnum::ORDER_TYPE['SELF_OPERATED']['code'])
-            ->setIsRedBrokerage(UserBillEnum::IS_RED_BROKERAGE['NORMAL']['code'])
-            ->setGzc($gzc)
-            ->setTakeTime($takeTime);
+        $userEntity = $userRepository->getUserEntityByUid($storeOrderEntity->getUid());
+        if (empty($userEntity->getUid()) || $userEntity->getIsDel() == UserEnum::IS_DEL['Yes']['code']) {
+            throw new ValidateException('未查询到订单所属用户');
+        }
+
+        // 精彩生活区
+        if ($storeOrderEntity->getMerId() == CommonEnum::DESIGN_MERCHANT_ID['WonderfulLiving']['Self']['code']) {
+            // 为消费者 初始化 添加养老金记录
+            $yanglaojin = bcmul($storeOrderEntity->getConPri(), CommonEnum::ORDER_EARNING_ALLOCATION['WonderfulLiving']['Self']['YangLaoJin']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
+            /** @var UserBillRepository $userBillRepository */
+            $userBillRepository = app()->make(UserBillRepository::class);
+            $userBillEntity = $userBillRepository->addUserBill(
+                $storeOrderEntity->getUid(),
+                UserBillEnum::TYPE_SHOP['Platform']['code'],
+                $storeOrderEntity->getOrderId(),
+                UserBillEnum::COMMISSION_TYPE['PENSION']['code'],
+                $yanglaojin,
+                '消费获得养老金'
+            );
+
+            // 为用户初始胡 贡献值
+            $gongxian = bcmul($storeOrderEntity->getConPri(), CommonEnum::ORDER_EARNING_ALLOCATION['WonderfulLiving']['Self']['Gongxian']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
+            /** @var UserSignGongxianRepository $userSignGongxianRepository */
+            $userSignGongxianRepository = app()->make(UserSignGongxianRepository::class);
+            $userSignGongxianEntity = $userSignGongxianRepository->addUserSingGongxian(
+                $storeOrderEntity->getUid(),
+                UserSignGongxianEnum::TYPE['Give']['code'],
+                $gongxian,
+                '购买精彩生活商品赠送贡献值',
+                UserSignGongxianEnum::ORDER_TYPE['Platform']['code'],
+                $storeOrderEntity->getOrderId()
+            );
+
+            // 初始化 PV
+            $pv = bcmul($storeOrderEntity->getConPri(), CommonEnum::ORDER_EARNING_ALLOCATION['WonderfulLiving']['Self']['Pv']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
+            /** @var UserPvLogRepository $userPvLogRepository */
+            $userPvLogRepository = app()->make(UserPvLogRepository::class);
+            $userPvLogEntity = $userPvLogRepository->addUserPvLog(
+                $storeOrderEntity->getUid(),
+                $pv,
+                '购买精彩生活商品赠送PV值',
+                UserPvLogEnum::ORDER_TYPE['Platform']['code'],
+                $storeOrderEntity->getOrderId()
+            );
+
+            // 初始化积分
+            $score = bcmul($storeOrderEntity->getConPri(), CommonEnum::ORDER_EARNING_ALLOCATION['WonderfulLiving']['Self']['Score']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
+            /** @var UserSignScoreRepository $userSignScoreRepository */
+            $userSignScoreRepository = app()->make(UserSignScoreRepository::class);
+            $userSignScoreRepository->addUserSingScore(
+                $storeOrderEntity->getUid(),
+                UserSignScoreEnum::SOURCE_TYPE['SelfOrder']['code'],
+                UserSignScoreEnum::PM['Income']['code'],
+                $score,
+                '购买精彩生活商品赠送积分',
+                UserSignHongbaoEnum::ORDER_TYPE['Platform']['code'],
+                $storeOrderEntity->getOrderId()
+            );
+
+            // 给老用户的奖励
+            if ($userEntity->getIsOld()) {
+                $hongbao =  bcmul($storeOrderEntity->getConPri(), CommonEnum::ORDER_EARNING_ALLOCATION['WonderfulLiving']['Self']['Hongbao']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
+                /** @var UserSignHongbaoRepository $userSignHongbaoRepository */
+                $userSignHongbaoRepository = app()->make(UserSignHongbaoRepository::class);
+                $userSignHongbaoRepository->addUserSingHongbao(
+                    $storeOrderEntity->getUid(),
+                    UserSignHongbaoEnum::TYPE['ConsumptionGift']['code'],
+                    $hongbao,
+                    '购买精彩生活商品赠送红包',
+                    UserSignHongbaoEnum::ORDER_TYPE['Platform']['code'],
+                    $storeOrderEntity->getOrderId()
+                );
+            }
+
+            // 给推荐人的奖励
+            if (!empty($userEntity->getSpreadUid())) {
+                $userEntityBySpreadUid = $userRepository->getUserEntityByUid($userEntity->getSpreadUid());
+                if (!empty($userEntityBySpreadUid->getUid()) && $userEntityBySpreadUid->getIsDel() == UserEnum::IS_DEL['No']['code']) {
+                    // 推荐人 数据分配的 基础值
+                    $basics = bcmul($storeOrderEntity->getConPri(), CommonEnum::ORDER_EARNING_ALLOCATION['WonderfulLiving']['Spread']['Basics']['Ratio']['code'], CommonEnum::CALCULATE_THE_NUMBER_OF_DECIMAL_PLACES);
+
+                    // 后台设置中 可以设置  直推收益 的比例
+                    $rate = static::getUserGroupRate($userEntityBySpreadUid->getUserGroup());
+                    // 推荐 奖金 目前需要将 奖金按比例 分成佣金和复购金
+                    $directReferralBonus = bcmul($basics, $rate, CommonEnum::CALCULATE_THE_NUMBER_OF_DECIMAL_PLACES);
+
+                    // 计算 复购金
+                    $fugouBySpreadUid = bcmul($directReferralBonus, CommonEnum::ORDER_EARNING_ALLOCATION['WonderfulLiving']['Spread']['Fugou']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
+                    // 添加复购金记录
+                    /** @var UserSignFugouRepository $userSignFugouRepository */
+                    $userSignFugouRepository = app()->make(UserSignFugouRepository::class);
+                    $userSignFugouRepository->addUserSingFugou(
+                        $userEntityBySpreadUid->getUid(),
+                        UserSignFugouEnum::TYPE['Give']['code'],
+                        $fugouBySpreadUid,
+                        '用户购买精彩生活区商品',
+                        UserSignFugouEnum::ORDER_TYPE['Platform']['code'],
+                        $storeOrderEntity->getOrderId()
+                    );
+
+                    // 计算 佣金
+                    $brokeragePriceBySpreadUid = bcmul($directReferralBonus, CommonEnum::ORDER_EARNING_ALLOCATION['WonderfulLiving']['Spread']['BrokeragePrice']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
+                    // 添加佣金记录
+                    /** @var UserBillRepository $userBillRepository */
+                    $userBillRepository = app()->make(UserBillRepository::class);
+                    $userBillRepository->addUserBill(
+                        $userEntityBySpreadUid->getUid(),
+                        UserBillEnum::TYPE_SHOP['Platform']['code'],
+                        $storeOrderEntity->getOrderId(),
+                        UserBillEnum::COMMISSION_TYPE['DIRECT_REFERRAL']['code'],
+                        $brokeragePriceBySpreadUid,
+                        '推广获得佣金'
+                    );
+
+                    // 初始胡 贡献值
+                    $gongxianBySpreadUid = bcmul($storeOrderEntity->getConPri(), CommonEnum::ORDER_EARNING_ALLOCATION['WonderfulLiving']['Spread']['Gongxian']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
+                    // 赠送贡献值
+                    /** @var UserSignGongxianRepository $userSignGongxianRepository */
+                    $userSignGongxianRepository = app()->make(UserSignGongxianRepository::class);
+                    $userSignGongxianRepository->addUserSingGongxian(
+                        $userEntityBySpreadUid->getUid(),
+                        UserSignGongxianEnum::TYPE['Give']['code'],
+                        $gongxianBySpreadUid,
+                        '推广精彩生活商品赠送贡献值',
+                        UserSignGongxianEnum::ORDER_TYPE['Platform']['code'],
+                        $storeOrderEntity->getOrderId()
+                    );
+
+                    // 计算积分值
+                    $basicsScoreBySpreadUid = bcmul($storeOrderEntity->getConPri(), CommonEnum::ORDER_EARNING_ALLOCATION['WonderfulLiving']['Spread']['Score']['Ratio']['code'], CommonEnum::CALCULATE_THE_NUMBER_OF_DECIMAL_PLACES);
+                    $scoreBySpreadUid = bcmul($basicsScoreBySpreadUid, $rate, CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
+                    // 赠送积分
+                    /** @var UserSignScoreRepository $userSignScoreRepository */
+                    $userSignScoreRepository = app()->make(UserSignScoreRepository::class);
+                    $userSignScoreRepository->addUserSingScore(
+                        $userEntityBySpreadUid->getUid(),
+                        UserSignScoreEnum::SOURCE_TYPE['SelfOrder']['code'],
+                        UserSignScoreEnum::PM['Income']['code'],
+                        $scoreBySpreadUid,
+                        '推广精彩生活区商品赠送积分',
+                        UserSignHongbaoEnum::ORDER_TYPE['Platform']['code'],
+                        $storeOrderEntity->getOrderId()
+                    );
+                }
+            }
+
+            // 分享收益
+            if (!empty($storeOrderEntity->getShareUid())) {
+                $userEntityByShareUid = $userRepository->getUserEntityByUid($storeOrderEntity->getShareUid());
+                if (!empty($userEntityByShareUid->getUid()) && $userEntityByShareUid->getIsDel() == UserEnum::IS_DEL['No']['code']) {
+                    
+                }
+            }
+        }
     }
 }

app/common/repositories/user/UserBillRepository.php

@@ -13,14 +13,16 @@ namespace app\common\repositories\user;
 
 use app\common\dao\BaseDao;
 use app\common\dao\user\UserBillDao;
-use app\common\model\store\order\StoreOrder;
+use app\common\enum\user\UserBillEnum;
 use app\common\model\user\UserBill;
 use app\common\repositories\BaseRepository;
-use crmeb\jobs\SendTemplateMessageJob;
+use app\common\repositories\store\order\StoreOrderRepository;
+use app\entity\data\user\UserBillEntity;
+use app\utils\ArrayUtil;
+use think\db\exception\DbException;
+use think\exception\ValidateException;
 use think\facade\Cache;
-use function Symfony\Component\String\s;
 use think\facade\Db;
-use think\facade\Queue;
 use think\Model;
 
 /**
@@ -376,4 +378,94 @@ class UserBillRepository extends BaseRepository
     {
         return $this->bill($uid, $category, $type, 0, $data);
     }
+
+    /**
+     * 添加 bill 数据
+     * @param int $uid
+     * @param int $typeShop
+     * @param int $orderId
+     * @param int $commissionType
+     * @param float $number
+     * @param string $mark
+     * @return UserBillEntity
+     */
+    public function addUserBill(int $uid, int $typeShop, int $orderId, int $commissionType, float $number, string $mark): UserBillEntity
+    {
+
+        $orderSn = '';
+        $merId = 0;
+        if ($typeShop == UserBillEnum::TYPE_SHOP['Platform']['code']) {
+            /** @var StoreOrderRepository $storeOrderRepository */
+            $storeOrderRepository = app()->make(StoreOrderRepository::class);
+            $storeOrderEntity = $storeOrderRepository->getStoreOrderEntityByOrderId($orderId);
+            if (empty($storeOrderEntity->getOrderId())) {
+                throw new ValidateException('未查询到订单信息');
+            }
+            $orderId = $storeOrderEntity->getOrderId();
+            $orderSn = $storeOrderEntity->getOrderSn();
+            $merId = $storeOrderEntity->getMerId();
+        }
+
+        /** @var UserBillEntity $userBillEntity */
+        $userBillEntity = UserBillEntity::newInstance();
+        $userBillEntity->setUid($uid)
+            ->setLinkId($orderId)
+            ->setPm(UserBillEnum::PM['INCOME']['code'])
+            ->setTitle(ArrayUtil::getEnumNameByCode($commissionType, UserBillEnum::COMMISSION_TYPE))
+            ->setCategory('now_money')
+            ->setType('commission')
+            ->setNumber($number)
+            ->setMark($mark)
+            ->setStatus(UserBillEnum::STATUS['PENDING']['code'])
+            ->setCommissionType($commissionType)
+            ->setOrderSn($orderSn)
+            ->setTypeShop($typeShop)
+            ->setMerId($merId)
+            ->setSource(UserBillEnum::SOURCE['ONLINE']['code'])
+            ->setOrderType(UserBillEnum::ORDER_TYPE['SELF_OPERATED']['code'])
+            ->setIsRedBrokerage(UserBillEnum::IS_RED_BROKERAGE['NORMAL']['code'])
+            ->setGzc(UserBillEnum::GZC_STATUS['NOT_ENTERED']['code'])
+            ->setIsGzc(UserBillEnum::IS_GZC['NOT_STARTED']['code']);
+
+        return $this->createByEntity($userBillEntity);
+    }
+
+    /**
+     * 写入 数据
+     * @param UserBillEntity $userBillEntity
+     * @return UserBillEntity
+     */
+    public function createByEntity(UserBillEntity $userBillEntity): UserBillEntity
+    {
+        $result = $this->dao->create($userBillEntity->toUnderlineArray())->toArray();
+        /** @var UserBillEntity $entity */
+        $entity = UserBillEntity::newInstance($result);
+        return $entity;
+    }
+
+    /**
+     * @param int $billId
+     * @return UserBillEntity
+     */
+    public function getUserBillEntityByBillId(int $billId): UserBillEntity
+    {
+        /** @var UserBillEntity $entity */
+        $entity = $this->dao->getUserBillEntityByBillId($billId);
+        return $entity;
+    }
+
+    /**
+     * 更新记录的状态
+     * @param int $billId
+     * @param int $status
+     * @return int
+     */
+    public function updateStatusByBillId(int $billId, int $status): int
+    {
+        try {
+            return $this->dao->update($billId, ['status' => $status]);
+        } catch (DbException $e) {
+            throw new ValidateException('更新记录状态失败');
+        }
+    }
 }

app/common/repositories/user/UserPvLogRepository.php

@@ -0,0 +1,73 @@
+<?php
+
+namespace app\common\repositories\user;
+
+use app\common\dao\user\UserPvLogDao;
+use app\common\enum\user\UserPvLogEnum;
+use app\common\repositories\BaseRepository;
+use app\common\repositories\store\order\StoreOrderRepository;
+use app\entity\data\user\UserPvLogEntity;
+use think\exception\ValidateException;
+
+class UserPvLogRepository extends BaseRepository
+{
+    public function __construct(UserPvLogDao $dao)
+    {
+        $this->dao = $dao;
+    }
+
+    public function create($data)
+    {
+        return $this->dao->create($data);
+    }
+
+    /**
+     * 写入 PV记录
+     * @param UserPvLogEntity $userPvLogEntity
+     * @return UserPvLogEntity
+     */
+    public function createByEntity(UserPvLogEntity $userPvLogEntity): UserPvLogEntity
+    {
+        $result = $this->dao->create($userPvLogEntity->toUnderlineArray())->toArray();
+        /** @var UserPvLogEntity $entity */
+        $entity = UserPvLogEntity::newInstance($result);
+        return $entity;
+    }
+
+    /**
+     * 添加Pv 记录
+     * @param int $uid
+     * @param float $pv
+     * @param string $mark
+     * @param string $orderType
+     * @param string $orderId
+     * @return UserPvLogEntity
+     */
+    public function addUserPvLog(int $uid, float $pv, string $mark = '', string $orderType = '', string $orderId = ''): UserPvLogEntity
+    {
+        if (!empty($orderType)) {
+            if (!empty($orderId)) {
+                if ($orderType == UserPvLogEnum::ORDER_TYPE['Platform']['code']) {
+                    /** @var StoreOrderRepository $storeOrderRepository */
+                    $storeOrderRepository = app()->make(StoreOrderRepository::class);
+                    $storeOrderEntity = $storeOrderRepository->getStoreOrderEntityByOrderId((int)$orderId);
+                    if (empty($storeOrderEntity->getOrderId())) {
+                        throw new ValidateException('未查询到订单信息');
+                    }
+                }
+            }
+        }
+
+        /** @var UserPvLogEntity $userPvLogEntity */
+        $userPvLogEntity = UserPvLogEntity::newInstance();
+        $userPvLogEntity->setUid($uid)
+            ->setPv($pv)
+            ->setMark($mark)
+            ->setOrderType($orderType)
+            ->setOrderId($orderId)
+            ->setAddtime(time())
+            ->setStatus(UserPvLogEnum::STATUS['PendingConfirmation']['code']);
+
+        return $this->createByEntity($userPvLogEntity);
+    }
+}

app/common/repositories/user/UserRepository.php

@@ -15,6 +15,7 @@ use alipay\aop\AlipayConfig;
 use alipay\aop\AopCertClient;
 use app\common\dao\BaseDao;
 use app\common\dao\user\UserDao;
+use app\common\enum\user\UserBillEnum;
 use app\common\enum\user\UserSignFugouEnum;
 use app\common\enum\user\UserSignJingdouEnum;
 use app\common\enum\user\UserSignScoreEnum;
@@ -4565,7 +4566,7 @@ class UserRepository extends BaseRepository
         if ($type == UserSignFugouEnum::TYPE['Consume']['code']) {
             $surplus = bcsub($userEntity->getFugou(), $fugou, 2);
             if ($surplus < 0.00) {
-                throw new ValidateException('用户京豆不足');
+                throw new ValidateException('用户复购金不足');
             }
         } else {
             $surplus = bcadd($userEntity->getFugou(), $fugou, 2);
@@ -4593,4 +4594,53 @@ class UserRepository extends BaseRepository
         }
         return (float)$surplus;
     }
+
+    /**
+     * 更新用户复购金 并 写入 复购金变动记录
+     * @param int $uid
+     * @param int $type
+     * @param float $fugou
+     * @param string $mark
+     * @param string $orderType
+     * @param string $orderId
+     * @return float
+     */
+    public function updateUserBrokeragePriceByRecordId(int $uid, int $recordId): float
+    {
+        $userEntity = $this->getUserEntityByUid($uid);
+        if (empty($userEntity->getUid())) {
+            throw new ValidateException('未查询到用户信息');
+        }
+
+        /** @var UserBillRepository $userBillRepository */
+        $userBillRepository = app()->make(UserBillRepository::class);
+        $userBillEntity = $userBillRepository->getUserBillEntityByBillId($recordId);
+        if (empty($userBillEntity->getBillId())) {
+            throw new ValidateException('未查询到佣金记录信息');
+        }
+        if ($userBillEntity->getCommissionType() != UserBillEnum::COMMISSION_TYPE['DIRECT_REFERRAL']['code'] && $userBillEntity->getCommissionType() != UserBillEnum::COMMISSION_TYPE['SHARE_EARNINGS']['code']) {
+            throw new ValidateException('该记录信息非佣金记录');
+        }
+        if ($userBillEntity->getStatus() != UserBillEnum::STATUS['PENDING']['code']) {
+            throw new ValidateException('该记录信息非待分配状态');
+        }
+
+        if ($userBillEntity->getPm() == UserBillEnum::PM['EXPEND']['code']) {
+            $surplus = bcsub($userEntity->getBrokeragePrice(), $userBillEntity->getNumber(), 2);
+            if ($surplus < 0.00) {
+                throw new ValidateException('用户佣金不足');
+            }
+        } else {
+            $surplus = bcadd($userEntity->getBrokeragePrice(), $userBillEntity->getNumber(), 2);
+        }
+        try {
+            $this->dao->update($uid, ['brokerage_price' => $surplus]);
+
+            // 注意 单一
+            // $userBillRepository->updateStatusByBillId($userBillEntity->getBillId(), UserBillEnum::STATUS['VALID']['code']);
+        } catch (DbException $e) {
+            throw new ValidateException('更新京豆失败');
+        }
+        return (float)$surplus;
+    }
 }

app/common/repositories/user/UserSignFugouRepository.php

@@ -3,7 +3,11 @@
 namespace app\common\repositories\user;
 
 use app\common\dao\user\UserSignFugouDao;
+use app\common\enum\user\UserSignFugouEnum;
 use app\common\repositories\BaseRepository;
+use app\common\repositories\store\order\StoreOrderRepository;
+use app\entity\data\user\UserSignFugouEntity;
+use think\exception\ValidateException;
 
 class UserSignFugouRepository extends BaseRepository
 {
@@ -16,4 +20,56 @@ class UserSignFugouRepository extends BaseRepository
     {
         return $this->dao->create($data);
     }
+
+    /**
+     * 写入 复购金 记录
+     * @param UserSignFugouEntity $userSignFugouEntity
+     * @return UserSignFugouEntity
+     */
+    public function createByEntity(UserSignFugouEntity $userSignFugouEntity): UserSignFugouEntity
+    {
+        $result = $this->dao->create($userSignFugouEntity->toUnderlineArray())->toArray();
+        /** @var UserSignFugouEntity $entity */
+        $entity = UserSignFugouEntity::newInstance($result);
+        return $entity;
+    }
+
+    /**
+     * 添加 复购金记录
+     * @param int $uid
+     * @param int $type
+     * @param float $number
+     * @param string $mark
+     * @param string $orderType
+     * @param string $orderId
+     * @return UserSignFugouEntity
+     */
+    public function addUserSingFugou(int $uid, int $type, float $number, string $mark = '', string $orderType = '', string $orderId = ''): UserSignFugouEntity
+    {
+        if (!empty($orderType)) {
+            if (!empty($orderId)) {
+                if ($orderType == UserSignFugouEnum::ORDER_TYPE['Platform']['code']) {
+                    /** @var StoreOrderRepository $storeOrderRepository */
+                    $storeOrderRepository = app()->make(StoreOrderRepository::class);
+                    $storeOrderEntity = $storeOrderRepository->getStoreOrderEntityByOrderId((int)$orderId);
+                    if (empty($storeOrderEntity->getOrderId())) {
+                        throw new ValidateException('未查询到订单信息');
+                    }
+                }
+            }
+        }
+
+        /** @var UserSignFugouEntity $userSignFugouEntity */
+        $userSignFugouEntity = UserSignFugouEntity::newInstance();
+        $userSignFugouEntity->setUid($uid)
+            ->setType($type)
+            ->setNumber($number)
+            ->setMark($mark)
+            ->setOrderType($orderType)
+            ->setOrderId($orderId)
+            ->setAddtime(time())
+            ->setStatus(UserSignFugouEnum::STATUS['Pending']['code']);
+
+        return $this->createByEntity($userSignFugouEntity);
+    }
 }

app/common/repositories/user/UserSignGongxianRepository.php

@@ -0,0 +1,79 @@
+<?php
+
+namespace app\common\repositories\user;
+
+use app\common\dao\user\UserSignGongxianDao;
+use app\common\enum\user\UserSignGongxianEnum;
+use app\common\repositories\BaseRepository;
+use app\common\repositories\store\order\StoreOrderRepository;
+use app\entity\data\user\UserSignGongxianEntity;
+use think\exception\ValidateException;
+
+class UserSignGongxianRepository extends BaseRepository
+{
+    public function __construct(UserSignGongxianDao $dao)
+    {
+        $this->dao = $dao;
+    }
+
+    public function create($data)
+    {
+        return $this->dao->create($data);
+    }
+
+    /**
+     * 写入贡献值记录
+     * @param UserSignGongxianEntity $userSignGongxianEntity
+     * @return UserSignGongxianEntity
+     */
+    public function createByEntity(UserSignGongxianEntity $userSignGongxianEntity): UserSignGongxianEntity
+    {
+        $result = $this->dao->create($userSignGongxianEntity->toUnderlineArray())->toArray();
+        /** @var UserSignGongxianEntity $entity */
+        $entity = UserSignGongxianEntity::newInstance($result);
+        return $entity;
+    }
+
+    /**
+     * 添加贡献值记录
+     * @param int $uid
+     * @param int $type
+     * @param float $number
+     * @param string $mark
+     * @param string $orderType
+     * @param string $orderId
+     * @return UserSignGongxianEntity
+     */
+    public function addUserSingGongxian(int $uid, int $type, float $number, string $mark = '', string $orderType = '', string $orderId = ''): UserSignGongxianEntity
+    {
+        $merId = 0;
+        if (!empty($orderType)) {
+            if (!empty($orderId)) {
+                if ($orderType == UserSignGongxianEnum::ORDER_TYPE['Platform']['code']) {
+                    /** @var StoreOrderRepository $storeOrderRepository */
+                    $storeOrderRepository = app()->make(StoreOrderRepository::class);
+                    $storeOrderEntity = $storeOrderRepository->getStoreOrderEntityByOrderId((int)$orderId);
+                    if (empty($storeOrderEntity->getOrderId())) {
+                        throw new ValidateException('未查询到订单信息');
+                    }
+                    $merId = $storeOrderEntity->getMerId();
+                }
+            }
+        }
+
+        /** @var UserSignGongxianEntity $userSignGongxianEntity */
+        $userSignGongxianEntity = UserSignGongxianEntity::newInstance();
+        $userSignGongxianEntity->setUid($uid)
+            ->setType($type)
+            ->setNumber($number)
+            ->setMark($mark)
+            ->setOrderType($orderType)
+            ->setOrderId($orderId)
+            ->setMerId($merId)
+            ->setAddtime(time())
+            ->setStatus(UserSignGongxianEnum::STATUS['PendingConfirmation']['code']);
+
+        return $this->createByEntity($userSignGongxianEntity);
+    }
+
+}

app/common/repositories/user/UserSignHongbaoRepository.php

@@ -0,0 +1,76 @@
+<?php
+
+namespace app\common\repositories\user;
+
+use app\common\dao\user\UserSignHongbaoDao;
+use app\common\enum\user\UserSignHongbaoEnum;
+use app\common\repositories\BaseRepository;
+use app\common\repositories\store\order\StoreOrderRepository;
+use app\entity\data\user\UserSignHongbaoEntity;
+use think\exception\ValidateException;
+
+class UserSignHongbaoRepository extends BaseRepository
+{
+    public function __construct(UserSignHongbaoDao $dao)
+    {
+        $this->dao = $dao;
+    }
+
+    public function create($data)
+    {
+        return $this->dao->create($data);
+    }
+
+    /**
+     * 写入红包记录
+     * @param UserSignHongbaoEntity $userSignHongbaoEntity
+     * @return UserSignHongbaoEntity
+     */
+    public function createByEntity(UserSignHongbaoEntity $userSignHongbaoEntity): UserSignHongbaoEntity
+    {
+        $result = $this->dao->create($userSignHongbaoEntity->toUnderlineArray())->toArray();
+        /** @var UserSignHongbaoEntity $entity */
+        $entity = UserSignHongbaoEntity::newInstance($result);
+        return $entity;
+    }
+
+    /**
+     * 添加红包记录
+     * @param int $uid
+     * @param int $type
+     * @param float $number
+     * @param string $mark
+     * @param string $orderType
+     * @param string $orderId
+     * @return UserSignHongbaoEntity
+     */
+    public function addUserSingHongbao(int $uid, int $type, float $number, string $mark = '', string $orderType = '', string $orderId = ''): UserSignHongbaoEntity
+    {
+        if (!empty($orderType)) {
+            if (!empty($orderId)) {
+                if ($orderType == UserSignHongbaoEnum::ORDER_TYPE['Platform']['code']) {
+                    /** @var StoreOrderRepository $storeOrderRepository */
+                    $storeOrderRepository = app()->make(StoreOrderRepository::class);
+                    $storeOrderEntity = $storeOrderRepository->getStoreOrderEntityByOrderId((int)$orderId);
+                    if (empty($storeOrderEntity->getOrderId())) {
+                        throw new ValidateException('未查询到订单信息');
+                    }
+                }
+            }
+        }
+
+        /** @var UserSignHongbaoEntity $userSignHongbaoEntity */
+        $userSignHongbaoEntity = UserSignHongbaoEntity::newInstance();
+        $userSignHongbaoEntity->setUid($uid)
+            ->setType($type)
+            ->setNumber($number)
+            ->setMark($mark)
+            ->setOrderType($orderType)
+            ->setOrderId($orderId)
+            ->setAddtime(time())
+            ->setStatus(UserSignHongbaoEnum::STATUS['PendingConfirmation']['code']);
+
+        return $this->createByEntity($userSignHongbaoEntity);
+    }
+
+}

app/common/repositories/user/UserSignScoreRepository.php

@@ -3,7 +3,11 @@
 namespace app\common\repositories\user;
 
 use app\common\dao\user\UserSignScoreDao;
+use app\common\enum\user\UserSignScoreEnum;
 use app\common\repositories\BaseRepository;
+use app\common\repositories\store\order\StoreOrderRepository;
+use app\entity\data\user\UserSignScoreEntity;
+use think\exception\ValidateException;
 
 class UserSignScoreRepository extends BaseRepository
 {
@@ -16,4 +20,59 @@ class UserSignScoreRepository extends BaseRepository
     {
         return $this->dao->create($data);
     }
+
+    /**
+     * 写入贡献值记录
+     * @param UserSignScoreEntity $userSignScoreEntity
+     * @return UserSignScoreEntity
+     */
+    public function createByEntity(UserSignScoreEntity $userSignScoreEntity): UserSignScoreEntity
+    {
+        $result = $this->dao->create($userSignScoreEntity->toUnderlineArray())->toArray();
+        /** @var UserSignScoreEntity $entity */
+        $entity = UserSignScoreEntity::newInstance($result);
+        return $entity;
+    }
+
+    /**
+     * 添加 积分记录
+     * @param int $uid
+     * @param int $sourceType
+     * @param int $type
+     * @param float $number
+     * @param string $mark
+     * @param string $orderType
+     * @param string $orderId
+     * @return UserSignScoreEntity
+     */
+    public function addUserSingScore(int $uid, int $sourceType, int $type, float $number, string $mark = '', string $orderType = '', string $orderId = ''): UserSignScoreEntity
+    {
+
+        if (!empty($orderType)) {
+            if (!empty($orderId)) {
+                if ($orderType == UserSignScoreEnum::ORDER_TYPE['Platform']['code']) {
+                    /** @var StoreOrderRepository $storeOrderRepository */
+                    $storeOrderRepository = app()->make(StoreOrderRepository::class);
+                    $storeOrderEntity = $storeOrderRepository->getStoreOrderEntityByOrderId((int)$orderId);
+                    if (empty($storeOrderEntity->getOrderId())) {
+                        throw new ValidateException('未查询到订单信息');
+                    }
+                }
+            }
+        }
+
+        /** @var UserSignScoreEntity $userSignScoreEntity */
+        $userSignScoreEntity = UserSignScoreEntity::newInstance();
+        $userSignScoreEntity->setUid($uid)
+            ->setSourceType($sourceType)
+            ->setPm($type)
+            ->setRewardScore($number)
+            ->setMark($mark)
+            ->setOrderType($orderType)
+            ->setOrderId($orderId)
+            ->setAddtime(time())
+            ->setStatus(UserSignScoreEnum::STATUS['Pending']['code']);
+
+        return $this->createByEntity($userSignScoreEntity);
+    }
 }

app/entity/data/gzc/GzcLogEntity.php

@@ -0,0 +1,522 @@
+<?php
+
+namespace app\entity\data\gzc;
+
+use app\entity\data\DataEntity;
+
+class GzcLogEntity extends DataEntity
+{
+    public $id = 0;  // 日志ID
+    public $uid = 0;  // 用户ID
+    public $platformNo = '';  // 平台申请单号
+    public $accountType = 0;  // 账号类型 1银行卡 2支付宝 3微信
+    public $bankName = '';  // 开户银行名称
+    public $branchName = '';  // 支行名称
+    public $bankAccount = '';  // 开户银行账号
+    public $bankNo = '';  // 银行流水号
+    public $alipayAccount = '';  // 支付宝支付账号
+    public $alipayNo = '';  // 支付宝流水号
+    public $wxpayAccount = '';  // 微信账号
+    public $wxpayNo = '';  // 交易流水号
+    public $userName = '';  // 消费者姓名
+    public $mobile = '';  // 消费者电话
+    public $userCard = '';  // 消费者证件号
+    public $pension = 0.00;  // 存入的养老金金额
+    public $gzc = 0;  // 公证处是否已发起入账 0否 1是
+    public $gzcDepositNo = '';  // 公证处入账明细编号
+    public $gzcConfirmResult = '';  // 公证处入账结果
+    public $success = 0;  // 是否入账成功 0否 1是
+    public $orderType = 0;  // 订单类型 1-线下支付 2-线上支付 3-拼多多 4-京东 5-苏宁 6-淘宝 7-唯品会 8-抖音 9-话费
+    public $outTradeNo = '';  // 单号
+    public $depositDt = null;  // 存入时间
+    public $payTime = null;  // 支付时间
+    public $createTime = null;  // 创建时间
+    public $updateTime = null;  // 更新时间
+    public $linkId = 0;  // 关联账单id
+
+    /**
+     * @return int
+     */
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+    /**
+     * @param int $id
+     * @return GzcLogEntity
+     */
+    public function setId(int $id): GzcLogEntity
+    {
+        $this->id = $id;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getUid(): int
+    {
+        return $this->uid;
+    }
+
+    /**
+     * @param int $uid
+     * @return GzcLogEntity
+     */
+    public function setUid(int $uid): GzcLogEntity
+    {
+        $this->uid = $uid;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getPlatformNo(): string
+    {
+        return $this->platformNo;
+    }
+
+    /**
+     * @param string $platformNo
+     * @return GzcLogEntity
+     */
+    public function setPlatformNo(string $platformNo): GzcLogEntity
+    {
+        $this->platformNo = $platformNo;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getAccountType(): int
+    {
+        return $this->accountType;
+    }
+
+    /**
+     * @param int $accountType
+     * @return GzcLogEntity
+     */
+    public function setAccountType(int $accountType): GzcLogEntity
+    {
+        $this->accountType = $accountType;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getBankName(): string
+    {
+        return $this->bankName;
+    }
+
+    /**
+     * @param string $bankName
+     * @return GzcLogEntity
+     */
+    public function setBankName(string $bankName): GzcLogEntity
+    {
+        $this->bankName = $bankName;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getBranchName(): string
+    {
+        return $this->branchName;
+    }
+
+    /**
+     * @param string $branchName
+     * @return GzcLogEntity
+     */
+    public function setBranchName(string $branchName): GzcLogEntity
+    {
+        $this->branchName = $branchName;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getBankAccount(): string
+    {
+        return $this->bankAccount;
+    }
+
+    /**
+     * @param string $bankAccount
+     * @return GzcLogEntity
+     */
+    public function setBankAccount(string $bankAccount): GzcLogEntity
+    {
+        $this->bankAccount = $bankAccount;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getBankNo(): string
+    {
+        return $this->bankNo;
+    }
+
+    /**
+     * @param string $bankNo
+     * @return GzcLogEntity
+     */
+    public function setBankNo(string $bankNo): GzcLogEntity
+    {
+        $this->bankNo = $bankNo;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getAlipayAccount(): string
+    {
+        return $this->alipayAccount;
+    }
+
+    /**
+     * @param string $alipayAccount
+     * @return GzcLogEntity
+     */
+    public function setAlipayAccount(string $alipayAccount): GzcLogEntity
+    {
+        $this->alipayAccount = $alipayAccount;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getAlipayNo(): string
+    {
+        return $this->alipayNo;
+    }
+
+    /**
+     * @param string $alipayNo
+     * @return GzcLogEntity
+     */
+    public function setAlipayNo(string $alipayNo): GzcLogEntity
+    {
+        $this->alipayNo = $alipayNo;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getWxpayAccount(): string
+    {
+        return $this->wxpayAccount;
+    }
+
+    /**
+     * @param string $wxpayAccount
+     * @return GzcLogEntity
+     */
+    public function setWxpayAccount(string $wxpayAccount): GzcLogEntity
+    {
+        $this->wxpayAccount = $wxpayAccount;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getWxpayNo(): string
+    {
+        return $this->wxpayNo;
+    }
+
+    /**
+     * @param string $wxpayNo
+     * @return GzcLogEntity
+     */
+    public function setWxpayNo(string $wxpayNo): GzcLogEntity
+    {
+        $this->wxpayNo = $wxpayNo;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getUserName(): string
+    {
+        return $this->userName;
+    }
+
+    /**
+     * @param string $userName
+     * @return GzcLogEntity
+     */
+    public function setUserName(string $userName): GzcLogEntity
+    {
+        $this->userName = $userName;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getMobile(): string
+    {
+        return $this->mobile;
+    }
+
+    /**
+     * @param string $mobile
+     * @return GzcLogEntity
+     */
+    public function setMobile(string $mobile): GzcLogEntity
+    {
+        $this->mobile = $mobile;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getUserCard(): string
+    {
+        return $this->userCard;
+    }
+
+    /**
+     * @param string $userCard
+     * @return GzcLogEntity
+     */
+    public function setUserCard(string $userCard): GzcLogEntity
+    {
+        $this->userCard = $userCard;
+        return $this;
+    }
+
+    /**
+     * @return float
+     */
+    public function getPension(): float
+    {
+        return $this->pension;
+    }
+
+    /**
+     * @param float $pension
+     * @return GzcLogEntity
+     */
+    public function setPension(float $pension): GzcLogEntity
+    {
+        $this->pension = $pension;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getGzc(): int
+    {
+        return $this->gzc;
+    }
+
+    /**
+     * @param int $gzc
+     * @return GzcLogEntity
+     */
+    public function setGzc(int $gzc): GzcLogEntity
+    {
+        $this->gzc = $gzc;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getGzcDepositNo(): string
+    {
+        return $this->gzcDepositNo;
+    }
+
+    /**
+     * @param string $gzcDepositNo
+     * @return GzcLogEntity
+     */
+    public function setGzcDepositNo(string $gzcDepositNo): GzcLogEntity
+    {
+        $this->gzcDepositNo = $gzcDepositNo;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getGzcConfirmResult(): string
+    {
+        return $this->gzcConfirmResult;
+    }
+
+    /**
+     * @param string $gzcConfirmResult
+     * @return GzcLogEntity
+     */
+    public function setGzcConfirmResult(string $gzcConfirmResult): GzcLogEntity
+    {
+        $this->gzcConfirmResult = $gzcConfirmResult;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getSuccess(): int
+    {
+        return $this->success;
+    }
+
+    /**
+     * @param int $success
+     * @return GzcLogEntity
+     */
+    public function setSuccess(int $success): GzcLogEntity
+    {
+        $this->success = $success;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getOrderType(): int
+    {
+        return $this->orderType;
+    }
+
+    /**
+     * @param int $orderType
+     * @return GzcLogEntity
+     */
+    public function setOrderType(int $orderType): GzcLogEntity
+    {
+        $this->orderType = $orderType;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getOutTradeNo(): string
+    {
+        return $this->outTradeNo;
+    }
+
+    /**
+     * @param string $outTradeNo
+     * @return GzcLogEntity
+     */
+    public function setOutTradeNo(string $outTradeNo): GzcLogEntity
+    {
+        $this->outTradeNo = $outTradeNo;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getDepositDt()
+    {
+        return $this->depositDt;
+    }
+
+    /**
+     * @param null $depositDt
+     * @return GzcLogEntity
+     */
+    public function setDepositDt($depositDt)
+    {
+        $this->depositDt = $depositDt;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getPayTime()
+    {
+        return $this->payTime;
+    }
+
+    /**
+     * @param null $payTime
+     * @return GzcLogEntity
+     */
+    public function setPayTime($payTime)
+    {
+        $this->payTime = $payTime;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getCreateTime()
+    {
+        return $this->createTime;
+    }
+
+    /**
+     * @param null $createTime
+     * @return GzcLogEntity
+     */
+    public function setCreateTime($createTime)
+    {
+        $this->createTime = $createTime;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getUpdateTime()
+    {
+        return $this->updateTime;
+    }
+
+    /**
+     * @param null $updateTime
+     * @return GzcLogEntity
+     */
+    public function setUpdateTime($updateTime)
+    {
+        $this->updateTime = $updateTime;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getLinkId(): int
+    {
+        return $this->linkId;
+    }
+
+    /**
+     * @param int $linkId
+     * @return GzcLogEntity
+     */
+    public function setLinkId(int $linkId): GzcLogEntity
+    {
+        $this->linkId = $linkId;
+        return $this;
+    }
+}

app/entity/data/store/StoreOrderEntity.php

@@ -86,7 +86,7 @@ class StoreOrderEntity extends DataEntity
     public $isDayPay = null;  // 是否代付订单
     public $isSettlement = 0;  // 是否已结算
     public $settlementTime = null;  // 结算时间
-    public $shareUid = null;  // 分享用户uid
+    public $shareUid = 0;  // 分享用户uid
     public $conPri = null;  // 利润
     public $userOfGoodsId = '';  // 会员区升级权限的ID
     public $fzonePaytype = '';  // 组合支付
@@ -1539,20 +1539,20 @@ class StoreOrderEntity extends DataEntity
     }
 
     /**
-     * @return null
+     * @return int
      */
-    public function getShareUid()
+    public function getShareUid(): int
     {
-        return $this->shareUid;
+        return (int)$this->shareUid;
     }
 
     /**
-     * @param null $shareUid
+     * @param mixed $shareUid
      * @return StoreOrderEntity
      */
-    public function setShareUid($shareUid)
+    public function setShareUid($shareUid): StoreOrderEntity
     {
-        $this->shareUid = $shareUid;
+        $this->shareUid = (int)$shareUid;
         return $this;
     }
 

app/entity/data/user/UserPvLogEntity.php

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

app/entity/data/user/UserSignGongxianEntity.php

@@ -0,0 +1,275 @@
+<?php
+
+namespace app\entity\data\user;
+
+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 $settlementTime = null;  // 结算时间
+    public $addtime = 0;  // 添加时间
+    public $pv = 0.00;  // pv值
+
+    /**
+     * @return int
+     */
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+    /**
+     * @param int $id
+     * @return UserSignGongxianEntity
+     */
+    public function setId(int $id): UserSignGongxianEntity
+    {
+        $this->id = $id;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getUid(): int
+    {
+        return $this->uid;
+    }
+
+    /**
+     * @param int $uid
+     * @return UserSignGongxianEntity
+     */
+    public function setUid(int $uid): UserSignGongxianEntity
+    {
+        $this->uid = $uid;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getMerId(): int
+    {
+        return $this->merId;
+    }
+
+    /**
+     * @param int $merId
+     * @return UserSignGongxianEntity
+     */
+    public function setMerId(int $merId): UserSignGongxianEntity
+    {
+        $this->merId = $merId;
+        return $this;
+    }
+
+    /**
+     * @return float
+     */
+    public function getNumber(): float
+    {
+        return $this->number;
+    }
+
+    /**
+     * @param float $number
+     * @return UserSignGongxianEntity
+     */
+    public function setNumber(float $number): UserSignGongxianEntity
+    {
+        $this->number = $number;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getStatus(): int
+    {
+        return $this->status;
+    }
+
+    /**
+     * @param int $status
+     * @return UserSignGongxianEntity
+     */
+    public function setStatus(int $status): UserSignGongxianEntity
+    {
+        $this->status = $status;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getMark(): string
+    {
+        return $this->mark;
+    }
+
+    /**
+     * @param string $mark
+     * @return UserSignGongxianEntity
+     */
+    public function setMark(string $mark): UserSignGongxianEntity
+    {
+        $this->mark = $mark;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getDesc(): string
+    {
+        return $this->desc;
+    }
+
+    /**
+     * @param string $desc
+     * @return UserSignGongxianEntity
+     */
+    public function setDesc(string $desc): UserSignGongxianEntity
+    {
+        $this->desc = $desc;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getOrderId(): string
+    {
+        return $this->orderId;
+    }
+
+    /**
+     * @param string $orderId
+     * @return UserSignGongxianEntity
+     */
+    public function setOrderId(string $orderId): UserSignGongxianEntity
+    {
+        $this->orderId = $orderId;
+        return $this;
+    }
+
+    /**
+     * @return float
+     */
+    public function getSurplus(): float
+    {
+        return $this->surplus;
+    }
+
+    /**
+     * @param float $surplus
+     * @return UserSignGongxianEntity
+     */
+    public function setSurplus(float $surplus): UserSignGongxianEntity
+    {
+        $this->surplus = $surplus;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getOrderType(): string
+    {
+        return $this->orderType;
+    }
+
+    /**
+     * @param string $orderType
+     * @return UserSignGongxianEntity
+     */
+    public function setOrderType(string $orderType): UserSignGongxianEntity
+    {
+        $this->orderType = $orderType;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getType()
+    {
+        return $this->type;
+    }
+
+    /**
+     * @param mixed $type
+     * @return UserSignGongxianEntity
+     */
+    public function setType($type): UserSignGongxianEntity
+    {
+        $this->type = $type;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getSettlementTime()
+    {
+        return $this->settlementTime;
+    }
+
+    /**
+     * @param mixed $settlementTime
+     * @return UserSignGongxianEntity
+     */
+    public function setSettlementTime($settlementTime): UserSignGongxianEntity
+    {
+        $this->settlementTime = $settlementTime;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getAddtime(): int
+    {
+        return $this->addtime;
+    }
+
+    /**
+     * @param int $addtime
+     * @return UserSignGongxianEntity
+     */
+    public function setAddtime(int $addtime): UserSignGongxianEntity
+    {
+        $this->addtime = $addtime;
+        return $this;
+    }
+
+    /**
+     * @return float
+     */
+    public function getPv(): float
+    {
+        return $this->pv;
+    }
+
+    /**
+     * @param float $pv
+     * @return UserSignGongxianEntity
+     */
+    public function setPv(float $pv): UserSignGongxianEntity
+    {
+        $this->pv = $pv;
+        return $this;
+    }
+}

app/entity/data/user/UserSignHongbaoEntity.php

@@ -0,0 +1,237 @@
+<?php
+
+namespace app\entity\data\user;
+
+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 $settlementTime = null;  // 结算时间
+    public $addtime = 0;  // 添加时间
+
+    /**
+     * @return int
+     */
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+    /**
+     * @param int $id
+     * @return UserSignHongbaoEntity
+     */
+    public function setId(int $id): UserSignHongbaoEntity
+    {
+        $this->id = $id;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getUid(): int
+    {
+        return $this->uid;
+    }
+
+    /**
+     * @param int $uid
+     * @return UserSignHongbaoEntity
+     */
+    public function setUid(int $uid): UserSignHongbaoEntity
+    {
+        $this->uid = $uid;
+        return $this;
+    }
+
+    /**
+     * @return float
+     */
+    public function getNumber(): float
+    {
+        return $this->number;
+    }
+
+    /**
+     * @param float $number
+     * @return UserSignHongbaoEntity
+     */
+    public function setNumber(float $number): UserSignHongbaoEntity
+    {
+        $this->number = $number;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getStatus(): int
+    {
+        return $this->status;
+    }
+
+    /**
+     * @param int $status
+     * @return UserSignHongbaoEntity
+     */
+    public function setStatus(int $status): UserSignHongbaoEntity
+    {
+        $this->status = $status;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getMark(): string
+    {
+        return $this->mark;
+    }
+
+    /**
+     * @param string $mark
+     * @return UserSignHongbaoEntity
+     */
+    public function setMark(string $mark): UserSignHongbaoEntity
+    {
+        $this->mark = $mark;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getDesc(): string
+    {
+        return $this->desc;
+    }
+
+    /**
+     * @param string $desc
+     * @return UserSignHongbaoEntity
+     */
+    public function setDesc(string $desc): UserSignHongbaoEntity
+    {
+        $this->desc = $desc;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getOrderId(): string
+    {
+        return $this->orderId;
+    }
+
+    /**
+     * @param string $orderId
+     * @return UserSignHongbaoEntity
+     */
+    public function setOrderId(string $orderId): UserSignHongbaoEntity
+    {
+        $this->orderId = $orderId;
+        return $this;
+    }
+
+    /**
+     * @return float
+     */
+    public function getSurplus(): float
+    {
+        return $this->surplus;
+    }
+
+    /**
+     * @param float $surplus
+     * @return UserSignHongbaoEntity
+     */
+    public function setSurplus(float $surplus): UserSignHongbaoEntity
+    {
+        $this->surplus = $surplus;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getOrderType(): string
+    {
+        return $this->orderType;
+    }
+
+    /**
+     * @param string $orderType
+     * @return UserSignHongbaoEntity
+     */
+    public function setOrderType(string $orderType): UserSignHongbaoEntity
+    {
+        $this->orderType = $orderType;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getType()
+    {
+        return $this->type;
+    }
+
+    /**
+     * @param null $type
+     * @return UserSignHongbaoEntity
+     */
+    public function setType($type)
+    {
+        $this->type = $type;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getSettlementTime()
+    {
+        return $this->settlementTime;
+    }
+
+    /**
+     * @param null $settlementTime
+     * @return UserSignHongbaoEntity
+     */
+    public function setSettlementTime($settlementTime)
+    {
+        $this->settlementTime = $settlementTime;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getAddtime(): int
+    {
+        return $this->addtime;
+    }
+
+    /**
+     * @param int $addtime
+     * @return UserSignHongbaoEntity
+     */
+    public function setAddtime(int $addtime): UserSignHongbaoEntity
+    {
+        $this->addtime = $addtime;
+        return $this;
+    }
+}