Merge remote-tracking branch 'origin/master'

app/command/PensionTasks.php

@@ -55,6 +55,7 @@ class PensionTasks extends Command
             $this->doThridTaobaoOrderGzc($nowTime, $timeLimit = 2);
             $this->doThridVipOrderGzc($nowTime, $timeLimit = 2);
             $this->doThridDyOrderGzc($nowTime, $timeLimit = 2);
+            $this->doThridHfOrderGzc($nowTime, $timeLimit = 2);
             //升级
 //            $this -> doUpgrade();
         } catch (\Throwable $e) {
@@ -541,6 +542,60 @@ class PensionTasks extends Command
         }
     }
 
+
+
+    /**
+     * 第三方订单话费IN10入账
+     * @param $nowTime
+     * @param $timeLimit
+     * author: php迷途小书童
+     * created: 2021/3/20 9:26
+     */
+    public function doThridHfOrderGzc($nowTime, $timeLimit)
+    {
+        $cursor = Db::table('rrx_order_huafei')
+        ->where('gzc', 0)
+        ->where('bill_status', 1)
+        ->where('commission', '>', 0)
+        ->whereTime('bill_end_time', '<', $nowTime - bcmul((string)$timeLimit, (string)86400))
+        ->cursor();
+        $ProductRepository       = app()->make(ProductRepository::class);
+        $OrderGzcRepository      = app()->make(OrderGzcRepository::class);
+        $OrderMerchantRepository = app()->make(OrderMerchantRepository::class);
+        foreach ($cursor as $thrid) {
+            $uid = $thrid['uid'];
+            if (!$uid)
+                continue;
+            $certification = UserCertification::getInstance()->where('uid', $uid)->find();
+            if (!$certification) {
+                Log::info('用户ID' . $uid . '未实名认证');
+                continue;
+            }
+            $pension = $ProductRepository->yanglaojin(0, sprintf('%.2f', $thrid['commission']));
+            Db::transaction(function () use ($uid, $certification, $thrid, $pension, $OrderGzcRepository, $OrderMerchantRepository) {
+                //新增入账明细记录
+                $orderId   = $OrderMerchantRepository->getNewOrderId('IN10');
+                $create    = [
+                    'uid'          => $uid,
+                    'platform_no'  => $orderId,
+                    'user_name'    => $certification['user_name'],
+                    'mobile'       => $certification['mobile'],
+                    'user_card'    => $certification['user_card'],
+                    'pension'      => $pension,
+                    'order_type'   => 6,
+                    'out_trade_no' => $thrid['order_sn']
+                ];
+                $test_user = Db::name('user')->where('uid', $uid)->value('test_user');
+                if ($test_user == 0) {
+                    $OrderGzcRepository->create($create);
+                }
+                Db::table('rrx_order_huafei')->update(['gzc' => 1, 'order_tb_id' => $thrid['order_tb_id']]);
+            });
+        }
+    }
+
+
+
     /**
      * 第三方订单淘宝IN10入账
      * @param $nowTime

app/controller/api/business/BusinessSchool.php

@@ -17,7 +17,8 @@ class BusinessSchool  extends BaseController
         $this->merId =  $this->request->header('merId');
     }
     public function classify_list(){
-        $list = Db::name("business_school_classify")->field('id,name') ->where('mer_id',$this->merId)->where('state',1)->where('is_del',0)->order("sort desc,id desc")-> select() -> toArray();
+        // $list = Db::name("business_school_classify")->field('id,name') ->where('mer_id',$this->merId)->where('state',1)->where('is_del',0)->order("sort desc,id desc")-> select() -> toArray();
+        $list = Db::name("business_school_classify")->field('id,name')->where('state',1)->where('is_del',0)->order("sort desc,id desc")-> select() -> toArray();
         return app("json") -> success($list);
     }
 
@@ -27,7 +28,7 @@ class BusinessSchool  extends BaseController
         $query=Db::name('business_school')
             -> alias("sp")
             -> join("business_school_classify spc","sp.classify = spc.id","left")
-            ->where('spc.mer_id',$this->merId)
+            // ->where('spc.mer_id',$this->merId)
             ->where('sp.state',1)
             ->where('sp.is_del',0)
             -> when(!empty($where['classify']),function ($query) use ($where){
@@ -42,7 +43,7 @@ class BusinessSchool  extends BaseController
         $data=Db::name('business_school')
             -> alias("sp")
             -> join("business_school_classify spc","sp.classify = spc.id","left")
-            ->where('spc.mer_id',$this->merId)
+            // ->where('spc.mer_id',$this->merId)
             ->where('sp.state',1)
             ->where('sp.id',$id)
             ->field("sp.id,sp.name,sp.image,sp.cover,sp.type,DATE(sp.create_time) as create_time,sp.mp4,sp.content,sp.reading,spc.name as classify_name")