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

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

@@ -13,6 +13,8 @@ namespace app\common\dao\store\order;
 
 use app\common\dao\BaseDao;
 use app\common\model\store\order\StoreGroupOrder;
+use app\entity\CommonEntity;
+use app\entity\data\store\StoreGroupOrderEntity;
 
 /**
  * Class StoreGroupOrderDao
@@ -89,4 +91,29 @@ class StoreGroupOrderDao extends BaseDao
     {
         return StoreGroupOrder::getDB()->where('pay_type', 0)->where('uid', $uid)->sum('pay_price') ?: 0;
     }
+
+    /**
+     * @param array $groupOrderIdList
+     * @return CommonEntity[]
+     */
+    public function getStoreGroupOrderEntityListByGroupOrderIdList(array $groupOrderIdList): array
+    {
+        $entityList = [];
+        try {
+            /** @var StoreGroupOrder $model */
+            $model = $this->getModel();
+            $dataRes = $model::getDB()
+                ->whereIn('group_order_id', $groupOrderIdList)
+                ->select()
+                ->toArray();
+            if (!empty($dataRes)) {
+                $entityList = array_map(function ($data) {
+                    return StoreGroupOrderEntity::newInstance($data);
+                }, $dataRes);
+            }
+        } catch (\Exception $e) {
+
+        }
+        return $entityList;
+    }
 }

app/common/dao/user/UserSignFugouDao.php

@@ -4,6 +4,8 @@ namespace app\common\dao\user;
 
 use app\common\dao\BaseDao;
 use app\common\model\user\UserSignFugou;
+use app\entity\CommonEntity;
+use app\entity\data\user\UserSignFugouEntity;
 
 class UserSignFugouDao extends BaseDao
 {
@@ -11,4 +13,29 @@ class UserSignFugouDao extends BaseDao
     {
         return UserSignFugou::class;
     }
+
+    /**
+     * @param array $idList
+     * @return CommonEntity[]
+     */
+    public function getStoreSignFugouEntityListByIdList(array $idList): array
+    {
+        $entityList = [];
+        try {
+            /** @var UserSignFugou $model */
+            $model = $this->getModel();
+            $dataRes = $model::getDB()
+                ->whereIn('id', $idList)
+                ->select()
+                ->toArray();
+            if (!empty($dataRes)) {
+                $entityList = array_map(function ($data) {
+                    return UserSignFugouEntity::newInstance($data);
+                }, $dataRes);
+            }
+        } catch (\Exception $e) {
+
+        }
+        return $entityList;
+    }
 }

app/common/dao/user/UserSignJingdouDao.php

@@ -4,6 +4,8 @@ namespace app\common\dao\user;
 
 use app\common\dao\BaseDao;
 use app\common\model\user\UserSignJingdou;
+use app\entity\CommonEntity;
+use app\entity\data\user\UserSignJingdouEntity;
 
 class UserSignJingdouDao extends BaseDao
 {
@@ -11,4 +13,29 @@ class UserSignJingdouDao extends BaseDao
     {
         return UserSignJingdou::class;
     }
+
+    /**
+     * @param array $idList
+     * @return CommonEntity[]
+     */
+    public function getStoreSignJingdouEntityListByIdList(array $idList): array
+    {
+        $entityList = [];
+        try {
+            /** @var UserSignJingdou $model */
+            $model = $this->getModel();
+            $dataRes = $model::getDB()
+                ->whereIn('id', $idList)
+                ->select()
+                ->toArray();
+            if (!empty($dataRes)) {
+                $entityList = array_map(function ($data) {
+                    return UserSignJingdouEntity::newInstance($data);
+                }, $dataRes);
+            }
+        } catch (\Exception $e) {
+
+        }
+        return $entityList;
+    }
 }

app/common/dao/user/UserSignScoreDao.php

@@ -4,6 +4,8 @@ namespace app\common\dao\user;
 
 use app\common\dao\BaseDao;
 use app\common\model\user\UserSignScore;
+use app\entity\CommonEntity;
+use app\entity\data\user\UserSignScoreEntity;
 
 class UserSignScoreDao extends BaseDao
 {
@@ -11,4 +13,29 @@ class UserSignScoreDao extends BaseDao
     {
         return UserSignScore::class;
     }
+
+    /**
+     * @param array $idList
+     * @return CommonEntity[]
+     */
+    public function getStoreSignScoreEntityListByIdList(array $idList): array
+    {
+        $entityList = [];
+        try {
+            /** @var UserSignScore $model */
+            $model = $this->getModel();
+            $dataRes = $model::getDB()
+                ->whereIn('id', $idList)
+                ->select()
+                ->toArray();
+            if (!empty($dataRes)) {
+                $entityList = array_map(function ($data) {
+                    return UserSignScoreEntity::newInstance($data);
+                }, $dataRes);
+            }
+        } catch (\Exception $e) {
+
+        }
+        return $entityList;
+    }
 }

app/common/dao/user/UserSignVrDao.php

@@ -4,6 +4,8 @@ namespace app\common\dao\user;
 
 use app\common\dao\BaseDao;
 use app\common\model\user\UserSignVr;
+use app\entity\CommonEntity;
+use app\entity\data\user\UserSignVrEntity;
 
 class UserSignVrDao extends BaseDao
 {
@@ -11,4 +13,29 @@ class UserSignVrDao extends BaseDao
     {
         return UserSignVr::class;
     }
+
+    /**
+     * @param array $idList
+     * @return CommonEntity[]
+     */
+    public function getStoreSignVrEntityListByIdList(array $idList): array
+    {
+        $entityList = [];
+        try {
+            /** @var UserSignVr $model */
+            $model = $this->getModel();
+            $dataRes = $model::getDB()
+                ->whereIn('id', $idList)
+                ->select()
+                ->toArray();
+            if (!empty($dataRes)) {
+                $entityList = array_map(function ($data) {
+                    return UserSignVrEntity::newInstance($data);
+                }, $dataRes);
+            }
+        } catch (\Exception $e) {
+
+        }
+        return $entityList;
+    }
 }

app/common/enum/CommonEnum.php

@@ -36,6 +36,24 @@ class CommonEnum
         'XingfuXiaodian' => ['code' => 2001, 'name' => '幸福小店'],
     ];
 
+    // 佣金类型
+    const COMMISSION_TYPE = [
+        'AGENT_FEE' => ['code' => 1, 'name' => '代理费'],
+        'CONSUMPTION_COMMISSION' => ['code' => 2, 'name' => '消费佣金'],
+        'DIRECT_REFERRAL' => ['code' => 3, 'name' => '直推奖'],
+        'REGION_COMMISSION' => ['code' => 4, 'name' => '辖区佣金'],
+        'PENSION' => ['code' => 5, 'name' => '养老金'],
+        'AD_FEE' => ['code' => 6, 'name' => '广告费'],
+        'LOCKED_CUSTOMER' => ['code' => 7, 'name' => '锁客收益'],
+        'PLATFORM_REWARD' => ['code' => 8, 'name' => '平台奖励'],
+        'CHANNEL_DEALER' => ['code' => 9, 'name' => '渠道商'],
+        'SHOP_REWARD' => ['code' => 10, 'name' => '推广店铺收益'],
+        'PARTNER_DIVIDEND' => ['code' => 11, 'name' => '合伙人分红'],
+        'JOINT_CREATOR_DIVIDEND' => ['code' => 12, 'name' => '联创分红'],
+        'EQUITY_DIVIDEND' => ['code' => 13, 'name' => '股权分红'],
+        'SHARE_EARNINGS' => ['code' => 20, 'name' => '分享收益']
+    ];
+
     const USER_GROUP = [
         'RegularUser' => ['code' => 1, 'name' => '普通用户'],
         'Salesperson' => ['code' => 2, 'name' => '业务员'],

app/common/enum/user/UserBillEnum.php

@@ -20,22 +20,7 @@ class UserBillEnum extends CommonEnum
     ];
 
     // 佣金类型
-    const COMMISSION_TYPE = [
-        'AGENT_FEE' => ['code' => 1, 'name' => '代理费'],
-        'CONSUMPTION_COMMISSION' => ['code' => 2, 'name' => '消费佣金'],
-        'DIRECT_REFERRAL' => ['code' => 3, 'name' => '直推奖'],
-        'REGION_COMMISSION' => ['code' => 4, 'name' => '辖区佣金'],
-        'PENSION' => ['code' => 5, 'name' => '养老金'],
-        'AD_FEE' => ['code' => 6, 'name' => '广告费'],
-        'LOCKED_CUSTOMER' => ['code' => 7, 'name' => '锁客收益'],
-        'PLATFORM_REWARD' => ['code' => 8, 'name' => '平台奖励'],
-        'CHANNEL_DEALER' => ['code' => 9, 'name' => '渠道商'],
-        'SHOP_REWARD' => ['code' => 10, 'name' => '推广店铺收益'],
-        'PARTNER_DIVIDEND' => ['code' => 11, 'name' => '合伙人分红'],
-        'JOINT_CREATOR_DIVIDEND' => ['code' => 12, 'name' => '联创分红'],
-        'EQUITY_DIVIDEND' => ['code' => 13, 'name' => '股权分红'],
-        'SHARE_EARNINGS' => ['code' => 20, 'name' => '分享收益']
-    ];
+    const COMMISSION_TYPE = parent::COMMISSION_TYPE;
 
     // 账单来源
     const SOURCE = [

app/common/enum/user/UserSignFugouEnum.php

@@ -14,21 +14,7 @@ class UserSignFugouEnum extends CommonEnum
     ];
 
     // 1代理费 2 消费佣金 3直推奖 4辖区佣金 5养老金 6广告费 7锁客收益 8平台奖励 9渠道商 10推广店铺收益 11合伙人分红 12联创分红 13股权分红
-    const COMMISSION_TYPE = [
-        'AgentFee' => ['code' => 1, 'name' => '代理费'],
-        'ConsumeCommission' => ['code' => 2, 'name' => '消费佣金'],
-        'DirectPushReward' => ['code' => 3, 'name' => '直推奖'],
-        'AreaCommission' => ['code' => 4, 'name' => '辖区佣金'],
-        'Pension' => ['code' => 5, 'name' => '养老金'],
-        'AdFee' => ['code' => 6, 'name' => '广告费'],
-        'CustomerLockRevenue' => ['code' => 7, 'name' => '锁客收益'],
-        'PlatformReward' => ['code' => 8, 'name' => '平台奖励'],
-        'ChannelDistributor' => ['code' => 9, 'name' => '渠道商'],
-        'StorePromotionRevenue' => ['code' => 10, 'name' => '推广店铺收益'],
-        'PartnerDividend' => ['code' => 11, 'name' => '合伙人分红'],
-        'CoFounderDividend' => ['code' => 12, 'name' => '联创分红'],
-        'EquityDividend' => ['code' => 13, 'name' => '股权分红'],
-    ];
+    const COMMISSION_TYPE = parent::COMMISSION_TYPE;
 
     // 1赠送，2消耗
     const TYPE = [

app/common/enum/user/UserSignVrEnum.php

@@ -11,4 +11,6 @@ class UserSignVrEnum extends CommonEnum
         'Exchange' => ['code' => 1, 'name' => '兑换'],
         'Consume' => ['code' => 2, 'name' => '消耗'],
     ];
+
+    const ORDER_TYPE = parent::ORDER_TYPE;
 }

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

@@ -14,6 +14,7 @@ namespace app\common\repositories\store\order;
 use app\common\dao\store\order\StoreGroupOrderDao;
 use app\common\repositories\BaseRepository;
 use app\common\repositories\store\coupon\StoreCouponUserRepository;
+use app\entity\data\store\StoreGroupOrderEntity;
 use crmeb\jobs\CancelGroupOrderJob;
 use think\exception\ValidateException;
 use think\facade\Cache;
@@ -251,4 +252,28 @@ class StoreGroupOrderRepository extends BaseRepository
         return $order;
     }
 
+    /**
+     * @param int $orderId
+     * @return StoreGroupOrderEntity
+     */
+    public function getStoreGroupOrderEntityByGroupOrderId(int $orderId): StoreGroupOrderEntity
+    {
+        $entityList = $this->getStoreGroupOrderEntityListByGroupOrderIdList([$orderId]);
+        $entity = array_shift($entityList);
+        if ($entity instanceof StoreGroupOrderEntity) {
+            return $entity;
+        } else {
+            /** @var StoreGroupOrderEntity */
+            return StoreGroupOrderEntity::newInstance();
+        }
+    }
+
+    /**
+     * @param array $groupOrderIdList
+     * @return StoreGroupOrderEntity[]
+     */
+    public function getStoreGroupOrderEntityListByGroupOrderIdList(array $groupOrderIdList): array
+    {
+        return $this->dao->getStoreGroupOrderEntityListByGroupOrderIdList($groupOrderIdList);
+    }
 }

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

@@ -67,6 +67,7 @@ use app\common\repositories\user\UserSignGongxianRepository;
 use app\common\repositories\user\UserSignHongbaoRepository;
 use app\common\repositories\user\UserSignJingdouRepository;
 use app\common\repositories\user\UserSignScoreRepository;
+use app\common\repositories\user\UserSignVrRepository;
 use app\common\repositories\user\UserThirdRepository;
 use app\common\repositories\wechat\RoutineQrcodeRepository;
 use app\common\repositories\wechat\WechatUserRepository;
@@ -11065,9 +11066,6 @@ class StoreOrderRepository extends BaseRepository
             $storeOrderEntityList[$key] = $storeOrderEntity;
             $storeOrderIdList[] = $storeOrderEntity->getOrderId();
 
-            // 生成奖励数据
-            $this->createRewardMechanismByStoreOrderId($storeOrderEntity->getOrderId());
-
             // 将每件商品设计到的优惠券要取消掉
 
             // 准备订单的 状态数据
@@ -11104,189 +11102,229 @@ class StoreOrderRepository extends BaseRepository
 
         $storeOrderProductRepository->insertAll($storeOrderProductDataList);
 
-        $paySuccess = false;
-        // 验证支付方式
         /** @var FzonePayTypeEntity $fzonePayTypeEntity */
         $fzonePayTypeEntity = FzonePayTypeEntity::newInstance($storeOrderCreateRequestEntity->getFzonePayType());
+        $paySuccess = $this->abatement($userEntity->getUid(), $storeGroupOrderEntity->getGroupOrderId(), $fzonePayTypeEntity);
+
+        // 非涉及到现金 控件成功后 直接结算
+        if ($paySuccess) {
+            // 修改订单的 支付状态
+            $storeGroupOrderRepository->update($storeGroupOrderEntity->getGroupOrderId(), [
+                'paid' => StoreGroupOrderEnum::PAID['YES']['code'],
+                'pay_time' => date('Y-m-d H:i:s')
+            ]);
+
+            $storeOrderRepository->updates($storeOrderIdList, [
+                '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']
+            ]);
+            $settlementOrderIdList = [];
+            foreach ($storeOrderEntityList as $storeOrderEntity) {
+                // 生成奖励数据
+                $this->createRewardMechanismByStoreOrderId($storeOrderEntity->getOrderId());
+                if ($storeOrderEntity->getMerId() == CommonEnum::DESIGN_MERCHANT_ID['MemberZone']['code']) {
+                    // 会员专区的 订单立即结算
+                    $settlementOrderIdList[] = $storeOrderEntity->getOrderId();
+                }
+            }
+            if (!empty($settlementOrderIdList)) {
+                $this->settlementOrderByOrderIdList($settlementOrderIdList);
+            }
+        }
+
+        return [];
+    }
+
+    /**
+     * @param int $orderId
+     * @return StoreOrderEntity
+     */
+    public function getStoreOrderEntityByOrderId(int $orderId): StoreOrderEntity
+    {
+        $entityList = $this->getStoreOrderEntityListByOrderIdList([$orderId]);
+        $entity = array_shift($entityList);
+        if ($entity instanceof StoreOrderEntity) {
+            return $entity;
+        } else {
+            /** @var StoreOrderEntity */
+            return StoreOrderEntity::newInstance();
+        }
+    }
+
+    /**
+     * @param array $orderIdList
+     * @return StoreOrderEntity[]
+     */
+    public function getStoreOrderEntityListByOrderIdList(array $orderIdList): array
+    {
+        return $this->dao->getStoreOrderEntityListByOrderIdList($orderIdList);
+    }
+
+
+    /**
+     * 根据 用户信息 订单信息 支付信息 判断用户是否满足支付条件，并进行扣款
+     * @param int $uid
+     * @param int $groupOrderId
+     * @param FzonePayTypeEntity $fzonePayTypeEntity
+     * @return bool
+     */
+    public function abatement(int $uid, int $groupOrderId, FzonePayTypeEntity $fzonePayTypeEntity): bool
+    {
+        /** @var UserRepository $userRepository */
+        $userRepository = app()->make(UserRepository::class);
+        $userEntity = $userRepository->getUserEntityByUid($uid);
+        if (empty($userEntity->getUid())) {
+            throw new ValidateException('未查询到用户信息');
+        }
+
+        /** @var StoreGroupOrderRepository $storeGroupOrderRepository */
+        $storeGroupOrderRepository = app()->make(StoreGroupOrderRepository::class);
+        $storeGroupOrderEntity = $storeGroupOrderRepository->getStoreGroupOrderEntityByGroupOrderId($groupOrderId);
+        if (empty($storeGroupOrderEntity->getGroupOrderId())) {
+            throw new ValidateException('未查询到订单信息');
+        }
+
+        /** @var UserSignVrRepository $userSignVrRepository */
+        $userSignVrRepository = app()->make(UserSignVrRepository::class);
+        /** @var UserSignScoreRepository $userSignScoreRepository */
+        $userSignScoreRepository = app()->make(UserSignScoreRepository::class);
+        /** @var UserSignJingdouRepository $userSignJingdouRepository */
+        $userSignJingdouRepository = app()->make(UserSignJingdouRepository::class);
+        /** @var UserSignFugouRepository $userSignFugouRepository */
+        $userSignFugouRepository = app()->make(UserSignFugouRepository::class);
+
+        $paySuccess = false;
+        // 验证支付方式
         if ($fzonePayTypeEntity->getType() == StoreOrderEnum::FZONE_PAY_TYPE['B1-VR+Score']['code']) {
             if ($fzonePayTypeEntity->getPrice() > $userEntity->getVr() || $fzonePayTypeEntity->getOther() > $userEntity->getScore()) {
                 throw new ValidateException('支付失败，VR或积分不足！');
             }
-            // 修改用户的VR值 和 积分值
-            // 修改用户VR
-            $userRepository->updateUserVr(
+            // 创建Vr扣减记录 先有记录 再去执行
+            $userSignVrEntity = $userSignVrRepository->addUserSingVr(
                 $userEntity->getUid(),
                 UserSignVrEnum::TYPE['Consume']['code'],
                 $fzonePayTypeEntity->getPrice(),
-                '购买商品，订单编号：'.$storeGroupOrderEntity->getGroupOrderSn(),
+                '购买商品，订单编号：' . $storeGroupOrderEntity->getGroupOrderSn(),
                 CommonEnum::ORDER_TYPE['Platform-Group']['code'],
                 $storeGroupOrderEntity->getGroupOrderId()
             );
-            // 修改用户积分
-            $userRepository->updateUserScore(
+            // 执行 Vr 增减 操作
+            $userSignVrRepository->execute($userSignVrEntity->getId());
+
+            // 修改用户积分 先有记录 再去执行
+            $userSignScoreEntity = $userSignScoreRepository->addUserSingScore(
                 $userEntity->getUid(),
+                UserSignScoreEnum::SOURCE_TYPE['SelfOrder']['code'],
                 UserSignScoreEnum::PM['Expend']['code'],
                 $fzonePayTypeEntity->getOther(),
-                '购买商品，订单编号：'.$storeGroupOrderEntity->getGroupOrderSn(),
-                CommonEnum::ORDER_TYPE['Platform-Group']['code'],
+                '购买商品，订单编号：' . $storeGroupOrderEntity->getGroupOrderSn(),
+                UserSignHongbaoEnum::ORDER_TYPE['Platform']['code'],
                 $storeGroupOrderEntity->getGroupOrderId()
             );
+            $userSignScoreRepository->execute($userSignScoreEntity->getId());
+
             $paySuccess = true;
         } else if ($fzonePayTypeEntity->getType() == StoreOrderEnum::FZONE_PAY_TYPE['B2-Cash+Score']['code']) {
             if ($fzonePayTypeEntity->getOther() > $userEntity->getScore()) {
                 throw new ValidateException('支付失败，积分不足！');
             }
-            // 修改用户积分
-            $userRepository->updateUserScore(
-                $userEntity->getUid(),
-                UserSignScoreEnum::PM['Expend']['code'],
-                $fzonePayTypeEntity->getOther(),
-                '购买商品，订单编号：'.$storeGroupOrderEntity->getGroupOrderSn(),
-                CommonEnum::ORDER_TYPE['Platform-Group']['code'],
-                $storeGroupOrderEntity->getGroupOrderId()
-            );
+            // 用户下单时 不扣除积分，而是在支付环节 验证 并扣除
         } else if ($fzonePayTypeEntity->getType() == StoreOrderEnum::FZONE_PAY_TYPE['B3-VR+Jingdou']['code']) {
             if ($fzonePayTypeEntity->getPrice() > $userEntity->getVr() || $fzonePayTypeEntity->getOther() > $userEntity->getJingdou()) {
                 throw new ValidateException('支付失败，VR或京豆不足！');
             }
-            // 修改用户VR
-            $userRepository->updateUserVr(
+            // 创建Vr扣减记录 先有记录 再去执行
+            $userSignVrEntity = $userSignVrRepository->addUserSingVr(
                 $userEntity->getUid(),
                 UserSignVrEnum::TYPE['Consume']['code'],
                 $fzonePayTypeEntity->getPrice(),
-                '购买商品，订单编号：'.$storeGroupOrderEntity->getGroupOrderSn(),
+                '购买商品，订单编号：' . $storeGroupOrderEntity->getGroupOrderSn(),
                 CommonEnum::ORDER_TYPE['Platform-Group']['code'],
                 $storeGroupOrderEntity->getGroupOrderId()
             );
-            // 修改用户jingdou
-            $userRepository->updateUserJingdou(
+            // 执行 Vr 增减 操作
+            $userSignVrRepository->execute($userSignVrEntity->getId());
+
+            // 创建 京豆 扣减记录
+            $userSignJingdouEntity = $userSignJingdouRepository->addUserSingJingdou(
                 $userEntity->getUid(),
                 UserSignJingdouEnum::TYPE['Consume']['code'],
                 $fzonePayTypeEntity->getOther(),
-                '购买商品，订单编号：'.$storeGroupOrderEntity->getGroupOrderSn(),
+                0,
+                '购买商品，订单编号：' . $storeGroupOrderEntity->getGroupOrderSn(),
                 CommonEnum::ORDER_TYPE['Platform-Group']['code'],
                 $storeGroupOrderEntity->getGroupOrderId()
             );
+            // 执行 京豆 增减 操作
+            $userSignJingdouRepository->execute($userSignJingdouEntity->getId());
+
             $paySuccess = true;
         } else if ($fzonePayTypeEntity->getType() == StoreOrderEnum::FZONE_PAY_TYPE['B4-Cash+Jingdou']['code']) {
             if ($fzonePayTypeEntity->getPrice() > $userEntity->getVr() || $fzonePayTypeEntity->getOther() > $userEntity->getJingdou()) {
                 throw new ValidateException('支付失败，京豆不足！');
             }
-            // 修改用户jingdou
-            $userRepository->updateUserJingdou(
-                $userEntity->getUid(),
-                UserSignJingdouEnum::TYPE['Consume']['code'],
-                $fzonePayTypeEntity->getOther(),
-                '购买商品，订单编号：'.$storeGroupOrderEntity->getGroupOrderSn(),
-                CommonEnum::ORDER_TYPE['Platform-Group']['code'],
-                $storeGroupOrderEntity->getGroupOrderId()
-            );
         } else if ($fzonePayTypeEntity->getType() == StoreOrderEnum::FZONE_PAY_TYPE['B5-VR']['code']) {
             if ($fzonePayTypeEntity->getPrice() > $userEntity->getVr()) {
                 throw new ValidateException('支付失败，VR不足！');
             }
-            // 修改用户VR
-            $userRepository->updateUserVr(
+            // 创建Vr扣减记录 先有记录 再去执行
+            $userSignVrEntity = $userSignVrRepository->addUserSingVr(
                 $userEntity->getUid(),
                 UserSignVrEnum::TYPE['Consume']['code'],
                 $fzonePayTypeEntity->getPrice(),
-                '购买商品，订单编号：'.$storeGroupOrderEntity->getGroupOrderSn(),
+                '购买商品，订单编号：' . $storeGroupOrderEntity->getGroupOrderSn(),
                 CommonEnum::ORDER_TYPE['Platform-Group']['code'],
                 $storeGroupOrderEntity->getGroupOrderId()
             );
+            // 执行 Vr 增减 操作
+            $userSignVrRepository->execute($userSignVrEntity->getId());
             $paySuccess = true;
         } else if ($fzonePayTypeEntity->getType() == StoreOrderEnum::FZONE_PAY_TYPE['A1-VR']['code']) {
             if ($fzonePayTypeEntity->getPrice() > $userEntity->getVr()) {
                 throw new ValidateException('支付失败，VR不足！');
             }
-            // 修改用户VR
-            $userRepository->updateUserVr(
+            // 创建Vr扣减记录 先有记录 再去执行
+            $userSignVrEntity = $userSignVrRepository->addUserSingVr(
                 $userEntity->getUid(),
                 UserSignVrEnum::TYPE['Consume']['code'],
                 $fzonePayTypeEntity->getPrice(),
-                '购买商品，订单编号：'.$storeGroupOrderEntity->getGroupOrderSn(),
+                '购买商品，订单编号：' . $storeGroupOrderEntity->getGroupOrderSn(),
                 CommonEnum::ORDER_TYPE['Platform-Group']['code'],
                 $storeGroupOrderEntity->getGroupOrderId()
             );
+            // 执行 Vr 增减 操作
+            $userSignVrRepository->execute($userSignVrEntity->getId());
             $paySuccess = true;
         } else if ($fzonePayTypeEntity->getType() == StoreOrderEnum::FZONE_PAY_TYPE['A2-Cash']['code']) {
 
-        } else if ($fzonePayTypeEntity->getType() == StoreOrderEnum::FZONE_PAY_TYPE['A3-Cash+VR']['code']) {
+        }
+        else if ($fzonePayTypeEntity->getType() == StoreOrderEnum::FZONE_PAY_TYPE['A3-Cash+VR']['code']) {
             if ($fzonePayTypeEntity->getOther() > $userEntity->getVr()) {
                 throw new ValidateException('支付失败，VR不足！');
             }
-            // 修改用户VR
-            $userRepository->updateUserVr(
-                $userEntity->getUid(),
-                UserSignVrEnum::TYPE['Consume']['code'],
-                $fzonePayTypeEntity->getOther(),
-                '购买商品，订单编号：'.$storeGroupOrderEntity->getGroupOrderSn(),
-                CommonEnum::ORDER_TYPE['Platform-Group']['code'],
-                $storeGroupOrderEntity->getGroupOrderId()
-            );
         } else if ($fzonePayTypeEntity->getType() == StoreOrderEnum::FZONE_PAY_TYPE['C1-Fugou']['code']) {
             if ($fzonePayTypeEntity->getOther() > $userEntity->getFugou()) {
                 throw new ValidateException('支付失败，复购金不足！');
             }
-            // 修改用户复购金
-            $userRepository->updateUserFugou(
+            // 添加复购金 记录
+            $userSignFugouEntity = $userSignFugouRepository->addUserSingFugou(
                 $userEntity->getUid(),
-                UserSignVrEnum::TYPE['Consume']['code'],
+                UserSignFugouEnum::TYPE['Give']['code'],
                 $fzonePayTypeEntity->getPrice(),
-                '购买商品，订单编号：'.$storeGroupOrderEntity->getGroupOrderSn(),
+                UserSignFugouEnum::COMMISSION_TYPE['DIRECT_REFERRAL']['code'],
+                '购买商品，订单编号：' . $storeGroupOrderEntity->getGroupOrderSn(),
                 CommonEnum::ORDER_TYPE['Platform-Group']['code'],
                 $storeGroupOrderEntity->getGroupOrderId()
             );
+            // 执行
+            $userSignFugouRepository->execute($userSignFugouEntity->getId());
             $paySuccess = true;
         } else {
             throw new ValidateException('支付失败，支付方式错误！');
         }
-
-        // 非涉及到现金 控件成功后 直接结算
-        if ($paySuccess) {
-            // 修改订单的 支付状态
-            $storeGroupOrderRepository->update($storeGroupOrderEntity->getGroupOrderId(), [
-                'paid' => StoreGroupOrderEnum::PAID['YES']['code'],
-                'pay_time' => date('Y-m-d H:i:s')
-            ]);
-
-            $storeOrderRepository->updates($storeOrderIdList, [
-                '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']
-            ]);
-            foreach ($storeOrderEntityList as $storeOrderEntity) {
-
-            }
-        }
-
-        return [];
-    }
-
-    /**
-     * @param int $orderId
-     * @return StoreOrderEntity
-     */
-    public function getStoreOrderEntityByOrderId(int $orderId): StoreOrderEntity
-    {
-        $entityList = $this->getStoreOrderEntityListByOrderIdList([$orderId]);
-        $entity = array_shift($entityList);
-        if ($entity instanceof StoreOrderEntity) {
-            return $entity;
-        } else {
-            /** @var StoreOrderEntity */
-            return StoreOrderEntity::newInstance();
-        }
-    }
-
-    /**
-     * @param array $orderIdList
-     * @return StoreOrderEntity[]
-     */
-    public function getStoreOrderEntityListByOrderIdList(array $orderIdList): array
-    {
-        return $this->dao->getStoreOrderEntityListByOrderIdList($orderIdList);
+        return $paySuccess;
     }
 
     /**
@@ -11394,6 +11432,7 @@ class StoreOrderRepository extends BaseRepository
                         $userEntityBySpreadUid->getUid(),
                         UserSignFugouEnum::TYPE['Give']['code'],
                         $fugouBySpreadUid,
+                        UserSignFugouEnum::COMMISSION_TYPE['DIRECT_REFERRAL']['code'],
                         '推广精彩生活区商品赠送复购金',
                         UserSignFugouEnum::ORDER_TYPE['Platform']['code'],
                         $storeOrderEntity->getOrderId()
@@ -11485,6 +11524,7 @@ class StoreOrderRepository extends BaseRepository
                         $userEntityByShareUid->getUid(),
                         UserSignFugouEnum::TYPE['Give']['code'],
                         $fugouByShareUid,
+                        UserSignFugouEnum::COMMISSION_TYPE['SHARE_EARNINGS']['code'],
                         '分享精彩生活区商品赠送复购金',
                         UserSignFugouEnum::ORDER_TYPE['Platform']['code'],
                         $storeOrderEntity->getOrderId()
@@ -11521,6 +11561,7 @@ class StoreOrderRepository extends BaseRepository
                         $merchantEntity->getUid(),
                         UserSignFugouEnum::TYPE['Give']['code'],
                         $fugouByMerId,
+                        UserSignFugouEnum::COMMISSION_TYPE['LOCKED_CUSTOMER']['code'],
                         '锁客复购金（精彩生活区商品赠送）',
                         UserSignFugouEnum::ORDER_TYPE['Platform']['code'],
                         $storeOrderEntity->getOrderId()
@@ -11602,6 +11643,7 @@ class StoreOrderRepository extends BaseRepository
                                 $userEntityBySpreadUid->getUid(),
                                 UserSignFugouEnum::TYPE['Give']['code'],
                                 $fugouBySpreadUid,
+                                UserSignFugouEnum::COMMISSION_TYPE['DIRECT_REFERRAL']['code'],
                                 '推广会员专区商品赠送复购金',
                                 UserSignFugouEnum::ORDER_TYPE['Platform']['code'],
                                 $storeOrderEntity->getOrderId()
@@ -11828,6 +11870,7 @@ class StoreOrderRepository extends BaseRepository
                         $userEntityBySpreadUid->getUid(),
                         UserSignFugouEnum::TYPE['Give']['code'],
                         $fugouBySpreadUid,
+                        UserSignFugouEnum::COMMISSION_TYPE['DIRECT_REFERRAL']['code'],
                         '推广商贸区商品赠送复购金',
                         UserSignFugouEnum::ORDER_TYPE['Platform']['code'],
                         $storeOrderEntity->getOrderId()
@@ -11922,6 +11965,7 @@ class StoreOrderRepository extends BaseRepository
                         $merchantEntityByLock->getUid(),
                         UserSignFugouEnum::TYPE['Give']['code'],
                         $fugouByMerId,
+                        UserSignFugouEnum::COMMISSION_TYPE['LOCKED_CUSTOMER']['code'],
                         '锁客复购金（精彩生活区商品赠送）',
                         UserSignFugouEnum::ORDER_TYPE['Platform']['code'],
                         $storeOrderEntity->getOrderId()
@@ -11949,25 +11993,43 @@ class StoreOrderRepository extends BaseRepository
         }
     }
 
+    /**
+     * 结算订单 将 奖励设置为 生效
+     * @param array $orderIdList
+     * @return void
+     */
     public function settlementOrderByOrderIdList(array $orderIdList)
     {
         /** @var StoreOrderRepository $storeOrderRepository */
         $storeOrderRepository = app()->make(StoreOrderRepository::class);
         $storeOrderEntityList = $storeOrderRepository->getStoreOrderEntityListByOrderIdList($orderIdList);
         if (!empty($storeOrderEntityList)) {
-            $existOrderIdList = array_map(function ($storeOrderEntity) {
+            /** @var UserRepository $userRepository */
+            $userRepository = app()->make(UserRepository::class);
+
+            // 筛选
+            $existOrderIdList = [];
+            foreach ($storeOrderEntityList as $storeOrderEntity) {
                 if ($storeOrderEntity->getIsSettlement() == StoreOrderEnum::IS_SETTLEMENT['NO']['code']) {
-                    return $storeOrderEntity->getOrderId();
+                    $existOrderIdList[] = $storeOrderEntity->getOrderId();
                 }
-            }, $storeOrderEntityList);
+            }
+            if (empty($existOrderIdList)) {
+                return;
+            }
 
+            /** 养老金 佣金 */
             /** @var UserBillRepository $userBillRepository */
             $userBillRepository = app()->make(UserBillRepository::class);
             $userBillEntityList = $userBillRepository->getUserBillEntityListByOrderIdListAndPending(UserBillEnum::TYPE_SHOP['Platform']['code'], $existOrderIdList);
             if (!empty($userBillEntityList)) {
                 foreach ($userBillEntityList as $userBillEntity) {
                     if ($userBillEntity->getCommissionType() == UserBillEnum::COMMISSION_TYPE['PENSION']['code']) {
-                        // 养老金 todo
+                        // 养老金
+                        $userEntity = $userRepository->getUserEntityByUid($userBillEntity->getUid());
+
+                    } else if ($userBillEntity->getCommissionType() == UserBillEnum::COMMISSION_TYPE['DIRECT_REFERRAL']['code']) {
+                        // 直推奖 佣金
                     }
                 }
             }

app/common/repositories/user/UserRepository.php

@@ -4451,6 +4451,8 @@ class UserRepository extends BaseRepository
         return (float)$surplus;
     }
 
+
+
     /**
      * 更新用户Vr 并 写入Vr变动记录
      * @param int $uid

app/common/repositories/user/UserSignFugouRepository.php

@@ -7,6 +7,7 @@ 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\db\exception\DbException;
 use think\exception\ValidateException;
 
 class UserSignFugouRepository extends BaseRepository
@@ -16,6 +17,31 @@ class UserSignFugouRepository extends BaseRepository
         $this->dao = $dao;
     }
 
+    /**
+     * @param int $id
+     * @return UserSignFugouEntity
+     */
+    public function getStoreSignFugouEntityById(int $id): UserSignFugouEntity
+    {
+        $entityList = $this->getStoreSignFugouEntityListByIdList([$id]);
+        $entity = array_shift($entityList);
+        if ($entity instanceof UserSignFugouEntity) {
+            return $entity;
+        } else {
+            /** @var UserSignFugouEntity */
+            return UserSignFugouEntity::newInstance();
+        }
+    }
+
+    /**
+     * @param array $idList
+     * @return UserSignFugouEntity[]
+     */
+    public function getStoreSignFugouEntityListByIdList(array $idList): array
+    {
+        return $this->dao->getStoreSignFugouEntityListByIdList($idList);
+    }
+
     public function create($data)
     {
         return $this->dao->create($data);
@@ -39,12 +65,13 @@ class UserSignFugouRepository extends BaseRepository
      * @param int $uid
      * @param int $type
      * @param float $number
+     * @param int $commissionType
      * @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
+    public function addUserSingFugou(int $uid, int $type, float $number, int $commissionType, string $mark = '', string $orderType = '', string $orderId = ''): UserSignFugouEntity
     {
         if (!empty($orderType)) {
             if (!empty($orderId)) {
@@ -64,6 +91,7 @@ class UserSignFugouRepository extends BaseRepository
         $userSignFugouEntity->setUid($uid)
             ->setType($type)
             ->setNumber($number)
+            ->setCommissionType($commissionType)
             ->setMark($mark)
             ->setOrderType($orderType)
             ->setOrderId($orderId)
@@ -72,4 +100,53 @@ class UserSignFugouRepository extends BaseRepository
 
         return $this->createByEntity($userSignFugouEntity);
     }
+
+    /**
+     * 将 复购 记录设置为生效状态 并对用户的 复购 字段进行增减
+     * @param int $id
+     * @return UserSignFugouEntity
+     */
+    public function execute(int $id): UserSignFugouEntity
+    {
+        $UserSignFugouEntity = $this->getStoreSignFugouEntityById($id);
+        if (empty($UserSignFugouEntity->getId()) || empty($UserSignFugouEntity->getUid())) {
+            throw new ValidateException('无效的复购记录');
+        }
+        if ($UserSignFugouEntity->getStatus() == UserSignFugouEnum::STATUS['Invalid']['code']) {
+            throw new ValidateException('该复购记录已失效');
+        }
+        if (!empty($UserSignFugouEntity->getSettlementTime()) || $UserSignFugouEntity->getStatus() == UserSignFugouEnum::STATUS['Valid']['code']) {
+            throw new ValidateException('该复购记录已更新，请勿重复操作');
+        }
+
+        /** @var UserRepository $userRepository */
+        $userRepository = app()->make(UserRepository::class);
+        $userEntity = $userRepository->getUserEntityByUid($UserSignFugouEntity->getUid());
+        if (empty($userEntity->getUid())) {
+            throw new ValidateException('未查询到用户信息');
+        }
+        if ($UserSignFugouEntity->getType() == UserSignFugouEnum::TYPE['Consume']['code']) {
+            $surplus = bcsub($userEntity->getFugou(), $UserSignFugouEntity->getNumber(), 2);
+            if ($surplus < 0.00) {
+                throw new ValidateException('用户复购不足');
+            }
+        } else {
+            $surplus = bcadd($userEntity->getFugou(), $UserSignFugouEntity->getNumber(), 2);
+        }
+        try {
+            $UserSignFugouEntity
+                ->setSurplus($surplus)
+                ->setSettlementTime(date('Y-m-d H:i:s'))
+                ->setStatus(UserSignFugouEnum::STATUS['Valid']['code']);
+            $userRepository->update($userEntity->getUid(), ['Fugou' => $surplus]);
+            $this->dao->update($UserSignFugouEntity->getId(), [
+                'surplus' => $UserSignFugouEntity->getSurplus(),
+                'settlement_time' => $UserSignFugouEntity->getSettlementTime(),
+                'status' => $UserSignFugouEntity->getStatus()
+            ]);
+        } catch (DbException $e) {
+
+        }
+        return $UserSignFugouEntity;
+    }
 }

app/common/repositories/user/UserSignJingdouRepository.php

@@ -7,6 +7,7 @@ use app\common\enum\user\UserSignJingdouEnum;
 use app\common\repositories\BaseRepository;
 use app\common\repositories\store\order\StoreOrderRepository;
 use app\entity\data\user\UserSignJingdouEntity;
+use think\db\exception\DbException;
 use think\exception\ValidateException;
 
 class UserSignJingdouRepository extends BaseRepository
@@ -16,6 +17,31 @@ class UserSignJingdouRepository extends BaseRepository
         $this->dao = $dao;
     }
 
+    /**
+     * @param int $id
+     * @return UserSignJingdouEntity
+     */
+    public function getStoreSignJingdouEntityById(int $id): UserSignJingdouEntity
+    {
+        $entityList = $this->getStoreSignJingdouEntityListByIdList([$id]);
+        $entity = array_shift($entityList);
+        if ($entity instanceof UserSignJingdouEntity) {
+            return $entity;
+        } else {
+            /** @var UserSignJingdouEntity */
+            return UserSignJingdouEntity::newInstance();
+        }
+    }
+
+    /**
+     * @param array $idList
+     * @return UserSignJingdouEntity[]
+     */
+    public function getStoreSignJingdouEntityListByIdList(array $idList): array
+    {
+        return $this->dao->getStoreSignJingdouEntityListByIdList($idList);
+    }
+
     public function create($data)
     {
         return $this->dao->create($data);
@@ -39,6 +65,7 @@ class UserSignJingdouRepository extends BaseRepository
      * @param int $uid
      * @param int $type
      * @param float $number
+     * @param int $merId
      * @param string $mark
      * @param string $orderType
      * @param string $orderId
@@ -73,4 +100,51 @@ class UserSignJingdouRepository extends BaseRepository
 
         return $this->createByEntity($userSignJingdouEntity);
     }
+
+    /**
+     * 将 京豆 记录设置为生效状态 并对用户的 京豆 字段进行增减
+     * @param int $id
+     * @return UserSignJingdouEntity
+     */
+    public function execute(int $id): UserSignJingdouEntity
+    {
+        $UserSignJingdouEntity = $this->getStoreSignJingdouEntityById($id);
+        if (empty($UserSignJingdouEntity->getId()) || empty($UserSignJingdouEntity->getUid())) {
+            throw new ValidateException('无效的积分记录');
+        }
+        if ($UserSignJingdouEntity->getStatus() == UserSignJingdouEnum::STATUS['Invalid']['code']) {
+            throw new ValidateException('该积分记录已失效');
+        }
+        if (!empty($UserSignJingdouEntity->getSettlementTime()) || $UserSignJingdouEntity->getStatus() == UserSignJingdouEnum::STATUS['Valid']['code']) {
+            throw new ValidateException('该积分记录已更新，请勿重复操作');
+        }
+
+        /** @var UserRepository $userRepository */
+        $userRepository = app()->make(UserRepository::class);
+        $userEntity = $userRepository->getUserEntityByUid($UserSignJingdouEntity->getUid());
+        if (empty($userEntity->getUid())) {
+            throw new ValidateException('未查询到用户信息');
+        }
+        if ($UserSignJingdouEntity->getType() == UserSignJingdouEnum::TYPE['Consume']['code']) {
+            $surplus = bcsub($userEntity->getJingdou(), $UserSignJingdouEntity->getNumber(), 2);
+            if ($surplus < 0.00) {
+                throw new ValidateException('用户京豆不足');
+            }
+        } else {
+            $surplus = bcadd($userEntity->getJingdou(), $UserSignJingdouEntity->getNumber(), 2);
+        }
+        try {
+            $UserSignJingdouEntity
+                ->setSurplus($surplus)
+                ->setSettlementTime(date('Y-m-d H:i:s'));
+            $userRepository->update($userEntity->getUid(), ['jingdou' => $surplus]);
+            $this->dao->update($UserSignJingdouEntity->getId(), [
+                'surplus' => $UserSignJingdouEntity->getSurplus(),
+                'settlement_time' => $UserSignJingdouEntity->getSettlementTime()
+            ]);
+        } catch (DbException $e) {
+
+        }
+        return $UserSignJingdouEntity;
+    }
 }

app/common/repositories/user/UserSignScoreRepository.php

@@ -7,6 +7,7 @@ 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\db\exception\DbException;
 use think\exception\ValidateException;
 
 class UserSignScoreRepository extends BaseRepository
@@ -22,7 +23,32 @@ class UserSignScoreRepository extends BaseRepository
     }
 
     /**
-     * 写入贡献值记录
+     * @param int $id
+     * @return UserSignScoreEntity
+     */
+    public function getStoreSignScoreEntityById(int $id): UserSignScoreEntity
+    {
+        $entityList = $this->getStoreSignScoreEntityListByIdList([$id]);
+        $entity = array_shift($entityList);
+        if ($entity instanceof UserSignScoreEntity) {
+            return $entity;
+        } else {
+            /** @var UserSignScoreEntity */
+            return UserSignScoreEntity::newInstance();
+        }
+    }
+
+    /**
+     * @param array $idList
+     * @return UserSignScoreEntity[]
+     */
+    public function getStoreSignScoreEntityListByIdList(array $idList): array
+    {
+        return $this->dao->getStoreSignScoreEntityListByIdList($idList);
+    }
+
+    /**
+     * 写入积分记录
      * @param UserSignScoreEntity $userSignScoreEntity
      * @return UserSignScoreEntity
      */
@@ -75,4 +101,53 @@ class UserSignScoreRepository extends BaseRepository
 
         return $this->createByEntity($userSignScoreEntity);
     }
+
+    /**
+     * 将 积分 记录设置为生效状态 并对用户的 积分 字段进行增减
+     * @param int $id
+     * @return UserSignScoreEntity
+     */
+    public function execute(int $id): UserSignScoreEntity
+    {
+        $userSignScoreEntity = $this->getStoreSignScoreEntityById($id);
+        if (empty($userSignScoreEntity->getId()) || empty($userSignScoreEntity->getUid())) {
+            throw new ValidateException('无效的积分记录');
+        }
+        if ($userSignScoreEntity->getStatus() == UserSignScoreEnum::STATUS['Invalid']['code']) {
+            throw new ValidateException('该积分记录已失效');
+        }
+        if (!empty($userSignScoreEntity->getSettlementTime()) || $userSignScoreEntity->getStatus() == UserSignScoreEnum::STATUS['Valid']['code']) {
+            throw new ValidateException('该积分记录已更新，请勿重复操作');
+        }
+
+        /** @var UserRepository $userRepository */
+        $userRepository = app()->make(UserRepository::class);
+        $userEntity = $userRepository->getUserEntityByUid($userSignScoreEntity->getUid());
+        if (empty($userEntity->getUid())) {
+            throw new ValidateException('未查询到用户信息');
+        }
+        if ($userSignScoreEntity->getPm() == UserSignScoreEnum::PM['Expend']['code']) {
+            $surplus = bcsub($userEntity->getScore(), $userSignScoreEntity->getRewardScore(), 2);
+            if ($surplus < 0.00) {
+                throw new ValidateException('用户积分不足');
+            }
+        } else {
+            $surplus = bcadd($userEntity->getScore(), $userSignScoreEntity->getRewardScore(), 2);
+        }
+        try {
+            $userSignScoreEntity
+                ->setSurplus($surplus)
+                ->setSettlementTime(date('Y-m-d H:i:s'))
+                ->setStatus(UserSignScoreEnum::STATUS['Valid']['code']);
+            $userRepository->update($userEntity->getUid(), ['score' => $surplus]);
+            $this->dao->update($userSignScoreEntity->getId(), [
+                'surplus' => $userSignScoreEntity->getSurplus(),
+                'settlement_time' => $userSignScoreEntity->getSettlementTime(),
+                'status' => $userSignScoreEntity->getStatus()
+            ]);
+        } catch (DbException $e) {
+
+        }
+        return $userSignScoreEntity;
+    }
 }

app/common/repositories/user/UserSignVrRepository.php

@@ -3,7 +3,12 @@
 namespace app\common\repositories\user;
 
 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\UserSignVrEntity;
+use think\db\exception\DbException;
+use think\exception\ValidateException;
 
 class UserSignVrRepository extends BaseRepository
 {
@@ -16,4 +21,125 @@ class UserSignVrRepository extends BaseRepository
     {
         return $this->dao->create($data);
     }
+
+    /**
+     * @param int $id
+     * @return UserSignVrEntity
+     */
+    public function getStoreSignVrEntityById(int $id): UserSignVrEntity
+    {
+        $entityList = $this->getStoreSignVrEntityListByIdList([$id]);
+        $entity = array_shift($entityList);
+        if ($entity instanceof UserSignVrEntity) {
+            return $entity;
+        } else {
+            /** @var UserSignVrEntity */
+            return UserSignVrEntity::newInstance();
+        }
+    }
+
+    /**
+     * @param array $idList
+     * @return UserSignVrEntity[]
+     */
+    public function getStoreSignVrEntityListByIdList(array $idList): array
+    {
+        return $this->dao->getStoreSignVrEntityListByIdList($idList);
+    }
+
+    /**
+     * 写入Vr记录
+     * @param UserSignVrEntity $userSignVrEntity
+     * @return UserSignVrEntity
+     */
+    public function createByEntity(UserSignVrEntity $userSignVrEntity): UserSignVrEntity
+    {
+        $result = $this->dao->create($userSignVrEntity->toUnderlineArray())->toArray();
+        /** @var UserSignVrEntity $entity */
+        $entity = UserSignVrEntity::newInstance($result);
+        return $entity;
+    }
+
+    /**
+     * 添加Vr记录
+     * @param int $uid
+     * @param int $type
+     * @param float $number
+     * @param string $mark
+     * @param string $orderType
+     * @param string $orderId
+     * @return UserSignVrEntity
+     */
+    public function addUserSingVr(int $uid, int $type, float $number, string $mark = '', string $orderType = '', string $orderId = ''): UserSignVrEntity
+    {
+        if (!empty($orderType)) {
+            if (!empty($orderId)) {
+                if ($orderType == UserSignVrEnum::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 UserSignVrEntity $userSignVrEntity */
+        $userSignVrEntity = UserSignVrEntity::newInstance();
+        $userSignVrEntity->setUid($uid)
+            ->setType($type)
+            ->setNumber($number)
+            ->setMark($mark)
+            ->setOrderType($orderType)
+            ->setOrderId($orderId)
+            ->setSurplus(0.00)
+            ->setAddtime(time());
+
+        return $this->createByEntity($userSignVrEntity);
+    }
+
+    /**
+     * 将 Vr 记录设置为生效状态 并对用户的 Vr 字段进行增减
+     * @param int $id
+     * @return UserSignVrEntity
+     */
+    public function execute(int $id): UserSignVrEntity
+    {
+        $userSignVrEntity = $this->getStoreSignVrEntityById($id);
+        if (empty($userSignVrEntity->getId()) || empty($userSignVrEntity->getUid())) {
+            throw new ValidateException('无效的Vr记录');
+        }
+        if (!empty($userSignVrEntity->getSettlementTime())) {
+            throw new ValidateException('该Vr记录已更新，请勿重复操作');
+        }
+
+        /** @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不足');
+            }
+        } 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 $userSignVrEntity;
+    }
 }