后台-撤回订单-重构

app/common/dao/backup/BackupStoreOrderDao.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace app\common\dao\backup;
+
+use app\common\dao\BaseDao;
+use app\common\model\backup\BackupStoreOrder;
+
+class BackupStoreOrderDao extends BaseDao
+{
+    protected function getModel(): string
+    {
+        return BackupStoreOrder::class;
+    }
+    /**
+     * 获取撤回订单列表
+     */
+    public function getKillOrderList($limit)
+    {
+        return $this->getModel()::getDB()->paginate($limit)->toArray();
+    }
+}

app/common/dao/backup/BackupUserChangeDao.php

@@ -0,0 +1,74 @@
+<?php
+
+namespace app\common\dao\backup;
+
+use app\common\dao\BaseDao;
+use app\common\model\backup\BackupUserChange;
+
+class BackupUserChangeDao extends BaseDao
+{
+    protected function getModel(): string
+    {
+        return BackupUserChange::class;
+    }
+
+    /**
+     * @param array $dataList
+     * @return array批量更新
+     */
+    public function saveAll(array $dataList): array
+    {
+        try {
+            return $this->getModel()->getInstance()->allowField(array_keys(reset($dataList)))->saveAll($dataList)->toArray();
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
+    /**
+     * 根据 order_id 获取用户本人变更数据（user=1）
+     */
+    public function getUserOneChangeFromOrderId($orderId)
+    {
+        return $this::getModel()::getDB()
+            ->where('order_id', '=', $orderId)
+            ->where('user', '=', 1)
+            ->field('pv, vr, score, contribute, annuity, uid')
+            ->find();
+    }
+
+    /**
+     * 根据 order_id 获取一级推荐人变更数据（user=2）
+     */
+    public function getUserTwoChangeFromOrderId($orderId)
+    {
+        return $this::getModel()::getDB()
+            ->where('order_id', '=', $orderId)
+            ->where('user', '=', 2)
+            ->field('brokerage_price, score, per_contribute, annuity, uid')
+            ->find();
+    }
+
+    /**
+     * 根据 order_id 获取第二推荐人佣金变更数据（user=3）
+     */
+    public function getUserThreeChangeFromOrderId($orderId)
+    {
+        return $this::getModel()::getDB()
+            ->where('order_id', '=', $orderId)
+            ->where('user', '=', 3)
+            ->field('brokerage_price, uid')
+            ->find();
+    }
+
+    /**
+     * 根据 order_id 获取扫码推荐人积分变更数据（user=4）
+     */
+    public function getUserFourChangeFromOrderId($orderId)
+    {
+        return $this::getModel()::getDB()
+            ->where('order_id', '=', $orderId)
+            ->where('user', '=', 4)
+            ->field('score, uid')
+            ->find();
+    }
+}

app/common/dao/backup/BackupUserDao.php

@@ -0,0 +1,25 @@
+<?php
+
+
+namespace app\common\dao\backup;
+use app\common\dao\BaseDao;
+use app\common\model\BaseModel;
+use app\common\model\backup\BackupUser;
+
+class BackupUserDao extends BaseDao
+{
+    protected function getModel(): string
+    {
+        return BackupUser::class;
+    }
+
+    /**
+     * 备份删除的用户表数据
+     * @param array $spreadUser
+     * @return int
+     */
+    public function saveDelData(array $spreadUser)
+    {
+        return $this->getModel()::getDB()->insert($spreadUser);
+    }
+}

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

@@ -635,4 +635,32 @@ class StoreOrderDao extends BaseDao
         }
         return $entityList;
     }
+
+    /**
+     * 红积分订单查询（订单ID列表）
+     * @param int $merId
+     * @param array $orderIdList
+     * @return array
+     */
+    public function getRedNumOrders(int $merId, array $orderIdList): array
+    {
+        try {
+            return StoreOrder::getDB()
+                ->alias('o')
+                ->join('user_bill u', 'u.order_sn=o.order_sn')
+                ->where('o.paid', 1)
+                ->where('o.is_red_ylj', 0)
+                ->where('o.mer_id', $merId)
+                ->where('u.commission_type', 5)
+                ->where('u.gzc', 3)
+                ->where('u.status', 0)
+                ->whereIn('o.pay_type', [0, 5])
+                ->whereIn('o.order_id', $orderIdList)
+                ->field('o.order_id,o.order_sn,u.number,u.mark')
+                ->select()
+                ->toArray();
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
 }

app/common/dao/user/UserBillDao.php

@@ -254,4 +254,66 @@ class UserBillDao extends BaseDao
             return [];
         }
     }
-}
+    /**
+     * 根据order_id与uid查找养老金值（link_id，status=1, pm=1）
+     */
+    public function getYanglaoFromUidOrderId($orderId, $uid)
+    {
+        try {
+            return $this::getModel()::getDB()
+                ->where('link_id', '=', $orderId)
+                ->where('status', '=', 1)
+                ->where('pm', '=', 1)
+                ->where('uid', '=', $uid)
+                ->value('number');
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
+    /**
+     * 根据order_id与uid查找佣金（commission_type=5）
+     */
+    public function getYljFromCommissionTypeUidOrderId($orderId, $uid)
+    {
+        try {
+            return $this::getModel()::getDB()
+                ->where('link_id', '=', $orderId)
+                ->where('commission_type', '=', 5)
+                ->where('uid', '=', $uid)
+                ->value('number');
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
+    /**
+     * 根据order_id与uid查找佣金（commission_type=3）
+     */
+    public function getYongjinFromCommissionTypeUidOrderId($orderId, $uid)
+    {
+        try {
+            return $this::getModel()::getDB()
+                ->where('link_id', '=', $orderId)
+                ->where('commission_type', '=', 3)
+                ->where('uid', '=', $uid)
+                ->value('number');
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
+    /**
+     * 根据order_id查找第二推荐佣金uid（commission_type=3，排除当前用户和一级推荐人）
+     */
+    public function getYongjinTwoUidFromOrderId($orderId, $uid, $spreadUid)
+    {
+        try {
+            $value = $this::getModel()::getDB()
+                ->where('link_id', '=', $orderId)
+                ->where('commission_type', '=', 3)
+                ->whereNotIn('uid', [$uid, $spreadUid])
+                ->value('uid');
+            return $value ?: 0;
+        } catch (\Exception $e) {
+            return 0;
+        }
+    }
+}

app/common/dao/user/UserDao.php

@@ -456,4 +456,26 @@ class UserDao extends BaseDao
     {
         return $this::getModel()::getDB()->where('level_id', '=', $userId)->column('uid');
     }
+    /**
+     * 通过uid获取spreadUid
+     */
+    public function getSpreadUidFromUid($uid)
+    {
+        try {
+        return $this::getModel()::getDB()->where('uid', '=', $uid)->value('spread_uid');
+        } catch (\Exception $e) {
+        return [];
+        }
+    }
+    /**
+     * 根据spread查找用户信息
+     */
+    public function getSpreadUserFromUid($spreadUid)
+    {
+        try {
+            return $this::getModel()::getDB()->where('uid', '=', $spreadUid)->find();
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
 }

app/common/dao/user/UserPvLogDao.php

@@ -86,4 +86,30 @@ class UserPvLogDao extends BaseDao
             return [];
         }
     }
-}
+    /**
+     * 根据order_id和status查找pv值
+     */
+    public function getPVFromStatusOrderId($orderId)
+    {
+        try {
+            return $this::getModel()::getDB()->where('order_id', '=', $orderId)->where('status','=',1)->value('pv');
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
+    /**
+     * 根据order_id获取pv值（用于备份用户变更记录）
+     */
+    public function getPvForBackupFromOrderId($orderId)
+    {
+        try {
+            $value = $this::getModel()::getDB()
+                ->where('order_id', '=', $orderId)
+                ->where('status', '=', 1)
+                ->value('pv');
+            return $value ?: 0;
+        } catch (\Exception $e) {
+            return 0;
+        }
+    }
+}

app/common/dao/user/UserSignGongxianDao.php

@@ -86,4 +86,20 @@ class UserSignGongxianDao extends BaseDao
             return [];
         }
     }
-}
+    /**
+     * 根据order_id与uid查找贡献值（status=1, type=1）
+     */
+    public function getGongxianFromUidOrderId($orderId, $uid)
+    {
+        try {
+            return $this::getModel()::getDB()
+                ->where('order_id', '=', $orderId)
+                ->where('status', '=', 1)
+                ->where('type', '=', 1)
+                ->where('uid', '=', $uid)
+                ->value('number');
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
+}

app/common/dao/user/UserSignScoreDao.php

@@ -87,4 +87,82 @@ class UserSignScoreDao extends BaseDao
             return [];
         }
     }
-}
+    /**
+     * 根据order_id与uid查找奖励积分值（status=1, source_type=3, pm=1）
+     */
+    public function getRewardScoreFromUidOrderId($orderId, $uid)
+    {
+        try {
+            return $this::getModel()::getDB()
+                ->where('order_id', '=', $orderId)
+                ->where('status', '=', 1)
+                ->where('source_type', '=', 3)
+                ->where('uid', '=', $uid)
+                ->where('pm', '=', 1)
+                ->value('reward_socre');
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
+    /**
+     * 根据order_id与uid查找支付积分值（status=1, pm=2）
+     */
+    public function getPayScoreFromUidOrderId($orderId, $uid)
+    {
+        try {
+            return $this::getModel()::getDB()
+                ->where('order_id', '=', $orderId)
+                ->where('status', '=', 1)
+                ->where('uid', '=', $uid)
+                ->where('pm', '=', 2)
+                ->value('reward_socre');
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
+    /**
+     * 根据order_id与uid查找奖励积分值（status=1）
+     */
+    public function getRewardScoreFromStatusUidOrderId($orderId, $uid)
+    {
+        try {
+            return $this::getModel()::getDB()
+                ->where('order_id', '=', $orderId)
+                ->where('uid', '=', $uid)
+                ->where('status', '=', 1)
+                ->value('reward_socre');
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
+    /**
+     * 根据order_id查找扫码推荐人uid（mark like '%扫码%', status=1）
+     */
+    public function getUidFromMarkLikeStatusOrderId($orderId)
+    {
+        try {
+            return $this::getModel()::getDB()
+                ->where('order_id', '=', $orderId)
+                ->whereLike('mark', '%扫码%')
+                ->where('status', '=', 1)
+                ->value('uid');
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
+    /**
+     * 根据上面getUidFromMarkLikeStatusOrderId方法查处的Uid来确定score
+     */
+    public function getScoreFromUidOrderId($orderId, $smSpreadUid)
+    {
+        try {
+            return $this::getModel()::getDB()
+                ->where('order_id', '=', $orderId)
+                ->where('uid', '=', $smSpreadUid)
+                ->where('status', '=', 1)
+                ->value('reward_socre');
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
+}

app/common/dao/user/UserSignVrDao.php

@@ -56,4 +56,30 @@ class UserSignVrDao extends BaseDao
             return [];
         }
     }
-}
+    /**
+     * 根据订单id和type类型查找vr
+     */
+    public function getVrFromTypeOrderId($orderId)
+    {
+        try {
+            return $this::getModel()::getDB()->where('order_id', '=', $orderId)->where('type','=',2)->value('number');
+        } catch (\Exception $e){
+            return [];
+        }
+    }
+    /**
+     * 根据order_id获取vr值（用于备份用户变更记录）
+     */
+    public function getVrForBackupFromOrderId($orderId)
+    {
+        try {
+            $value = $this::getModel()::getDB()
+                ->where('order_id', '=', $orderId)
+                ->where('type', '=', 2)
+                ->value('number');
+            return $value ?: 0;
+        } catch (\Exception $e) {
+            return 0;
+        }
+    }
+}

app/common/dao/util/TableOpsDao.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace app\common\dao\util;
+
+use think\facade\Db;
+
+class TableOpsDao
+{
+    public function backupAndDeleteBatch(array $ops): void
+    {
+        foreach ($ops as [$table, $where]) {
+        $this->backupAndDelete($table, $where);
+        }
+    }
+    public function backupAndDelete(string $table, array $where): void
+    {
+        $rows = Db::name($table)->where($where)->select()->toArray();
+        if ($rows) {
+            Db::name('backup_' . $table)->insertAll($rows);
+            Db::name($table)->where($where)->delete();
+        }
+    }
+
+    public function restore(string $table, array $where): void
+    {
+        $backupTable = 'backup_' . $table;
+        $rows = Db::name($backupTable)->where($where)->select()->toArray();
+        if ($rows) {
+            foreach ($rows as &$row) {
+                if (isset($row['del_time'])) unset($row['del_time']);
+            }
+            unset($row);
+            Db::name($table)->insertAll($rows);
+            Db::name($backupTable)->where($where)->delete();
+        }
+    }
+
+    public function restoreBatch(array $ops): void
+    {
+        foreach ($ops as [$table, $where]) {
+            $this->restore($table, $where);
+        }
+    }
+}
+

app/common/model/backup/BackupStoreOrder.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace app\common\model\backup;
+use app\common\model\BaseModel;
+
+class BackupStoreOrder extends BaseModel
+{
+    public static function tablePk(): ?string
+    {
+        return 'order_id';
+    }
+    public static function tableName(): string
+    {
+        return 'backup_store_order';
+    }
+}

app/common/model/backup/BackupUser.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace app\common\model\backup;
+
+use app\common\model\BaseModel;
+
+class BackupUser extends BaseModel
+{
+    public static function tablePk(): string
+    {
+        return 'uid';
+    }
+    public static function tableName(): string
+    {
+        return 'backup_user';
+    }
+}

app/common/model/backup/BackupUserChange.php

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

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

@@ -12,6 +12,18 @@ namespace app\common\repositories\store\order;
 
 
 use app\common\dao\store\order\StoreOrderDao;
+use app\common\dao\user\UserDao;
+use app\common\dao\user\UserPvLogDao;
+use app\common\dao\user\UserSignVrDao;
+use app\common\dao\user\UserSignScoreDao;
+use app\common\dao\user\UserSignGongxianDao;
+use app\common\dao\user\UserBillDao;
+use app\common\dao\user\UserOrderKillOrRecoverRecordsDao;
+use app\common\dao\backup\BackupGzcLogsDao;
+use app\common\dao\backup\BackupUserDao;
+use app\common\dao\backup\BackupUserChangeDao;
+use app\common\dao\util\TableOpsDao;
+use app\common\dao\backup\BackupStoreOrderDao;
 use app\common\enum\CommonEnum;
 use app\common\enum\merchant\MerchantEnum;
 use app\common\enum\shipping\ShippingTemplateEnum;
@@ -140,6 +152,31 @@ 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 backupGzcLogsDao */
+    private $backupGzcLogsDao;
+    /** @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'; // 商贸区：现金+京豆
@@ -154,6 +191,18 @@ 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->backupGzcLogsDao = app()->make(BackupGzcLogsDao::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);
     }
 
     /**
@@ -5074,12 +5123,6 @@ class StoreOrderRepository extends BaseRepository
             }
             $query->whereIn('order_id', $ids);
         }
-        if (!empty($where['keywords'])) {
-            /** @var StoreOrderProductRepository $storeOrderProductRepository */
-            $storeOrderProductRepository = app()->make(StoreOrderProductRepository::class);
-            $orderIdList = $storeOrderProductRepository->getOrderIdListByKeyword($where['keywords']);
-            $query->whereIn('order_id', $orderIdList);
-        }
         $count = $query->count();
         $list = $query->with([
             'orderProduct', 'merchant' => function ($query) {
@@ -12428,4 +12471,381 @@ class StoreOrderRepository extends BaseRepository
 
         return $postage;
     }
+    public function useKillOrderRewards($groupOrderId, $orderId, $uid,$adminId)
+    {
+        if (empty($orderId) || empty($groupOrderId) || empty($uid)) {
+            return false;
+        }
+        try {
+            Db::startTrans();
+            //$spreadUid = Db::name('user')->where('uid', $uid)->value('spread_uid');
+            //$pv = $this->getTableValue('user_pv_log', [['order_id', '=', $orderId], ['status', '=', 1]], 'pv');
+//            $payVr = $this->getTableValue('user_sign_vr', [['order_id', '=', $orderId], ['type', '=', 2]], 'number');
+//            $score = $this->getTableValue('user_sign_score', [['order_id', '=', $orderId], ['status', '=', 1], ['source_type', '=', 3], ['uid', '=', $uid], ['pm', '=', 1]], 'reward_socre');
+//            $payScore = $this->getTableValue('user_sign_score', [['order_id', '=', $orderId], ['status', '=', 1], ['pm', '=', 2], ['uid', '=', $uid]], 'reward_socre');
+//            $gongXian = $this->getTableValue('user_sign_gongxian', [['order_id', '=', $orderId], ['status', '=', 1], ['type', '=', 1], ['uid', '=', $uid]], 'number');
+//            $yangLaoJin = $this->getTableValue('user_bill', [['link_id', '=', $orderId], ['status', '=', 1], ['pm', '=', 1], ['uid', '=', $uid]], 'number');
+            //查找是否有推荐人
+            $spreadUid = $this->userDao->getSpreadUidFromUid($uid);
+            //取出pv
+            $pv = $this->userPvLogDao->getPVFromStatusOrderId($orderId);
+            //取出 vr
+            $payVr = $this->userSignVrDao->getVrFromTypeOrderId($orderId);
+            //取出购买赠送积分 / 支出积分
+            $score = $this->userSignScoreDao->getRewardScoreFromUidOrderId($orderId, $uid);
+            $payScore = $this->userSignScoreDao->getPayScoreFromUidOrderId($orderId, $uid);
+            // 贡献值
+            $gongXian = $this->userSignGongxianDao->getGongxianFromUidOrderId($orderId, $uid);
+            // 养老金
+            $yangLaoJin = $this->userBillDao->getYanglaoFromUidOrderId($orderId, $uid);
+            if ($spreadUid) {
+                //如果有推荐人就执行
+//                $spreadScore = $this->getTableValue('user_sign_score', [['order_id', '=', $orderId], ['uid', '=', $spreadUid], ['status', '=', 1]], 'reward_socre');
+//                $spreadGongXian = $this->getTableValue('user_sign_gongxian', [['order_id', '=', $orderId], ['status', '=', 1], ['type', '=', 1], ['uid', '=', $spreadUid]], 'number');
+//                $spreadYlj = $this->getTableValue('user_bill', [['link_id', '=', $orderId], ['commission_type', '=', 5], ['uid', '=', $spreadUid]], 'number');
+//                $spreadYongJin = $this->getTableValue('user_bill', [['link_id', '=', $orderId], ['commission_type', '=', 3], ['uid', '=', $spreadUid]], 'number');
+//                $spreadUser = Db::name('user')->where('uid', $spreadUid)->find();
+//                Db::name('backup_user')->insert($spreadUser);
+                //                Db::name('user')->where('uid', $spreadUid)->update([
+                //                    'score' => Db::raw("score - {$spreadScore}"),
+                //                    'per_contribute' => Db::raw("per_contribute - {$spreadGongXian}"),
+                //                    'brokerage_price' => Db::raw("brokerage_price - {$spreadYongJin}"),
+                //                    'annuity' => Db::raw("annuity - {$spreadYlj}"),
+                //                ]);
+//                Db::name('backup_user_change')->insert([
+//                    'uid' => $spreadUid,
+//                    'order_id' => $orderId,
+//                    'score' => $spreadScore ?: 0,
+//                    'per_contribute' => $spreadGongXian ?: 0,
+//                    'brokerage_price' => $spreadYongJin ?: 0,
+//                    'user' => 2,
+//                ]);
+
+                $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更新数据都靠具体数目加减操作
+                $userUpdateList = [//减去各奖励数目
+                    'id' => $uid,
+                    'score' => Db::raw("score - {$spreadScore}"),
+                    'per_contribute' => Db::raw("per_contribute - {$spreadGongXian}"),
+                    'brokerage_price' => Db::raw("brokerage_price - {$spreadYongJin}"),
+                    'annuity' => Db::raw("annuity - {$spreadYlj}"),
+                ];
+                $this->userDao->saveAll($userUpdateList);
+                $saveSpreaadUserChangeList = [//将奖励数目进行备份
+                    'uid' => $spreadUid,
+                    'order_id' => $orderId,
+                    'score' => $spreadScore ?: 0,
+                    'per_contribute' => $spreadGongXian ?: 0,
+                    'brokerage_price' => $spreadYongJin ?: 0,
+                    'user' => 2,
+                ];
+                $this->backupUserChangeDao->saveAll($saveSpreaadUserChangeList);
+            }
+//            $smSpreadUid = $this->getTableValue('user_sign_score', [['order_id', '=', $orderId], ['mark', 'like', '%扫码%'], ['status', '=', 1]], 'uid');
+//            $smSpreadScore = $this->getTableValue('user_sign_score', [['order_id', '=', $orderId], ['uid', '=', $smSpreadUid], ['status', '=', 1]], 'reward_socre');
+//            $spreadYongJinTwoUid = $this->getTableValue('user_bill', [['link_id', '=', $orderId], ['commission_type', '=', 3], ['uid', 'not in', [$uid, $spreadUid]]], 'uid');
+//            $spreadYongJinTwo = $this->getTableValue('user_bill', [['link_id', '=', $orderId], ['commission_type', '=', 3], ['uid', '=', $spreadYongJinTwoUid]], 'number');
+            $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);
+            $useScore = $payScore - $score;//将花费的积分减去购买获得的积分
+//            $user = Db::name('user')->where('uid', $uid)->find();
+//            Db::name('backup_user')->insert($user);//用户信息备份，大概也是不需要
+            $updateUserOrderAwardList = [//吧奖励和花费撤回
+                'uid' => $uid,
+                'pv' => Db::raw("pv - {$pv}"),
+                'vr' => Db::raw("vr + {$payVr}"),
+                'score' => Db::raw("score + {$useScore}"),
+                'contribute' => Db::raw("contribute - {$gongXian}"),
+                'annuity' => Db::raw("annuity - {$yangLaoJin}"),
+            ];
+            $this->userDao->saveAll($updateUserOrderAwardList);
+//            Db::name('user')->where('uid', $uid)->update([
+//                'pv' => Db::raw("pv - {$pv}"),
+//                'vr' => Db::raw("vr + {$payVr}"),
+//                'score' => Db::raw("score + {$uscore}"),
+//                'contribute' => Db::raw("contribute - {$gongXian}"),
+//                'annuity' => Db::raw("annuity - {$yangLaoJin}"),
+//            ]);
+//            Db::name('backup_user_change')->insert([
+//                'uid' => $uid,
+//                'order_id' => $orderId,
+//                'pv' => $pv ?: 0,
+//                'vr' => $payVr ?: 0,
+//                'score' => $uscore ?: 0,
+//                'contribute' => $gongXian ?: 0,
+//                'annuity' => $yangLaoJin ?: 0,
+//                'user' => 1,
+//            ]);
+            $saveUserChangeList = [
+                'uid' => $uid,
+                'order_id' => $orderId,
+                'pv' => $pv ?: 0,
+                'vr' => $payVr ?: 0,
+                'score' => $useScore ?: 0,
+                'contribute' => $gongXian ?: 0,
+                'annuity' => $yangLaoJin ?: 0,
+                'user' => 1,
+            ];
+            $this->backupUserChangeDao->saveAll($saveUserChangeList);
+            if ($spreadYongJinTwoUid) {
+//                $spreadUserTwo = Db::name('user')->where('uid', $spreadYongJinTwoUid)->find();
+//                Db::name('backup_user')->insert($spreadUserTwo);//同理，不需要备份原user表数
+///               Db::name('user')->where('uid', $spreadYongJinTwoUid)->dec('brokerage_price', $spreadYongJinTwo)->update();
+                ///                 Db::name('backup_user_change')->insert([
+                ////                    'uid' => $spreadYongJinTwoUid,
+                ////                    'order_id' => $orderId,
+                ////                    'brokerage_price' => $spreadYongJinTwo ?: 0,
+                ////                    'user' => 3,
+                ////                ]);
+                $updateSpreadUserTwoList = [
+                    'uid' => $spreadYongJinTwoUid,
+                    'brokerage_price' => $spreadYongJinTwo
+                ];
+                $this->userDao->saveAll($updateSpreadUserTwoList);
+                $saveSpreadUserTwoChangeList = [
+                    'uid' => $spreadYongJinTwoUid,
+                    'order_id' => $orderId,
+                    'brokerage_price' => $spreadYongJinTwo ?: 0,
+                    'user' => 3,
+                ];
+                $this->backupUserChangeDao->saveAll($saveSpreadUserTwoChangeList);
+            }
+            if ($smSpreadUid) {
+//                $smUserTwo = Db::name('user')->where('uid', $smSpreadUid)->find();
+//                Db::name('backup_user')->insert($smUserTwo);//同理
+//                Db::name('user')->where('uid', $smSpreadUid)->dec('score', $smSpreadScore)->update();
+//                Db::name('backup_user_change')->insert([
+//                    'uid' => $smSpreadUid,
+//                    'order_id' => $orderId,
+//                    'score' => $smSpreadScore ?: 0,
+//                    'user' => 4,
+//                ]);
+                $updateSpreadSMUserList = [
+                    'uid' => $smSpreadUid,
+                    'score' => $smSpreadScore
+                ];
+                $this->userDao->saveAll($updateSpreadSMUserList);
+                $saveSpreadSMUserChangeList = [
+                    'uid' => $smSpreadUid,
+                    'order_id' => $orderId,
+                    'score' => $smSpreadScore ?: 0,
+                    'user' => 4,
+                ];
+                $this->backupUserChangeDao->saveAll($saveSpreadSMUserChangeList);
+            }
+            // $this->backupAndDelete('store_order', ['group_order_id' => $groupOrderId]);
+            // $this->backupAndDelete('store_group_order', ['group_order_id' => $groupOrderId]);
+            // $this->backupAndDelete('user_pv_log', ['order_id' => $orderId]);
+            // $this->backupAndDelete('user_sign_vr', ['order_id' => $orderId]);
+            // $this->backupAndDelete('user_sign_score', ['order_id' => $orderId]);
+            // $this->backupAndDelete('user_sign_gongxian', ['order_id' => $orderId]);
+            // $this->backupAndDelete('user_bill', ['link_id' => $orderId]);
+            // $this->backupAndDelete('gzc_logs', ['link_id' => $orderId]);
+            $ops = [
+                ['store_order', ['group_order_id' => $groupOrderId]],
+                ['store_group_order', ['group_order_id' => $groupOrderId]],
+                ['user_pv_log', ['order_id' => $orderId]],
+                ['user_sign_vr', ['order_id' => $orderId]],
+                ['user_sign_score', ['order_id' => $orderId]],
+                ['user_sign_gongxian', ['order_id' => $orderId]],
+                ['user_bill', ['link_id' => $orderId]],
+                ['gzc_logs', ['link_id' => $orderId]],
+            ];
+            $this->tableOpsDao->backupAndDeleteBatch($ops);
+            Db::commit();
+        } catch (\Exception $e) {
+            Db::rollback();
+            return false;
+        }
+        // Db::name('user_order_kill_records')->insert([
+        //     'operation_id' => $adminId,
+        //     'uid' => $uid,
+        //     'order_id' => $orderId,
+        //     'mark' => '后台管理员撤销订单记录',
+        // ]);
+        $this->userOrderKillOrRecoverRecordsDao->insertKillOrRecoverRecord([
+            'operation_id' => $adminId,
+            'uid' => $uid,
+            'order_id' => $orderId,
+            'mark' => '后台管理员撤销订单记录',
+        ]);
+        return true;
+    }
+    public function getKillOrderList()
+    {
+        return $this->backupStoreOrderDao->getKillOrderList(20);
+    }
+    public function recoverOrderByAdmin($groupOrderId, $orderId)
+    {
+        if (empty($orderId) || empty($groupOrderId)) {
+            return false;
+        }
+        try {
+            /** @var easterOrder $model */
+            Db::startTrans();
+            // $this->easterOrder('store_order', ['group_order_id' => $groupOrderId]);
+            // $this->easterOrder('store_group_order', ['group_order_id' => $groupOrderId]);
+            // $this->easterOrder('user_pv_log', ['order_id' => $orderId]);
+            // $this->easterOrder('user_sign_vr', ['order_id' => $orderId]);
+            // $this->easterOrder('user_sign_score', ['order_id' => $orderId]);
+            // $this->easterOrder('user_sign_gongxian', ['order_id' => $orderId]);
+            // $this->easterOrder('user_bill', ['link_id' => $orderId]);
+            // $this->easterOrder('gzc_logs', ['link_id' => $orderId]);
+            $restoreOps = [
+                ['store_order', ['group_order_id' => $groupOrderId]],
+                ['store_group_order', ['group_order_id' => $groupOrderId]],
+                ['user_pv_log', ['order_id' => $orderId]],
+                ['user_sign_vr', ['order_id' => $orderId]],
+                ['user_sign_score', ['order_id' => $orderId]],
+                ['user_sign_gongxian', ['order_id' => $orderId]],
+                ['user_bill', ['link_id' => $orderId]],
+                ['gzc_logs', ['link_id' => $orderId]],
+            ];
+            $this->tableOpsDao->restoreBatch($restoreOps);
+            $this->easterUserAward(['order_id' => $orderId]);
+            Db::commit();
+        } catch (\Exception $e) {
+            Db::rollback();
+            return false;
+        }
+//        Db::name('user_order_recover_records')->insert([
+//            'operation_id' => $adminId,
+//            'order_id' => $orderId,
+//            'mark' => '恢复订单记录',
+//        ]);
+        $this->userOrderKillOrRecoverRecordsDao->insertKillOrRecoverRecord([
+            'operation_id' => null,
+            'uid' => null,
+            'order_id' => $orderId,
+            'mark' => '后台管理员恢复订单记录',
+        ]);
+        return true;
+    }
+//    private function backupAndDelete(string $table, array $where): void
+//    {
+//        $backupTable = 'backup_' . $table;
+//        $rows = Db::name($table)->where($where)->select()->toArray();
+//        if ($rows) {
+//            Db::name($backupTable)->insertAll($rows);
+//            Db::name($table)->where($where)->delete();
+//        }
+//    }
+//
+//    private function getTableValue(string $table, array $where, string $field, $default = 0)
+//    {
+//        $value = Db::name($table)->where($where)->value($field);
+//        return $value ?? $default;
+//    }
+//
+//    private function easterOrder(string $table, array $where): void
+//    {
+//        $backupTable = 'backup_' . $table;
+//        $rows = Db::name($backupTable)->where($where)->select()->toArray();
+//        if ($rows) {
+//            foreach ($rows as &$row) {
+//                if (isset($row['del_time'])) unset($row['del_time']);
+//            }
+//            unset($row);
+//            Db::name($table)->insertAll($rows);
+//            Db::name($backupTable)->where($where)->delete();
+//        }
+//    }
+//    private function easterUserAward(array $where): void
+//    {
+//        $row = Db::name('backup_user_change')->where($where)->where('user', 1)->field('pv, vr, score, contribute, annuity,uid')->find();
+//        if ($row) {
+//            $uid = $row['uid'];
+//            $pv = $row['pv'];
+//            $vr = $row['vr'];
+//            $score = $row['score'];
+//            $contribute = $row['contribute'];
+//            $annuity = $row['annuity'];
+//            Db::name('user')->where('uid', $uid)->update([
+//                'pv' => Db::raw("pv + {$pv}"),
+//                'vr' => Db::raw("vr - {$vr}"),
+//                'score' => Db::raw("score - {$score}"),
+//                'contribute' => Db::raw("contribute + {$contribute}"),
+//                'annuity' => Db::raw("annuity + {$annuity}"),
+//            ]);
+//        }
+//        $row2 = Db::name('backup_user_change')->where($where)->where('user', 2)->field('brokerage_price, score, per_contribute, annuity,uid')->find();
+//        if ($row2) {
+//            $spreadUid = $row2['uid'];
+//            $spreadScore = $row2['score'];
+//            $per_contribute = $row2['per_contribute'];
+//            $spreadAnnuity = $row2['annuity'];
+//            $spreadYongJin = $row2['brokerage_price'];
+//            Db::name('user')->where('uid', $spreadUid)->update([
+//                'score' => Db::raw("score + {$spreadScore}"),
+//                'contribute' => Db::raw("contribute + {$per_contribute}"),
+//                'annuity' => Db::raw("annuity + {$spreadAnnuity}"),
+//                'brokerage_price' => Db::raw("brokerage_price + {$spreadYongJin}"),
+//                'per_contribute' => Db::raw("per_contribute + {$per_contribute}"),
+//            ]);
+//        }
+//        $row3 = Db::name('backup_user_change')->where($where)->where('user', 3)->field('brokerage_price,uid')->find();
+//        if ($row3) {
+//            $spreadUidTwo = $row3['uid'];
+//            $spreadYongJin2 = $row3['brokerage_price'];
+//            Db::name('user')->where('uid', $spreadUidTwo)->update([
+//                'brokerage_price' => Db::raw("brokerage_price + {$spreadYongJin2}"),
+//            ]);
+//        }
+//        $row4 = Db::name('backup_user_change')->where($where)->where('user', 4)->field('score,uid')->find();
+//        if ($row4) {
+//            $spreadUidThree = $row4['uid'];
+//            $spreadScore3 = $row4['score'];
+//            Db::name('user')->where('uid', $spreadUidThree)->update([
+//                'score' => Db::raw("score + {$spreadScore3}"),
+//            ]);
+//        }
+//    }
+    public function easterUserAward(array $where): void
+    {
+        $orderId = $where['order_id'];
+        $row1 = $this->backupUserChangeDao->getUserOneChangeFromOrderId($orderId);
+        if (!empty($row1)) {
+            $this->userDao->saveAll([
+            'uid' => $row1['uid'],
+            'pv' => Db::raw("pv + {$row1['pv']}"),
+            'vr' => Db::raw("vr - {$row1['vr']}"),
+            'score' => Db::raw("score - {$row1['score']}"),
+            'contribute' => Db::raw("contribute + {$row1['contribute']}"),
+            'annuity' => Db::raw("annuity + {$row1['annuity']}"),
+            ]);
+        }
+        $row2 = $this->backupUserChangeDao->getUserTwoChangeFromOrderId($orderId);
+        if (!empty($row2)) {
+            $this->userDao->saveAll([
+                'uid' => $row2['uid'],
+                'score' => Db::raw("score + {$row2['score']}"),
+                'contribute' => Db::raw("contribute + {$row2['per_contribute']}"),
+                'annuity' => Db::raw("annuity + {$row2['annuity']}"),
+                'brokerage_price' => Db::raw("brokerage_price + {$row2['brokerage_price']}"),
+                'per_contribute' => Db::raw("per_contribute + {$row2['per_contribute']}"),
+            ]);
+        }
+        $row3 = $this->backupUserChangeDao->getUserThreeChangeFromOrderId($orderId);
+        if (!empty($row3)) {
+            $this->userDao->saveAll([
+                'uid' => $row3['uid'],
+                'brokerage_price' => Db::raw("brokerage_price + {$row3['brokerage_price']}"),
+            ]);
+        }
+        $row4 = $this->backupUserChangeDao->getUserFourChangeFromOrderId($orderId);
+        if (!empty($row4)) {
+            $this->userDao->saveAll([
+                'uid' => $row4['uid'],
+                'score' => Db::raw("score + {$row4['score']}")
+            ]);
+        }
+    }
 }
+
+

app/controller/admin/order/Order.php

@@ -348,254 +348,264 @@ class Order extends BaseController
         if (!in_array($adminId, [1,28,29])) {//超级管理员,财务,老总
             return app('json')->fail('后台权限不足');
         }
-        try {
-            Db::startTrans();
-            //查找是否有推荐人
-            $spreadUid = Db::name('user')->where('uid', $uid)->value('spread_uid');
-            //取出pv
-            $pv = $this->getValue('user_pv_log', [['order_id', '=', $order_id], ['status', '=', 1],], 'pv');
-            //取出 vr
-            $payVr = $this->getValue('user_sign_vr', [['order_id', '=', $order_id], ['type', '=', 2],], 'number');
-            //取出购买赠送积分 / 支出积分
-            $score = $this->getValue('user_sign_score', [['order_id', '=', $order_id], ['status', '=', 1], ['source_type', '=', 3], ['uid', '=', $uid], ['pm', '=', 1],], 'reward_socre');
-            $payScore = $this->getValue('user_sign_score', [['order_id', '=', $order_id], ['status', '=', 1], ['pm', '=', 2], ['uid', '=', $uid],], 'reward_socre');
-            // 贡献值
-            $gongXian = $this->getValue('user_sign_gongxian', [['order_id', '=', $order_id], ['status', '=', 1], ['type', '=', 1], ['uid', '=', $uid],], 'number');
-            // 养老金
-            $yangLaoJin = $this->getValue('user_bill', [['link_id', '=', $order_id], ['status', '=', 1], ['pm', '=', 1], ['uid', '=', $uid],], 'number');
-            if($spreadUid){  //如果有推荐人就执行
-                $spreadScore = 0;
-                $spreadGongXian = 0;
-                $spreadYlj = 0;
-                $spreadYongJin = 0;
-                $spreadScore = $this->getValue('user_sign_score', [['order_id', '=', $order_id], ['uid', '=', $spreadUid], ['status', '=', 1],], 'reward_socre');
-                $spreadGongXian = $this->getValue('user_sign_gongxian', [['order_id', '=', $order_id], ['status', '=', 1], ['type', '=', 1], ['uid', '=', $spreadUid],], 'number');
-                $spreadYlj = $this->getValue('user_bill', [['link_id', '=', $order_id], ['commission_type', '=', 5], ['uid', '=', $spreadUid],], 'number'); //推荐获得养老金
-                $spreadYongJin = $this->getValue('user_bill', [['link_id', '=', $order_id], ['commission_type', '=', 3], ['uid', '=', $spreadUid],], 'number');  //推荐获得佣金
-                $spreadUser = Db::name('user')->where('uid', $spreadUid)->find();
-                Db::name('backup_user')->insert($spreadUser);  //插入备份表
-                Db::name('user')->where('uid', $spreadUid)   //更新数据
-                    ->update([
-                        'score' => Db::raw("score - {$spreadScore}"),
-                        'per_contribute' => Db::raw("per_contribute - {$spreadGongXian}"),
-                        'brokerage_price' => Db::raw("brokerage_price - {$spreadYongJin}"),
-                        'annuity' => Db::raw("annuity - {$spreadYlj}"),
-                    ]);
-                $userhjm1 =[
-                    'uid' => $spreadUid,
-                    'order_id' => $order_id,
-                    'score' => $spreadScore??0,
-                    'per_contribute' => $spreadGongXian??0,
-                    'brokerage_price' => $spreadYongJin??0,
-                    'user' => 2,
-                ];
-                Db::name('backup_user_change')->insert($userhjm1);   //插入更新数据记录表
-            }
-            //扫吗消费
-            $smSpreadUid = $this->getValue('user_sign_score', [['order_id', '=', $order_id], ['mark','like','%扫码%'], ['status', '=', 1],], 'uid');
-            $smSpreadScore = $this->getValue('user_sign_score', [['order_id', '=', $order_id], ['uid','=',$smSpreadUid], ['status', '=', 1],], 'reward_socre');
-            //第二推荐
-            $spreadYongJinTwoUid = $this->getValue('user_bill', [['link_id', '=', $order_id], ['commission_type', '=', 3], ['uid', 'not in', [$uid, $spreadUid]],], 'uid');
-            $spreadYongJinTwo = $this->getValue('user_bill', [['link_id', '=', $order_id], ['commission_type', '=', 3], ['uid', '=', $spreadYongJinTwoUid],], 'number');
-            //更新购买用户的user表
-            $uscore = $payScore - $score;
-            $user = Db::name('user')->where('uid', $uid)->find();
-            Db::name('backup_user')->insert($user);
-            Db::name('user')->where('uid', $uid)
-                ->update([
-                    'pv'         => Db::raw("pv - {$pv}"),
-                    'vr'         => Db::raw("vr + {$payVr}"),
-                    'score'      => Db::raw("score + {$uscore}"),
-                    'contribute' => Db::raw("contribute - {$gongXian}"),
-                    'annuity'    => Db::raw("annuity - {$yangLaoJin}"),
-                ]);
-            $userhjm =[
-                'uid' => $uid,
-                'order_id' => $order_id,
-                'pv' => $pv??0,
-                'vr' => $payVr??0,
-                'score' => $uscore??0,
-                'contribute' => $gongXian??0,
-                'annuity' => $yangLaoJin??0,
-                'user' => 1,
-            ];
-            Db::name('backup_user_change')->insert($userhjm);//具体修改插入对应表
-            //第二推荐
-            if($spreadYongJinTwoUid) {
-                $spreadUserTwo = Db::name('user')->where('uid', $spreadYongJinTwoUid)->find();
-                Db::name('backup_user')->insert($spreadUserTwo);
-                Db::name('user')->where('uid', $spreadYongJinTwoUid)->dec('brokerage_price', $spreadYongJinTwo)->update();
-                $userhjm2 =[
-                    'uid' => $spreadYongJinTwoUid,
-                    'order_id' => $order_id,
-                    'brokerage_price' => $spreadYongJinTwo??0,
-                    'user' => 3,
-                ];
-                Db::name('backup_user_change')->insert($userhjm2);
-            }//扫码消费
-            if($smSpreadUid){
-                $smUserTwo = Db::name('user')->where('uid', $smSpreadUid)->find();
-                Db::name('backup_user')->insert($smUserTwo);
-                Db::name('user')->where('uid', $smSpreadUid)->dec('score', $smSpreadScore)->update();
-                $userhjm3 =[
-                    'uid' => $smSpreadUid,
-                    'order_id' => $order_id,
-                    'score' => $smSpreadScore??0,
-                    'user' => 4,
-                ];
-                Db::name('backup_user_change')->insert($userhjm3);
-            }
-            // 删除订单相关表p;
-            $this->backupAndDelete('store_order', ['group_order_id' => $group_order_id]);
-            $this->backupAndDelete('store_group_order', ['group_order_id' => $group_order_id]);
-            $this->backupAndDelete('user_pv_log', ['order_id' => $order_id]);
-            $this->backupAndDelete('user_sign_vr', ['order_id' => $order_id]);
-            $this->backupAndDelete('user_sign_score', ['order_id' => $order_id]);
-            $this->backupAndDelete('user_sign_gongxian', ['order_id' => $order_id]);
-            $this->backupAndDelete('user_bill', ['link_id' => $order_id]);
-            $this->backupAndDelete('gzc_logs', ['link_id' => $order_id]);
-            Db::commit();
-        } catch (\Exception $e) {
-            Db::rollback();
-            return app('json')->fail('操作失败'. $e->getMessage());
+        $ok = $this->repository->useKillOrderRewards($group_order_id, $order_id, $uid,$adminId);
+        if (!$ok) {
+            return app('json')->fail('操作失败');
         }
-        Db::name("user_order_kill_records")->insert([//记录哪位管理员撤销的订单
-            'operation_id' => $adminId,
-            'uid' => $uid,
-            'order_id' => $order_id,
-            'mark' => '后台管理员撤销订单记录'
-        ]);
         return app('json')->success('操作成功');
+//        try {
+//            Db::startTrans();
+//            //查找是否有推荐人
+//            $spreadUid = Db::name('user')->where('uid', $uid)->value('spread_uid');
+//            //取出pv
+//            $pv = $this->getValue('user_pv_log', [['order_id', '=', $order_id], ['status', '=', 1],], 'pv');
+//            //取出 vr
+//            $payVr = $this->getValue('user_sign_vr', [['order_id', '=', $order_id], ['type', '=', 2],], 'number');
+//            //取出购买赠送积分 / 支出积分
+//            $score = $this->getValue('user_sign_score', [['order_id', '=', $order_id], ['status', '=', 1], ['source_type', '=', 3], ['uid', '=', $uid], ['pm', '=', 1],], 'reward_socre');
+//            $payScore = $this->getValue('user_sign_score', [['order_id', '=', $order_id], ['status', '=', 1], ['pm', '=', 2], ['uid', '=', $uid],], 'reward_socre');
+//            // 贡献值
+//            $gongXian = $this->getValue('user_sign_gongxian', [['order_id', '=', $order_id], ['status', '=', 1], ['type', '=', 1], ['uid', '=', $uid],], 'number');
+//            // 养老金
+//            $yangLaoJin = $this->getValue('user_bill', [['link_id', '=', $order_id], ['status', '=', 1], ['pm', '=', 1], ['uid', '=', $uid],], 'number');
+//            if($spreadUid){  //如果有推荐人就执行
+//                $spreadScore = 0;
+//                $spreadGongXian = 0;
+//                $spreadYlj = 0;
+//                $spreadYongJin = 0;
+//                $spreadScore = $this->getValue('user_sign_score', [['order_id', '=', $order_id], ['uid', '=', $spreadUid], ['status', '=', 1],], 'reward_socre');
+//                $spreadGongXian = $this->getValue('user_sign_gongxian', [['order_id', '=', $order_id], ['status', '=', 1], ['type', '=', 1], ['uid', '=', $spreadUid],], 'number');
+//                $spreadYlj = $this->getValue('user_bill', [['link_id', '=', $order_id], ['commission_type', '=', 5], ['uid', '=', $spreadUid],], 'number'); //推荐获得养老金
+//                $spreadYongJin = $this->getValue('user_bill', [['link_id', '=', $order_id], ['commission_type', '=', 3], ['uid', '=', $spreadUid],], 'number');  //推荐获得佣金
+//                $spreadUser = Db::name('user')->where('uid', $spreadUid)->find();
+//                Db::name('backup_user')->insert($spreadUser);  //插入备份表
+//                Db::name('user')->where('uid', $spreadUid)   //更新数据
+//                    ->update([
+//                        'score' => Db::raw("score - {$spreadScore}"),
+//                        'per_contribute' => Db::raw("per_contribute - {$spreadGongXian}"),
+//                        'brokerage_price' => Db::raw("brokerage_price - {$spreadYongJin}"),
+//                        'annuity' => Db::raw("annuity - {$spreadYlj}"),
+//                    ]);
+//                $userhjm1 =[
+//                    'uid' => $spreadUid,
+//                    'order_id' => $order_id,
+//                    'score' => $spreadScore??0,
+//                    'per_contribute' => $spreadGongXian??0,
+//                    'brokerage_price' => $spreadYongJin??0,
+//                    'user' => 2,
+//                ];
+//                Db::name('backup_user_change')->insert($userhjm1);   //插入更新数据记录表
+//            }
+//            //扫吗消费
+//            $smSpreadUid = $this->getValue('user_sign_score', [['order_id', '=', $order_id], ['mark','like','%扫码%'], ['status', '=', 1],], 'uid');
+//            $smSpreadScore = $this->getValue('user_sign_score', [['order_id', '=', $order_id], ['uid','=',$smSpreadUid], ['status', '=', 1],], 'reward_socre');
+//            //第二推荐
+//            $spreadYongJinTwoUid = $this->getValue('user_bill', [['link_id', '=', $order_id], ['commission_type', '=', 3], ['uid', 'not in', [$uid, $spreadUid]],], 'uid');
+//            $spreadYongJinTwo = $this->getValue('user_bill', [['link_id', '=', $order_id], ['commission_type', '=', 3], ['uid', '=', $spreadYongJinTwoUid],], 'number');
+//            //更新购买用户的user表
+//            $uscore = $payScore - $score;
+//            $user = Db::name('user')->where('uid', $uid)->find();
+//            Db::name('backup_user')->insert($user);
+//            Db::name('user')->where('uid', $uid)
+//                ->update([
+//                    'pv'         => Db::raw("pv - {$pv}"),
+//                    'vr'         => Db::raw("vr + {$payVr}"),
+//                    'score'      => Db::raw("score + {$uscore}"),
+//                    'contribute' => Db::raw("contribute - {$gongXian}"),
+//                    'annuity'    => Db::raw("annuity - {$yangLaoJin}"),
+//                ]);
+//            $userhjm =[
+//                'uid' => $uid,
+//                'order_id' => $order_id,
+//                'pv' => $pv??0,
+//                'vr' => $payVr??0,
+//                'score' => $uscore??0,
+//                'contribute' => $gongXian??0,
+//                'annuity' => $yangLaoJin??0,
+//                'user' => 1,
+//            ];
+//            Db::name('backup_user_change')->insert($userhjm);//具体修改插入对应表
+//            //第二推荐
+//            if($spreadYongJinTwoUid) {
+//                $spreadUserTwo = Db::name('user')->where('uid', $spreadYongJinTwoUid)->find();
+//                Db::name('backup_user')->insert($spreadUserTwo);
+//                Db::name('user')->where('uid', $spreadYongJinTwoUid)->dec('brokerage_price', $spreadYongJinTwo)->update();
+//                $userhjm2 =[
+//                    'uid' => $spreadYongJinTwoUid,
+//                    'order_id' => $order_id,
+//                    'brokerage_price' => $spreadYongJinTwo??0,
+//                    'user' => 3,
+//                ];
+//                Db::name('backup_user_change')->insert($userhjm2);
+//            }//扫码消费
+//            if($smSpreadUid){
+//                $smUserTwo = Db::name('user')->where('uid', $smSpreadUid)->find();
+//                Db::name('backup_user')->insert($smUserTwo);
+//                Db::name('user')->where('uid', $smSpreadUid)->dec('score', $smSpreadScore)->update();
+//                $userhjm3 =[
+//                    'uid' => $smSpreadUid,
+//                    'order_id' => $order_id,
+//                    'score' => $smSpreadScore??0,
+//                    'user' => 4,
+//                ];
+//                Db::name('backup_user_change')->insert($userhjm3);
+//            }
+//            // 删除订单相关表p;
+//            $this->backupAndDelete('store_order', ['group_order_id' => $group_order_id]);
+//            $this->backupAndDelete('store_group_order', ['group_order_id' => $group_order_id]);
+//            $this->backupAndDelete('user_pv_log', ['order_id' => $order_id]);
+//            $this->backupAndDelete('user_sign_vr', ['order_id' => $order_id]);
+//            $this->backupAndDelete('user_sign_score', ['order_id' => $order_id]);
+//            $this->backupAndDelete('user_sign_gongxian', ['order_id' => $order_id]);
+//            $this->backupAndDelete('user_bill', ['link_id' => $order_id]);
+//            $this->backupAndDelete('gzc_logs', ['link_id' => $order_id]);
+//            Db::commit();
+//        } catch (\Exception $e) {
+//            Db::rollback();
+//            return app('json')->fail('操作失败'. $e->getMessage());
+//        }
+//        Db::name("user_order_kill_records")->insert([//记录哪位管理员撤销的订单
+//            'operation_id' => $adminId,
+//            'uid' => $uid,
+//            'order_id' => $order_id,
+//            'mark' => '后台管理员撤销订单记录'
+//        ]);
+//        return app('json')->success('操作成功');
     }
-
-    private function backupAndDelete($table, array $where)//备份并删除
-    {
-        $backupTable = 'backup_' . $table;
-        $rows = Db::name($table)->where($where)->select()->toArray();
-        if ($rows) {
-            Db::name($backupTable)->insertAll($rows);
-            Db::name($table)->where($where)->delete();
-        }
-    }
-    private function getValue($table, array $where, string $field, $default = 0)//查找
-    {
-        $value = Db::name($table)->where($where)->value($field);
-        return $value ?? $default;
-    }
-
+//
+//    private function backupAndDelete($table, array $where)//备份并删除
+//    {
+//        $backupTable = 'backup_' . $table;
+//        $rows = Db::name($table)->where($where)->select()->toArray();
+//        if ($rows) {
+//            Db::name($backupTable)->insertAll($rows);
+//            Db::name($table)->where($where)->delete();
+//        }
+//    }
+//    private function getValue($table, array $where, string $field, $default = 0)//查找
+//    {
+//        $value = Db::name($table)->where($where)->value($field);
+//        return $value ?? $default;
+//    }
     /**
      * 展示撤回订单列表,恢复订单
      */
     public function killOrderLst()  //撤回订单的列表
     {
-        $query = Db::name('backup_store_order')->paginate(20)->toArray();
-        return app('json')->success($query, '获取成功');
+//        $query = Db::name('backup_store_order')->paginate(20)->toArray();
+//        return app('json')->success($query, '获取成功');
+        $list = $this->repository->getKillOrderList();
+        return app('json')->success($list, '获取成功');
     }
     public function easterKillOrder(){   //恢复订单
         $group_order_id = request()->param('group_order_id');
         $order_id = request()->param('order_id');
-        $adminId = $this->request->adminId();
         if (empty($order_id) || empty($group_order_id)) {
             return app('json')->fail('参数缺失');
         }
-        try {
-            Db::startTrans();
-            // 恢复订单相关表
-            $this->easterOrder('store_order', ['group_order_id' => $group_order_id]);
-            $this->easterOrder('store_group_order', ['group_order_id' => $group_order_id]);
-            // 恢复 pv
-            $this->easterOrder('user_pv_log', ['order_id' => $order_id]);
-            // 恢复 vr
-            $this->easterOrder('user_sign_vr', ['order_id' => $order_id]);
-            // 恢复 积分
-            $this->easterOrder('user_sign_score', ['order_id' => $order_id]);
-            // 恢复 贡献值
-            $this->easterOrder('user_sign_gongxian', ['order_id' => $order_id]);
-            // 恢复 佣金/养老金等
-            $this->easterOrder('user_bill', ['link_id' => $order_id]);
-            // 恢复 公证处
-            $this->easterOrder('gzc_logs', ['link_id' => $order_id]);
-            //恢复用户奖励
-            $this->easterUserAward(['order_id' => $order_id]);
-            Db::commit();
-        } catch (\Exception $e) {
-            Db::rollback();
-            return app('json')->fail('撤回失败: '.$e->getMessage());
-        }
-        Db::name("user_order_recover_records")->insert([//记录恢复的订单
-            'operation_id' => $adminId,
-            'order_id' => $order_id,
-            'mark' => '恢复订单记录'
-        ]);
-        return app('json')->success('撤回成功');
-    }
-    private function easterOrder($table, array $where)  //恢复表数据
-    {
-        $backupTable = 'backup_' . $table;
-        $rows = Db::name($backupTable)->where($where)->select()->toArray();
-
-        if ($rows) {
-            foreach ($rows as &$row) {
-                if (isset($row['del_time'])) unset($row['del_time']);
-            }
-            unset($row);
-            Db::name($table)->insertAll($rows);
-            Db::name($backupTable)->where($where)->delete();
-        }
-    }
-    private function easterUserAward(array $where){  //恢复奖励
-        $row = Db::name('backup_user_change')->where($where)->where('user', 1)->field('pv, vr, score, contribute, annuity,uid')->find();
-        $uid = $row['uid'];
-        $pv   = $row['pv'];
-        $vr   = $row['vr'];
-        $score= $row['score'];
-        $contribute = $row['contribute'];
-        $annuity = $row['annuity'];
-        Db::name('user') //更新订单用户
-            ->where('uid', $uid)
-            ->update([
-                'pv'         => Db::raw("pv + {$pv}"),
-                'vr'         => Db::raw("vr - {$vr}"),
-                'score'      => Db::raw("score - {$score}"),
-                'contribute' => Db::raw("contribute + {$contribute}"),
-                'annuity'    => Db::raw("annuity + {$annuity}"),
-            ]);
-        $row2 = Db::name('backup_user_change')->where($where)->where('user', 2)->field('brokerage_price, score, per_contribute, annuity,uid')->find();
-        if ($row2) {
-            $spreadUid = $row2['uid'];
-            $spreadScore = $row2['score'];
-            $per_contribute = $row2['per_contribute'];
-            $spreadAnnuity = $row2['annuity'];
-            $spreadYongJin = $row2['brokerage_price'];
-            Db::name('user')     //更新推荐人
-            ->where('uid', $spreadUid)
-                ->update([
-                    'score' => Db::raw("score + {$spreadScore}"),
-                    'contribute' => Db::raw("contribute + {$per_contribute}"),
-                    'annuity' => Db::raw("annuity + {$spreadAnnuity}"),
-                    'brokerage_price' => Db::raw("brokerage_price + {$spreadYongJin}"),
-                    'per_contribute'=> Db::raw("per_contribute + {$per_contribute}"),
-                ]);
-        }
-        $row3 = Db::name('backup_user_change')->where($where)->where('user', 3)->field('brokerage_price,uid')->find();
-        if ($row3) {
-            $spreadUidTwo = $row3['uid']; //第二推荐人
-            $spreadYongJin2 = $row3['brokerage_price'];
-            Db::name('user')
-                ->where('uid', $spreadUidTwo)
-                ->update([
-                    'brokerage_price' => Db::raw("brokerage_price + {$spreadYongJin2}"),
-                ]);
-        }
-        $row4 = Db::name('backup_user_change')->where($where)->where('user', 4)->field('score,uid')->find();
-        if ($row4) {
-            $spreadUidThree = $row4['uid'];   //扫码
-            $spreadScore3 = $row4['score'];
-            Db::name('user')
-                ->where('uid', $spreadUidThree)
-                ->update([
-                    'score' => Db::raw("score + {$spreadScore3}"),
-                ]);
+        $ok = $this->repository->recoverOrderByAdmin($group_order_id, $order_id);
+        if (!$ok) {
+            return app('json')->fail('操作失败');
         }
+        return app('json')->success('操作成功');
+//        try {
+//            Db::startTrans();
+//            // 恢复订单相关表
+//            $this->easterOrder('store_order', ['group_order_id' => $group_order_id]);
+//            $this->easterOrder('store_group_order', ['group_order_id' => $group_order_id]);
+//            // 恢复 pv
+//            $this->easterOrder('user_pv_log', ['order_id' => $order_id]);
+//            // 恢复 vr
+//            $this->easterOrder('user_sign_vr', ['order_id' => $order_id]);
+//            // 恢复 积分
+//            $this->easterOrder('user_sign_score', ['order_id' => $order_id]);
+//            // 恢复 贡献值
+//            $this->easterOrder('user_sign_gongxian', ['order_id' => $order_id]);
+//            // 恢复 佣金/养老金等
+//            $this->easterOrder('user_bill', ['link_id' => $order_id]);
+//            // 恢复 公证处
+//            $this->easterOrder('gzc_logs', ['link_id' => $order_id]);
+//            //恢复用户奖励
+//            $this->easterUserAward(['order_id' => $order_id]);
+//            Db::commit();
+//        } catch (\Exception $e) {
+//            Db::rollback();
+//            return app('json')->fail('撤回失败: '.$e->getMessage());
+//        }
+//        Db::name("user_order_recover_records")->insert([//记录恢复的订单
+//            'operation_id' => $adminId,
+//            'order_id' => $order_id,
+//            'mark' => '恢复订单记录'
+//        ]);
+//        return app('json')->success('撤回成功');
     }
+//    private function easterOrder($table, array $where)  //恢复表数据
+//    {
+//        $backupTable = 'backup_' . $table;
+//        $rows = Db::name($backupTable)->where($where)->select()->toArray();
+//
+//        if ($rows) {
+//            foreach ($rows as &$row) {
+//                if (isset($row['del_time'])) unset($row['del_time']);
+//            }
+//            unset($row);
+//            Db::name($table)->insertAll($rows);
+//            Db::name($backupTable)->where($where)->delete();
+//        }
+//    }
+//    private function easterUserAward(array $where){  //恢复奖励
+//        $row = Db::name('backup_user_change')->where($where)->where('user', 1)->field('pv, vr, score, contribute, annuity,uid')->find();
+//        $uid = $row['uid'];
+//        $pv   = $row['pv'];
+//        $vr   = $row['vr'];
+//        $score= $row['score'];
+//        $contribute = $row['contribute'];
+//        $annuity = $row['annuity'];
+//        Db::name('user') //更新订单用户
+//            ->where('uid', $uid)
+//            ->update([
+//                'pv'         => Db::raw("pv + {$pv}"),
+//                'vr'         => Db::raw("vr - {$vr}"),
+//                'score'      => Db::raw("score - {$score}"),
+//                'contribute' => Db::raw("contribute + {$contribute}"),
+//                'annuity'    => Db::raw("annuity + {$annuity}"),
+//            ]);
+//        $row2 = Db::name('backup_user_change')->where($where)->where('user', 2)->field('brokerage_price, score, per_contribute, annuity,uid')->find();
+//        if ($row2) {
+//            $spreadUid = $row2['uid'];
+//            $spreadScore = $row2['score'];
+//            $per_contribute = $row2['per_contribute'];
+//            $spreadAnnuity = $row2['annuity'];
+//            $spreadYongJin = $row2['brokerage_price'];
+//            Db::name('user')     //更新推荐人
+//            ->where('uid', $spreadUid)
+//                ->update([
+//                    'score' => Db::raw("score + {$spreadScore}"),
+//                    'contribute' => Db::raw("contribute + {$per_contribute}"),
+//                    'annuity' => Db::raw("annuity + {$spreadAnnuity}"),
+//                    'brokerage_price' => Db::raw("brokerage_price + {$spreadYongJin}"),
+//                    'per_contribute'=> Db::raw("per_contribute + {$per_contribute}"),
+//                ]);
+//        }
+//        $row3 = Db::name('backup_user_change')->where($where)->where('user', 3)->field('brokerage_price,uid')->find();
+//        if ($row3) {
+//            $spreadUidTwo = $row3['uid']; //第二推荐人
+//            $spreadYongJin2 = $row3['brokerage_price'];
+//            Db::name('user')
+//                ->where('uid', $spreadUidTwo)
+//                ->update([
+//                    'brokerage_price' => Db::raw("brokerage_price + {$spreadYongJin2}"),
+//                ]);
+//        }
+//        $row4 = Db::name('backup_user_change')->where($where)->where('user', 4)->field('score,uid')->find();
+//        if ($row4) {
+//            $spreadUidThree = $row4['uid'];   //扫码
+//            $spreadScore3 = $row4['score'];
+//            Db::name('user')
+//                ->where('uid', $spreadUidThree)
+//                ->update([
+//                    'score' => Db::raw("score + {$spreadScore3}"),
+//                ]);
+//        }
+//    }
 }