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

app/common/repositories/user/UserBillRepository.php

@@ -389,7 +389,7 @@ class UserBillRepository extends BaseRepository
      * @param string $mark
      * @return UserBillEntity
      */
-    public function addUserBill(int $uid, int $typeShop, int $orderId, int $commissionType, float $number, string $mark): UserBillEntity
+    public function addUserBill(int $uid, int $commissionType, int $pm, float $number, string $category, string $type, string $source, int $orderType, int $typeShop = 0, int $orderId = 0, string $mark = '', string $title = ''): UserBillEntity
     {
 
         $orderSn = '';
@@ -410,10 +410,11 @@ class UserBillRepository extends BaseRepository
         $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')
+            //UserBillEnum::PM['INCOME']['code']
+            ->setPm($pm)
+            ->setTitle($title ?: ArrayUtil::getEnumNameByCode($commissionType, UserBillEnum::COMMISSION_TYPE))
+            ->setCategory($category)
+            ->setType($type)
             ->setNumber($number)
             ->setMark($mark)
             ->setStatus(UserBillEnum::STATUS['PENDING']['code'])
@@ -421,8 +422,9 @@ class UserBillRepository extends BaseRepository
             ->setOrderSn($orderSn)
             ->setTypeShop($typeShop)
             ->setMerId($merId)
-            ->setSource(UserBillEnum::SOURCE['ONLINE']['code'])
-            ->setOrderType(UserBillEnum::ORDER_TYPE['SELF_OPERATED']['code'])
+            // UserBillEnum::SOURCE['ONLINE']['code']
+            ->setSource($source)
+            ->setOrderType($orderType)
             ->setIsRedBrokerage(UserBillEnum::IS_RED_BROKERAGE['NORMAL']['code'])
             ->setGzc(UserBillEnum::GZC_STATUS['NOT_ENTERED']['code'])
             ->setIsGzc(UserBillEnum::IS_GZC['NOT_STARTED']['code']);
@@ -479,4 +481,48 @@ class UserBillRepository extends BaseRepository
     {
         return $this->dao->getUserBillEntityListByOrderIdListAndPending($typeShop, $orderIdList);
     }
+
+    /**
+     * 将 Vr 记录设置为生效状态 并对用户的 Vr 字段进行增减
+     * @param int $id
+     * @return UserBillEntity
+     */
+    public function execute(int $id): UserBillEntity
+    {
+        $UserBillEntity = $this->getUserBillEntityByBillId($id);
+        if (empty($UserBillEntity->getBillId()) || empty($UserBillEntity->getUid())) {
+            throw new ValidateException('无效的账单记录');
+        }
+        if (!empty($UserBillEntity->getTakeTime())) {
+            throw new ValidateException('该账单记录已更新，请勿重复操作');
+        }
+
+        /** @var UserRepository $userRepository */
+        $userRepository = app()->make(UserRepository::class);
+        $userEntity = $userRepository->getUserEntityByUid($UserBillEntity->getUid());
+        if (empty($userEntity->getUid())) {
+            throw new ValidateException('未查询到用户信息');
+        }
+        if ($UserBillEntity->getType() == UserBill::TYPE['Consume']['code']) {
+            $surplus = bcsub($userEntity->getVr(), $UserBillEntity->getNumber(), 2);
+            if ($surplus < 0.00) {
+                throw new ValidateException('用户VR不足');
+            }
+        } else {
+            $surplus = bcadd($userEntity->getVr(), $UserBillEntity->getNumber(), 2);
+        }
+        try {
+            $UserBillEntity
+                ->setSurplus($surplus)
+                ->setSettlementTime(date('Y-m-d H:i:s'));
+            $userRepository->update($userEntity->getUid(), ['vr' => $surplus]);
+            $this->dao->update($UserBillEntity->getId(), [
+                'surplus' => $UserBillEntity->getSurplus(),
+                'settlement_time' => $UserBillEntity->getSettlementTime()
+            ]);
+        } catch (DbException $e) {
+
+        }
+        return $UserBillEntity;
+    }
 }