ç§修改苏宁问题

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

@@ -477,25 +477,21 @@ class Other extends BaseController
                 foreach ($list as $k => &$value) {
                         $su_list = Db::name("order_su")
                             ->where("order_sn",$value['order_sn'])
-                            ->field('order_su_id id,goods_id,order_sn,goods_count goods_num,goods_thumb goods_img,goods_name,status other_status_desc,order_time create_time,commission,bill_status,bill_end_time,pay_amount')
+                            ->field('order_su_id id,goods_id,order_sn,goods_count goods_num,goods_thumb goods_img,goods_name,status other_status_desc,order_time create_time,commission,bill_status,bill_create_time,pay_amount')
                             ->find();
                         if(!$su_list){
                             unset($list[$k]);
                             continue;
                         }
-                        $value = array_merge($value,$su_list);
                         $yanglao = $value['number'];
                         $value['source'] = 3;
-                        $billEndTime = $value['bill_end_time'];
+                        $billEndTime = $su_list['bill_end_time'];
                         $value['bill_end_time'] = $billEndTime ? date('Y-m-d H:i:s', $billEndTime) : '';
                         //'0平台未结算1已结算2失效
                         $statusName = ['未结算', '已结算', '失效'];
                         $value['status_name'] = $this->statusName[$value['status']];
-                        $commission = $value['commission'];
-                        if (!$yanglao|| $yanglao <= 0){
-                            $yanglao = app()->make(ProductRepository::class)->yanglaojin(0, $commission);
-                        }
                         $value['yanglao'] = $yanglao;
+                        $value = array_merge($value,$su_list);
                 }
                 break;
             case 5://淘宝客
@@ -511,33 +507,25 @@ class Other extends BaseController
                 foreach ($list as $k => &$value) {
                         $tb_list = Db::name("order_tb")
                             ->where("order_sn",$value['order_sn'])
-                            ->field('order_tb_id id,item_id goods_id,order_sn,item_num goods_num,item_img goods_img,item_title goods_name,item_price goods_price,tk_status,create_time,commission,commission_rate,alipay_total_price pay_money,bill_status,bill_end_time')
+                            ->field('order_tb_id id,item_id goods_id,order_sn,item_num goods_num,item_img goods_img,item_title goods_name,item_price goods_price,tk_status,create_time,commission,commission_rate,alipay_total_price pay_money,bill_status,bill_create_time')
                             ->find();
                         if(!$tb_list){
                             unset($list[$k]);
                             continue;
                         }
-                        $value = array_merge($value,$tb_list);
                         $yanglao = $value['number'];
-                        $otherStatus = $value['tk_status'];
+                        $otherStatus = $tb_list['tk_status'];
                         $value['other_status_desc'] = TbOrderModel::$statusName[$otherStatus] ?? '未知类型';
                         $value['source'] = 5;
-                        $billEndTime = $value['bill_end_time'];
+                        $billEndTime = $tb_list['bill_create_time'];
                         $value['bill_end_time'] = $billEndTime ? date('Y-m-d H:i:s', $billEndTime) : '';
                         //'0平台未结算1已结算2失效
-                        $statusName = ['未结算', '已结算', '失效'];
                         $value['status_name'] = $this->statusName[$value['status']];
-                        $commission = $value['commission'];
-                        if ($commission == 0) {
-                            $commission = sprintf('%.2f', $value['commission_rate'] * $value['pay_money'] / 100);
-                        }
-                        if (!$yanglao|| $yanglao <= 0){
-                            $yanglao = app()->make(ProductRepository::class)->yanglaojin(0, $commission);
-                        }
                         if (strpos($value['goods_img'], 'http') === false){
                             $value['goods_img'] = "http:".$value['goods_img'];
                         }
                         $value['yanglao'] = $yanglao;
+                        $value = array_merge($value,$tb_list);
                 }
                 break;
             case 6://京东订单
@@ -554,27 +542,22 @@ class Other extends BaseController
                 foreach ($list as $k => &$value) {
                         $jd_list = Db::name("order_jd")
                             ->where("order_sn",$value['order_sn'])
-                            ->field('order_jd_id id,sku_id goods_id,order_sn,sku_num goods_num,image_url goods_img,sku_name goods_name,pay_money,price goods_price,status,create_time,commission,bill_status,bill_end_time')
+                            ->field('order_jd_id id,sku_id goods_id,order_sn,sku_num goods_num,image_url goods_img,sku_name goods_name,pay_money,price goods_price,status,create_time,commission,bill_status,bill_create_time')
                             ->find();
                         if(!$jd_list){
                             unset($list[$k]);
                             continue;
                         }
-                        $value = array_merge($value,$jd_list);
                         $yanglao = $value['number'];
-                        $otherStatus = $value['status'];
+                        $otherStatus = $jd_list['status'];
                         $value['other_status_desc'] = JdOrderModel::$statusName[$otherStatus] ?? '未知订单状态';
                         $value['source'] = 6;
-                        $billEndTime = $value['bill_end_time'];
+                        $billEndTime = $jd_list['bill_create_time'];
                         $value['bill_end_time'] = $billEndTime ? date('Y-m-d H:i:s', $billEndTime) : '';
                         //'0平台未结算1已结算2失效
-                        $statusName = ['未结算', '已结算', '失效'];
                         $value['status_name'] = $this->statusName[$value['status']];
-                        $commission = $value['commission'];
-                        if (!$yanglao|| $yanglao <= 0){
-                            $yanglao = app()->make(ProductRepository::class)->yanglaojin(0, $commission);
-                        }
                         $value['yanglao'] = $yanglao;
+                        $value = array_merge($value,$jd_list);
                 }
                 break;
             case 9: //抖音
@@ -597,21 +580,17 @@ class Other extends BaseController
                             unset($list[$k]);
                             continue;
                         }
-                        $value = array_merge($value,$dy_list);
                         $yanglao = $value['number'];
-                        $otherStatus = $value['status'];
+                        $otherStatus = $dy_list['status'];
                         $value['other_status_desc'] = DyOrderModel::$statusName[$otherStatus] ?? '未知订单状态';
                         $value['source'] = 9;
-                        $billEndTime = $value['bill_end_time'];
+                        $billEndTime = $dy_list['bill_end_time'];
                         $value['bill_end_time'] = $billEndTime ? date('Y-m-d H:i:s', $billEndTime) : '';
                         //'0平台未结算1已结算2失效
                         $statusName = ['未结算', '已结算', '失效'];
                         $value['status_name'] = $this->statusName[$value['status']];
-                        $commission = $value['commission'];
-                        if (!$yanglao|| $yanglao <= 0){
-                            $yanglao = app()->make(ProductRepository::class)->yanglaojin(0, $commission);
-                        }
                         $value['yanglao'] = $yanglao;
+                        $value = array_merge($value,$dy_list);
                 }
                 break;
             case 10: //话费

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

@@ -795,7 +795,6 @@ class Su extends BaseController
             if (empty($localOrder)) {
                 //订单写入数据库,bill_end_time再格式化订单的时候已经加入,所以写入订单的时候就不需要在计算了
                 $localOrder = SuOrderModel::create($order);
-                log::
                 //预估养老金
                 $orderThird->yuguOrder(
                     $localOrder['order_su_id'],