修复线下订单养老金不展示问题

app/controller/api/user/User.php

@@ -1178,7 +1178,7 @@ class User extends BaseController
         $member_id = $this->request->uid();
 
         [$page, $limit] = $this->getPage();
-        $where = ["uid" => $member_id, "type" => "commission", "commission_type" => 5, "type_shop" => 0];
+        $where = ["uid" => $member_id, "type" => "commission", "commission_type" => 5];
         if ($this->source == 'yhc' && $this->merId) {
             $where['mer_id'] = $this->merId;
         }
@@ -1197,6 +1197,11 @@ class User extends BaseController
         if ($source > -1) {
             $where['source'] = $source;
         }
+        if($source == 1) {
+            $where['type_shop'] = 10;
+        }else{
+            $where['type_shop'] = 0;
+        }
         $res = $this->repository->yanglaolog($where, $page, $limit, $month,1);
         if ($res) {
             $res['list'] = $res['list']->toArray();
@@ -2769,7 +2774,7 @@ class User extends BaseController
             'num' => count($offLine),
             'yanglao' => round($this->num($offLine, 'yanglao'), 2)
         );
-        $offLinewhere=['uid'=>$uid,'status'=>'1','commission_type' => '5','source'=>1,'type_shop'=>0];
+        $offLinewhere=['uid'=>$uid,'status'=>'1','commission_type' => '5','source'=>1,'type_shop'=>10];
         if($this->source=='yhc' && $this->merId){
             $offLinewhere['mer_id']=$this->merId;
         }