更新

app/controller/api/store/product/Other.php

@@ -26,6 +26,12 @@ class Other extends BaseController
     protected $app;
     protected $userThird;
     protected $uid;
+    // 养老金表奖励状态
+    public $statusName = [
+        0 => '未结算',
+        1 => '已结算',
+        -1 => '失效'
+    ];
 
     public function __construct(App $app)
     {
@@ -389,7 +395,7 @@ class Other extends BaseController
         switch ($params['type']) {
             case 1://多多进宝
                 $list = Db::name('user_bill')
-                    ->field('number,order_sn')
+                    ->field('number,order_sn,status')
                     ->where('uid', $userId)
                     ->where('commission_type',5)
                     ->where('create_time', '>', date('Y-m-d H:i:s', strtotime($startTime)))
@@ -413,7 +419,7 @@ class Other extends BaseController
                         $value['bill_end_time'] = $billEndTime ? date('Y-m-d H:i:s', $billEndTime) : '';
                         //'0平台未结算1已结算2失效
                         $statusName = ['未结算', '已结算', '失效'];
-                        $value['status_name'] = $statusName[$value['bill_status']];
+                        $value['status_name'] = $this->statusName[$value['status']];
                         $commission = $value['commission'];
                         if (!$yanglao|| $yanglao <= 0){
                             $yanglao = app()->make(ProductRepository::class)->yanglaojin(0, $commission);
@@ -424,7 +430,7 @@ class Other extends BaseController
                 break;
             case 2://唯品会(没有商品价格)
                 $list = Db::name('user_bill')
-                    ->field('number,order_sn')
+                    ->field('number,order_sn,status')
                     ->where('uid', $userId)
                     ->where('commission_type',5)
                     ->where('create_time', '>', date('Y-m-d H:i:s', strtotime($startTime)))
@@ -448,7 +454,7 @@ class Other extends BaseController
                         $value['bill_end_time'] = $billEndTime ? date('Y-m-d H:i:s', $billEndTime) : '';
                         //'0平台未结算1已结算2失效
                         $statusName = ['未结算', '已结算', '失效'];
-                        $value['status_name'] = $statusName[$value['bill_status']];
+                        $value['status_name'] = $this->statusName[$value['status']];
                         $commission = $value['commission'];
                         if (!$yanglao|| $yanglao <= 0){
                             $yanglao = app()->make(ProductRepository::class)->yanglaojin(0, $commission);
@@ -458,7 +464,7 @@ class Other extends BaseController
                 break;
             case 3://苏宁订单列表
                 $list = Db::name('user_bill')
-                    ->field('number,order_sn')
+                    ->field('number,order_sn,status')
                     ->where('uid', $userId)
                     ->where('commission_type',5)
                     ->where('create_time', '>', date('Y-m-d H:i:s', strtotime($startTime)))
@@ -481,7 +487,7 @@ class Other extends BaseController
                         $value['bill_end_time'] = $billEndTime ? date('Y-m-d H:i:s', $billEndTime) : '';
                         //'0平台未结算1已结算2失效
                         $statusName = ['未结算', '已结算', '失效'];
-                        $value['status_name'] = $statusName[$value['bill_status']];
+                        $value['status_name'] = $this->statusName[$value['status']];
                         $commission = $value['commission'];
                         if (!$yanglao|| $yanglao <= 0){
                             $yanglao = app()->make(ProductRepository::class)->yanglaojin(0, $commission);
@@ -491,7 +497,7 @@ class Other extends BaseController
                 break;
             case 5://淘宝客
                 $list = Db::name('user_bill')
-                    ->field('number,order_sn')
+                    ->field('number,order_sn,status')
                     ->where('uid', $userId)
                     ->where('commission_type',5)
                     ->where('create_time', '>', date('Y-m-d H:i:s', strtotime($startTime)))
@@ -516,7 +522,7 @@ class Other extends BaseController
                         $value['bill_end_time'] = $billEndTime ? date('Y-m-d H:i:s', $billEndTime) : '';
                         //'0平台未结算1已结算2失效
                         $statusName = ['未结算', '已结算', '失效'];
-                        $value['status_name'] = $statusName[$value['bill_status']];
+                        $value['status_name'] = $this->statusName[$value['status']];
                         $commission = $value['commission'];
                         if ($commission == 0) {
                             $commission = sprintf('%.2f', $value['commission_rate'] * $value['pay_money'] / 100);
@@ -532,7 +538,7 @@ class Other extends BaseController
                 break;
             case 6://京东订单
                 $list = Db::name('user_bill')
-                    ->field('number,order_sn')
+                    ->field('number,order_sn,status')
                     ->where('uid', $userId)
                     ->where('commission_type',5)
                     ->where('create_time', '>', date('Y-m-d H:i:s', strtotime($startTime)))
@@ -558,7 +564,7 @@ class Other extends BaseController
                         $value['bill_end_time'] = $billEndTime ? date('Y-m-d H:i:s', $billEndTime) : '';
                         //'0平台未结算1已结算2失效
                         $statusName = ['未结算', '已结算', '失效'];
-                        $value['status_name'] = $statusName[$value['bill_status']];
+                        $value['status_name'] = $this->statusName[$value['status']];
                         $commission = $value['commission'];
                         if (!$yanglao|| $yanglao <= 0){
                             $yanglao = app()->make(ProductRepository::class)->yanglaojin(0, $commission);
@@ -568,7 +574,7 @@ class Other extends BaseController
                 break;
             case 9: //抖音
                 $list = Db::name('user_bill')
-                    ->field('number,order_sn')
+                    ->field('number,order_sn,status')
                     ->where('uid', $userId)
                     ->where('commission_type',5)
                     ->where('pay_success_time', '>', date('Y-m-d H:i:s', strtotime($startTime)))
@@ -594,7 +600,7 @@ class Other extends BaseController
                         $value['bill_end_time'] = $billEndTime ? date('Y-m-d H:i:s', $billEndTime) : '';
                         //'0平台未结算1已结算2失效
                         $statusName = ['未结算', '已结算', '失效'];
-                        $value['status_name'] = $statusName[$value['bill_status']];
+                        $value['status_name'] = $this->statusName[$value['status']];
                         $commission = $value['commission'];
                         if (!$yanglao|| $yanglao <= 0){
                             $yanglao = app()->make(ProductRepository::class)->yanglaojin(0, $commission);
@@ -604,7 +610,7 @@ class Other extends BaseController
                 break;
             case 10: //话费
                 $list = Db::name('user_bill')
-                    ->field('number,order_sn')
+                    ->field('number,order_sn,status')
                     ->where('uid', $userId)
                     ->where('commission_type',5)
                     ->where('create_time', '>', date('Y-m-d H:i:s', strtotime($startTime)))
@@ -627,7 +633,7 @@ class Other extends BaseController
                     $value['bill_end_time'] = $billEndTime ? date('Y-m-d H:i:s', $billEndTime) : '';
                     //'0平台未结算1已结算2失效
                     $statusName = ['未结算', '已结算', '失效'];
-                    $value['status_name'] = $statusName[$value['bill_status']];
+                    $value['status_name'] = $this->statusName[$value['status']];
                     $commission = $value['commission'];
                     $yanglao = $value['number'];
                     if (!$yanglao|| $yanglao <= 0){