Explorar o código

修复电商养老金明细报错

sunxiaobiao hai 1 ano
pai
achega
b4efda60d0
Modificáronse 1 ficheiros con 28 adicións e 7 borrados
  1. 28 7
      app/controller/api/store/product/Other.php

+ 28 - 7
app/controller/api/store/product/Other.php

@@ -398,7 +398,10 @@ class Other extends BaseController
398
                     ->order('bill_id', 'desc')
398
                     ->order('bill_id', 'desc')
399
                     ->page($page, $limit)->select()->toArray();
399
                     ->page($page, $limit)->select()->toArray();
400
                 foreach ($list as $k => &$value) {
400
                 foreach ($list as $k => &$value) {
401
-                        $pdd_list = Db::name("order_pdd")->where("order_sn",$value['order_sn'])->field('order_pdd_id id,goods_id,goods_sign,order_sn,goods_num,goods_img,goods_name,goods_price,pin_order_status other_status,pin_order_status_desc other_status_desc,order_money,pay_money,create_time,commission,bill_status,bill_end_time');
401
+                        $pdd_list = Db::name("order_pdd")
402
+                            ->where("order_sn",$value['order_sn'])
403
+                            ->field('order_pdd_id id,goods_id,goods_sign,order_sn,goods_num,goods_img,goods_name,goods_price,pin_order_status other_status,pin_order_status_desc other_status_desc,order_money,pay_money,create_time,commission,bill_status,bill_end_time')
404
+                            ->find();
402
                         if(!$pdd_list){
405
                         if(!$pdd_list){
403
                             unset($list[$k]);
406
                             unset($list[$k]);
404
                             continue;
407
                             continue;
@@ -429,7 +432,10 @@ class Other extends BaseController
429
                     ->order('bill_id', 'desc')
432
                     ->order('bill_id', 'desc')
430
                     ->page($page, $limit)->select()->toArray();
433
                     ->page($page, $limit)->select()->toArray();
431
                 foreach ($list as $k => &$value) {
434
                 foreach ($list as $k => &$value) {
432
-                        $vip_list = Db::name("order_vip")->where("order_sn",$value['order_sn'])->field('order_vip_id id,goods_id,order_sn,goods_count goods_num,goods_thumb goods_img,goods_name,order_status other_status_desc,order_time create_time,commission,bill_status,bill_end_time,pay_money');
435
+                        $vip_list = Db::name("order_vip")
436
+                            ->where("order_sn",$value['order_sn'])
437
+                            ->field('order_vip_id id,goods_id,order_sn,goods_count goods_num,goods_thumb goods_img,goods_name,order_status other_status_desc,order_time create_time,commission,bill_status,bill_end_time,pay_money')
438
+                            ->find();
433
                         if(!$vip_list){
439
                         if(!$vip_list){
434
                             unset($list[$k]);
440
                             unset($list[$k]);
435
                             continue;
441
                             continue;
@@ -460,7 +466,10 @@ class Other extends BaseController
460
                     ->order('bill_id', 'desc')
466
                     ->order('bill_id', 'desc')
461
                     ->page($page, $limit)->select()->toArray();
467
                     ->page($page, $limit)->select()->toArray();
462
                 foreach ($list as $k => &$value) {
468
                 foreach ($list as $k => &$value) {
463
-                        $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');
469
+                        $su_list = Db::name("order_su")
470
+                            ->where("order_sn",$value['order_sn'])
471
+                            ->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')
472
+                            ->find();
464
                         if(!$su_list){
473
                         if(!$su_list){
465
                             unset($list[$k]);
474
                             unset($list[$k]);
466
                             continue;
475
                             continue;
@@ -491,7 +500,10 @@ class Other extends BaseController
491
                     ->order('bill_id', 'desc')
500
                     ->order('bill_id', 'desc')
492
                     ->page($page, $limit)->select()->toArray();
501
                     ->page($page, $limit)->select()->toArray();
493
                 foreach ($list as $k => &$value) {
502
                 foreach ($list as $k => &$value) {
494
-                        $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');
503
+                        $tb_list = Db::name("order_tb")
504
+                            ->where("order_sn",$value['order_sn'])
505
+                            ->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')
506
+                            ->find();
495
                         if(!$tb_list){
507
                         if(!$tb_list){
496
                             unset($list[$k]);
508
                             unset($list[$k]);
497
                             continue;
509
                             continue;
@@ -530,7 +542,10 @@ class Other extends BaseController
530
                     ->order('bill_id', 'desc')
542
                     ->order('bill_id', 'desc')
531
                     ->page($page, $limit)->select()->toArray();
543
                     ->page($page, $limit)->select()->toArray();
532
                 foreach ($list as $k => &$value) {
544
                 foreach ($list as $k => &$value) {
533
-                        $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');
545
+                        $jd_list = Db::name("order_jd")
546
+                            ->where("order_sn",$value['order_sn'])
547
+                            ->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')
548
+                            ->find();
534
                         if(!$jd_list){
549
                         if(!$jd_list){
535
                             unset($list[$k]);
550
                             unset($list[$k]);
536
                             continue;
551
                             continue;
@@ -563,7 +578,10 @@ class Other extends BaseController
563
                     ->order('bill_id', 'desc')
578
                     ->order('bill_id', 'desc')
564
                     ->page($page, $limit)->select()->toArray();
579
                     ->page($page, $limit)->select()->toArray();
565
                 foreach ($list as $k => &$value) {
580
                 foreach ($list as $k => &$value) {
566
-                        $dy_list = Db::name("order_dy")->where("order_sn",$value['order_sn'])->field('order_dy_id id,product_id goods_id,order_sn,product_num goods_num,product_img goods_img,product_name goods_name,commission,total_pay_amount pay_money,bill_status,bill_end_time,create_time,flow_point status,pay_success_time')->find();
581
+                        $dy_list = Db::name("order_dy")
582
+                            ->where("order_sn",$value['order_sn'])
583
+                            ->field('order_dy_id id,product_id goods_id,order_sn,product_num goods_num,product_img goods_img,product_name goods_name,commission,total_pay_amount pay_money,bill_status,bill_end_time,create_time,flow_point status,pay_success_time')
584
+                            ->find();
567
                         if(!$dy_list){
585
                         if(!$dy_list){
568
                             unset($list[$k]);
586
                             unset($list[$k]);
569
                             continue;
587
                             continue;
@@ -596,7 +614,10 @@ class Other extends BaseController
596
                     ->order('bill_id', 'desc')
614
                     ->order('bill_id', 'desc')
597
                     ->page($page, $limit)->select()->toArray();
615
                     ->page($page, $limit)->select()->toArray();
598
                 foreach ($list as $k => &$value) {
616
                 foreach ($list as $k => &$value) {
599
-                    $huafei_list = Db::name("order_huafei")->where("order_sn",$value['order_sn'])->field('order_huafei_id id,order_sn,commission,amount_price pay_money,bill_status,bill_end_time,create_time,finish_time')->find();
617
+                    $huafei_list = Db::name("order_huafei")
618
+                        ->where("order_sn",$value['order_sn'])
619
+                        ->field('order_huafei_id id,order_sn,commission,amount_price pay_money,bill_status,bill_end_time,create_time,finish_time')
620
+                        ->find();
600
                     if(!$huafei_list){
621
                     if(!$huafei_list){
601
                         unset($list[$k]);
622
                         unset($list[$k]);
602
                         continue;
623
                         continue;