Merge branch 'dev-xpy' into dev

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

@@ -152,31 +152,6 @@ class StoreOrderRepository extends BaseRepository
     const PAY_TYPE = ['balance', 'weixin', 'routine', 'h5', "alpay"];
     private $source;
     private $merId;
-    /** @var UserDao */
-    private $userDao;
-    /** @var UserPvLogDao */
-    private $userPvLogDao;
-    /** @var UserSignVrDao */
-    private $userSignVrDao;
-    /** @var UserSignScoreDao */
-    private $userSignScoreDao;
-    /** @var UserSignGongxianDao */
-    private $userSignGongxianDao;
-    /** @var UserBillDao */
-    private $userBillDao;
-    /**@var GzcLogDao */
-    private $gzcLogDao;
-    /** @var backupUserDao */
-    private $backupUserDao;
-    /** @var BackupUserChangeDao */
-    private $backupUserChangeDao;
-    /** @var TableOpsDao */
-    private $tableOpsDao;
-    /** @var UserOrderKillOrRecoverRecordsDao */
-    private $userOrderKillOrRecoverRecordsDao;
-    /** @var BackupStoreOrderDao */
-    private $backupStoreOrderDao;
-
 
     const commercetrade_cash_integral = 'commercetrade_cash_integral'; // 商贸区：现金+积分
     const commercetrade_cash_peking_bean = 'commercetrade_cash_peking_bean'; // 商贸区：现金+京豆
@@ -191,18 +166,6 @@ class StoreOrderRepository extends BaseRepository
         $this->dao = $dao;
         $this->source = request()->header('source');
         $this->merId = request()->header('merId');
-        $this->userDao = app()->make(UserDao::class);
-        $this->userPvLogDao = app()->make(UserPvLogDao::class);
-        $this->userSignVrDao = app()->make(UserSignVrDao::class);
-        $this->userSignScoreDao = app()->make(UserSignScoreDao::class);
-        $this->userSignGongxianDao = app()->make(UserSignGongxianDao::class);
-        $this->userBillDao = app()->make(UserBillDao::class);
-        $this->gzcLogDao = app()->make(GzcLogDao::class);
-        $this->backupUserDao = app()->make(BackupUserDao::class);
-        $this->backupUserChangeDao = app()->make(BackupUserChangeDao::class);
-        $this->tableOpsDao = app()->make(TableOpsDao::class);
-        $this->userOrderKillOrRecoverRecordsDao = app()->make(UserOrderKillOrRecoverRecordsDao::class);
-        $this->backupUserChangeDao = app()->make(BackupUserChangeDao::class);
     }
 
     /**
@@ -12476,28 +12439,51 @@ class StoreOrderRepository extends BaseRepository
         if (empty($orderId) || empty($groupOrderId) || empty($uid)) {
             return false;
         }
+        /** @var UserDao $userDao */
+        $userDao = app()->make(UserDao::class);
+        /** @var UserPvLogDao $userPvLogDao */
+        $userPvLogDao = app()->make(UserPvLogDao::class);
+        /** @var UserSignVrDao $userSignVrDao */
+        $userSignVrDao = app()->make(UserSignVrDao::class);
+        /** @var UserSignScoreDao $userSignScoreDao */
+        $userSignScoreDao = app()->make(UserSignScoreDao::class);
+        /** @var UserSignGongxianDao $userSignGongxianDao */
+        $userSignGongxianDao = app()->make(UserSignGongxianDao::class);
+        /** @var UserBillDao $userBillDao */
+        $userBillDao = app()->make(UserBillDao::class);
+        /** @var GzcLogDao $gzcLogDao */
+        $gzcLogDao = app()->make(GzcLogDao::class);
+        /** @var BackupUserDao $backupUserDao */
+        $backupUserDao = app()->make(BackupUserDao::class);
+        /** @var BackupUserChangeDao $backupUserChangeDao */
+        $backupUserChangeDao = app()->make(BackupUserChangeDao::class);
+        /** @var TableOpsDao $tableOpsDao */
+        $tableOpsDao = app()->make(TableOpsDao::class);
+        /** @var UserOrderKillOrRecoverRecordsDao $userOrderKillOrRecoverRecordsDao */
+        $userOrderKillOrRecoverRecordsDao = app()->make(UserOrderKillOrRecoverRecordsDao::class);
+
         try {
             Db::startTrans();
             //查找是否有推荐人
-            $spreadUid = $this->userDao->getSpreadUidFromUid($uid);
+            $spreadUid = $userDao->getSpreadUidFromUid($uid);
             //取出pv
-            $pv = $this->userPvLogDao->getPVFromStatusOrderId($orderId);
+            $pv = $userPvLogDao->getPVFromStatusOrderId($orderId);
             //取出 vr
-            $payVr = $this->userSignVrDao->getVrFromTypeOrderId($orderId);
+            $payVr = $userSignVrDao->getVrFromTypeOrderId($orderId);
             //取出购买赠送积分 / 支出积分
-            $score = $this->userSignScoreDao->getRewardScoreFromUidOrderId($orderId, $uid);
-            $payScore = $this->userSignScoreDao->getPayScoreFromUidOrderId($orderId, $uid);
+            $score = $userSignScoreDao->getRewardScoreFromUidOrderId($orderId, $uid);
+            $payScore = $userSignScoreDao->getPayScoreFromUidOrderId($orderId, $uid);
             // 贡献值
-            $gongXian = $this->userSignGongxianDao->getGongxianFromUidOrderId($orderId, $uid);
+            $gongXian = $userSignGongxianDao->getGongxianFromUidOrderId($orderId, $uid);
             // 养老金
-            $yangLaoJin = $this->userBillDao->getYanglaoFromUidOrderId($orderId, $uid);
+            $yangLaoJin = $userBillDao->getYanglaoFromUidOrderId($orderId, $uid);
             if ($spreadUid) {
-                $spreadScore = $this->userSignScoreDao->getRewardScoreFromStatusUidOrderId($orderId, $spreadUid);//积分
-                $spreadGongXian = $this->userSignGongxianDao->getGongxianFromUidOrderId($orderId, $spreadUid);//贡献
-                $spreadYlj = $this->userBillDao->getYljFromCommissionTypeUidOrderId($orderId, $spreadUid);//养老金
-                $spreadYongJin = $this->userBillDao->getYongjinFromCommissionTypeUidOrderId($orderId, $spreadUid);//佣金
-//                $spreadUser = $this->userDao->getSpreadUserFromUid($spreadUid);//找到推荐人的user表数据
-//                $this->backupUserDao->saveDelData($spreadUser);//备份原始的user大概是没必要的，user更新数据都靠具体数目加减操作
+                $spreadScore = $userSignScoreDao->getRewardScoreFromStatusUidOrderId($orderId, $spreadUid);//积分
+                $spreadGongXian = $userSignGongxianDao->getGongxianFromUidOrderId($orderId, $spreadUid);//贡献
+                $spreadYlj = $userBillDao->getYljFromCommissionTypeUidOrderId($orderId, $spreadUid);//养老金
+                $spreadYongJin = $userBillDao->getYongjinFromCommissionTypeUidOrderId($orderId, $spreadUid);//佣金
+//                $spreadUser = $userDao->getSpreadUserFromUid($spreadUid);//找到推荐人的user表数据
+//                $backupUserDao->saveDelData($spreadUser);//备份原始的user大概是没必要的，user更新数据都靠具体数目加减操作
                 $userUpdateList = [//减去各奖励数目
                     'id' => $uid,
                     'score' => Db::raw("score - {$spreadScore}"),
@@ -12505,7 +12491,7 @@ class StoreOrderRepository extends BaseRepository
                     'brokerage_price' => Db::raw("brokerage_price - {$spreadYongJin}"),
                     'annuity' => Db::raw("annuity - {$spreadYlj}"),
                 ];
-                $this->userDao->saveAll($userUpdateList);//执行
+                $userDao->saveAll($userUpdateList);//执行
                 $saveSpreadUserChangeList = [//将奖励数目进行备份
                     'uid' => $spreadUid,
                     'order_id' => $orderId,
@@ -12514,12 +12500,12 @@ class StoreOrderRepository extends BaseRepository
                     'brokerage_price' => $spreadYongJin ?: 0,
                     'user' => 2,
                 ];
-                $this->backupUserChangeDao->saveAll($saveSpreadUserChangeList);
+                $backupUserChangeDao->saveAll($saveSpreadUserChangeList);
             }
-            $smSpreadUid = $this->userSignScoreDao->getUidFromMarkLikeStatusOrderId($orderId);//查找扫码消费的uid
-            $smSpreadScore = $this->userSignScoreDao->getScoreFromUidOrderId($orderId,$smSpreadUid);//扫码消费积分
-            $spreadYongJinTwoUid = $this->userBillDao->getYongjinTwoUidFromOrderId($orderId, $uid, $spreadUid);//第二推荐
-            $spreadYongJinTwo = $this->userBillDao->getYongjinFromCommissionTypeUidOrderId($orderId, $spreadYongJinTwoUid);//第二推荐佣金
+            $smSpreadUid = $userSignScoreDao->getUidFromMarkLikeStatusOrderId($orderId);//查找扫码消费的uid
+            $smSpreadScore = $userSignScoreDao->getScoreFromUidOrderId($orderId,$smSpreadUid);//扫码消费积分
+            $spreadYongJinTwoUid = $userBillDao->getYongjinTwoUidFromOrderId($orderId, $uid, $spreadUid);//第二推荐
+            $spreadYongJinTwo = $userBillDao->getYongjinFromCommissionTypeUidOrderId($orderId, $spreadYongJinTwoUid);//第二推荐佣金
             $useScore = $payScore - $score;//将花费的积分减去购买获得的积分
 //            $user = Db::name('user')->where('uid', $uid)->find();
 //            Db::name('backup_user')->insert($user);//用户信息备份，大概也是不需要
@@ -12531,7 +12517,7 @@ class StoreOrderRepository extends BaseRepository
                 'contribute' => Db::raw("contribute - {$gongXian}"),
                 'annuity' => Db::raw("annuity - {$yangLaoJin}"),
             ];
-            $this->userDao->saveAll($updateUserOrderAwardList);
+            $userDao->saveAll($updateUserOrderAwardList);
             $saveUserChangeList = [
                 'uid' => $uid,
                 'order_id' => $orderId,
@@ -12542,34 +12528,34 @@ class StoreOrderRepository extends BaseRepository
                 'annuity' => $yangLaoJin ?: 0,
                 'user' => 1,
             ];
-            $this->backupUserChangeDao->saveAll($saveUserChangeList);
+            $backupUserChangeDao->saveAll($saveUserChangeList);
             if ($spreadYongJinTwoUid) {
                 $updateSpreadUserTwoList = [
                     'uid' => $spreadYongJinTwoUid,
                     'brokerage_price' => $spreadYongJinTwo
                 ];
-                $this->userDao->saveAll($updateSpreadUserTwoList);
+                $userDao->saveAll($updateSpreadUserTwoList);
                 $saveSpreadUserTwoChangeList = [
                     'uid' => $spreadYongJinTwoUid,
                     'order_id' => $orderId,
                     'brokerage_price' => $spreadYongJinTwo ?: 0,
                     'user' => 3,
                 ];
-                $this->backupUserChangeDao->saveAll($saveSpreadUserTwoChangeList);
+                $backupUserChangeDao->saveAll($saveSpreadUserTwoChangeList);
             }
             if ($smSpreadUid) {
                 $updateSpreadSMUserList = [
                     'uid' => $smSpreadUid,
                     'score' => $smSpreadScore
                 ];
-                $this->userDao->saveAll($updateSpreadSMUserList);
+                $userDao->saveAll($updateSpreadSMUserList);
                 $saveSpreadSMUserChangeList = [
                     'uid' => $smSpreadUid,
                     'order_id' => $orderId,
                     'score' => $smSpreadScore ?: 0,
                     'user' => 4,
                 ];
-                $this->backupUserChangeDao->saveAll($saveSpreadSMUserChangeList);
+                $backupUserChangeDao->saveAll($saveSpreadSMUserChangeList);
             }
             $ops = [
                 ['store_order', ['group_order_id' => $groupOrderId]],
@@ -12581,14 +12567,14 @@ class StoreOrderRepository extends BaseRepository
                 ['user_bill', ['link_id' => $orderId]],
                 ['gzc_logs', ['link_id' => $orderId]],
             ];
-            $this->tableOpsDao->backupAndDeleteBatch($ops);//备份数据以及删除源数据
-            $this->gzcLogDao->loseGzcLog($orderId);//公证处设置失效
+            $tableOpsDao->backupAndDeleteBatch($ops);//备份数据以及删除源数据
+            $gzcLogDao->loseGzcLog($orderId);//公证处设置失效
             Db::commit();
         } catch (\Exception $e) {
             Db::rollback();
             return false;
         }
-        $this->userOrderKillOrRecoverRecordsDao->insertKillOrRecoverRecord([
+        $userOrderKillOrRecoverRecordsDao->insertKillOrRecoverRecord([
             'operation_id' => $adminId,
             'uid' => $uid,
             'order_id' => $orderId,
@@ -12598,13 +12584,22 @@ class StoreOrderRepository extends BaseRepository
     }
     public function getKillOrderList()
     {
-        return $this->backupStoreOrderDao->getKillOrderList(20);
+        /**@var BackupStoreOrderDao $backupStoreOrderDao*/
+        $backupStoreOrderDao = app()->make(BackupStoreOrderDao::class);
+        $backupStoreOrderDao->getKillOrderList(20);
     }
     public function recoverOrderByAdmin($groupOrderId, $orderId)
     {
         if (empty($orderId) || empty($groupOrderId)) {
             return false;
         }
+        /** @var TableOpsDao $tableOpsDao */
+        $tableOpsDao = app()->make(TableOpsDao::class);
+        /** @var GzcLogDao $gzcLogDao */
+        $gzcLogDao = app()->make(GzcLogDao::class);
+        /** @var UserOrderKillOrRecoverRecordsDao $userOrderKillOrRecoverRecordsDao */
+        $userOrderKillOrRecoverRecordsDao = app()->make(UserOrderKillOrRecoverRecordsDao::class);
+
         try {
             /** @var easterOrder $model */
             Db::startTrans();
@@ -12618,15 +12613,15 @@ class StoreOrderRepository extends BaseRepository
                 ['user_bill', ['link_id' => $orderId]],
                 ['gzc_logs', ['link_id' => $orderId]],
             ];
-            $this->tableOpsDao->restoreBatch($restoreOps);
+            $tableOpsDao->restoreBatch($restoreOps);
             $this->easterUserAward(['order_id' => $orderId]);
-            $this->gzcLogDao->recoverGzcLogs($orderId);//公证处设置有效
+            $gzcLogDao->recoverGzcLogs($orderId);//公证处设置有效
             Db::commit();
         } catch (\Exception $e) {
             Db::rollback();
             return false;
         }
-        $this->userOrderKillOrRecoverRecordsDao->insertKillOrRecoverRecord([
+        $userOrderKillOrRecoverRecordsDao->insertKillOrRecoverRecord([
             'operation_id' => null,
             'uid' => null,
             'order_id' => $orderId,
@@ -12636,10 +12631,15 @@ class StoreOrderRepository extends BaseRepository
     }
     public function easterUserAward(array $where): void
     {
+        /** @var BackupUserChangeDao $backupUserChangeDao */
+        $backupUserChangeDao = app()->make(BackupUserChangeDao::class);
+        /** @var UserDao $userDao */
+        $userDao = app()->make(UserDao::class);
+
         $orderId = $where['order_id'];
-        $row1 = $this->backupUserChangeDao->getUserOneChangeFromOrderId($orderId);
+        $row1 = $backupUserChangeDao->getUserOneChangeFromOrderId($orderId);
         if (!empty($row1)) {
-            $this->userDao->saveAll([
+            $userDao->saveAll([
             'uid' => $row1['uid'],
             'pv' => Db::raw("pv + {$row1['pv']}"),
             'vr' => Db::raw("vr - {$row1['vr']}"),
@@ -12648,9 +12648,9 @@ class StoreOrderRepository extends BaseRepository
             'annuity' => Db::raw("annuity + {$row1['annuity']}"),
             ]);
         }
-        $row2 = $this->backupUserChangeDao->getUserTwoChangeFromOrderId($orderId);
+        $row2 = $backupUserChangeDao->getUserTwoChangeFromOrderId($orderId);
         if (!empty($row2)) {
-            $this->userDao->saveAll([
+            $userDao->saveAll([
                 'uid' => $row2['uid'],
                 'score' => Db::raw("score + {$row2['score']}"),
                 'contribute' => Db::raw("contribute + {$row2['per_contribute']}"),
@@ -12659,16 +12659,16 @@ class StoreOrderRepository extends BaseRepository
                 'per_contribute' => Db::raw("per_contribute + {$row2['per_contribute']}"),
             ]);
         }
-        $row3 = $this->backupUserChangeDao->getUserThreeChangeFromOrderId($orderId);
+        $row3 = $backupUserChangeDao->getUserThreeChangeFromOrderId($orderId);
         if (!empty($row3)) {
-            $this->userDao->saveAll([
+            $userDao->saveAll([
                 'uid' => $row3['uid'],
                 'brokerage_price' => Db::raw("brokerage_price + {$row3['brokerage_price']}"),
             ]);
         }
-        $row4 = $this->backupUserChangeDao->getUserFourChangeFromOrderId($orderId);
+        $row4 = $backupUserChangeDao->getUserFourChangeFromOrderId($orderId);
         if (!empty($row4)) {
-            $this->userDao->saveAll([
+            $userDao->saveAll([
                 'uid' => $row4['uid'],
                 'score' => Db::raw("score + {$row4['score']}")
             ]);