ad

app/admin/controller/AfterChild.php

@@ -182,7 +182,7 @@ class AfterChild extends Base
 
         $order_return = Db::name('order_return')
             ->alias('a')
-            ->field('a.id,a.good_code,a.good_name,c.sale_price,c.cat_id,a.apply_id,a.apply_name,a.outCode,b.orderCode,c.is_stock,c.order_type,a.status')
+            ->field('a.id,a.good_code,a.good_name,c.sale_price,c.cat_id,a.error_num,a.apply_id,a.apply_name,a.outCode,b.orderCode,c.is_stock,c.order_type,a.status')
             ->leftJoin('order_out b', 'b.outCode=a.outCode AND b.is_del=0')
             ->leftJoin('sale c', 'c.orderCode=b.orderCode AND c.is_del=0')
             ->where(['a.is_del' => 0, 'a.returnCode' => $param['returnCode']])
@@ -613,7 +613,7 @@ class AfterChild extends Base
                             "th_type" => 2,
                             "th_num" => $order_return['error_num'],
                             "th_fee" => round($order_return['error_num'] * $order_return['sale_price'], 2),
-                            "thCode" => $order_return['returnCode'],
+                            "thCode" => $param['returnCode'],
                             "spuCode" => $order_return['good_code'],
                             "good_name" => $order_return['good_name'],
                             "cat_id" => $order_return['cat_id'],

app/admin/controller/InterOrder.php

@@ -119,25 +119,33 @@ class InterOrder extends Base
       		"company"=>'',
       		"good_name"=>'',
       		"status"=>'',
+      		"use_type"=>'',
       		"page"=>1,
       		"size"=>10,
       		],"post","trim");
-      	$condition=[["is_del","=",0]];
+      	$condition=[["a.is_del","=",0]];
 		if($param['interNo']!=='')$condition[]=["interNo","like","%{$param['interNo']}%"];
 		if($param['supplier']!=='')$condition[]=["supplierNo|supplierName","like","%{$param['supplier']}%"];
 		if($param['customer']!=='')$condition[]=["customerNo|customerName","like","%{$param['customer']}%"];
 		if($param['company']!=='')$condition[]=["companyNo|companyName","like","%{$param['company']}%"];
 		if($param['good_name']!=='')$condition[]=["good_name","like","%{$param['good_name']}%"];
-		if($param['status']!=='')$condition[]=["status","=",$param['status']];
-		$count=Db::name("inter_order")->where($condition)->count();
+		if($param['status']!=='')$condition[]=["a.status","=",$param['status']];
+		if($param['use_type']!=='')$condition[]=["b.use_type","=",$param['use_type']];
+		$count=Db::name("inter_order")
+		->alias("a")
+		->leftJoin("platform","a.platform_id =b.id")
+		->where($condition)
+		->count();
 		$total=ceil($count/$param['size']);
 		$page=$param['page']>=$total ? $total:$param['page'];
 		$list = Db::name("inter_order")->where($condition)
-		->field("*,cat_id as cat_info")
+		->alias("a")
+		->leftJoin("platform","a.platform_id =b.id")
+		->field("a.*,cat_id as cat_info,b.platform_name,b.use_type")
 		->page(intval($page),intval($param['size']))
 		->withAttr("cat_info",function ($v){return made($v);})
 		->withAttr("good_unit",function ($v){return Db::name("unit")->where(["id"=>$v])->value("unit",'');})
-		->order("id desc")
+		->order("a.id desc")
 		->select();
 		return app_show(0,"获取成功",["list"=>$list,"count"=>$count]);
     }

app/admin/controller/OrderOutChild.php

@@ -590,7 +590,8 @@ class OrderOutChild extends Base
                     	'post_name' => $order_out[$child[$value['outChildCode']]['outCode']]['post_name'],
                         'post_code' => $order_out[$child[$value['outChildCode']]['outCode']]['post_code'],
                         'post_fee' => $order_out[$child[$value['outChildCode']]['outCode']]['post_fee'],
-                    	'updatetime' => $date
+                    	'updatetime' => $date,
+                    	'sendtime' => $date
                     	 ]);
 
                 $sale[$child[$value['outChildCode']]['orderCode']]['send_num'] += $child[$value['outChildCode']]['num'];

app/admin/controller/ReorderChild.php

@@ -454,7 +454,7 @@ class ReorderChild extends Base
                                     'spuCode' => $spuCode,
                                     'addtime' => $date,
                                     'updatetime' => $date,
-                                    'status' => 0,
+//                                    'status' => 0,
                                     'is_stock' => 1,
                                     'status' => 7,
                                     'createrid' => 0,