ad

app/admin/controller/After.php

@@ -1403,7 +1403,7 @@ class After extends Base
 //                        if ($info['return_tag'] == 1) {
                             $cgd_info = Db::name('order_num')
                                 ->alias('a')
-                                ->field('a.id,b.id cgd_id,b.good_price')
+                                ->field('a.id,b.id cgd_id,b.good_price,b.cgdNo')
                                 ->leftJoin('purchease_order b','b.cgdNo=a.cgdNo')
                                 ->where(['a.orderCode' => $info['orderCode']])
                                 ->findOrEmpty();
@@ -1433,6 +1433,7 @@ class After extends Base
                             'good_name' => $sale['good_name'],
                             'sale_price' => $sale['sale_price'],
                             'cgd_price' => $cgd_info['good_price'],
+                            'cgdNo' => $cgd_info['cgdNo'],
                             'cat_id' => $sale['cat_id'],
                             'apply_id' => $info['apply_id'],
                             'apply_name' => $info['apply_name'],

app/admin/controller/Reorder.php

@@ -1179,6 +1179,7 @@ class Reorder extends Base
 	                        'cat_id' => $orderinfo['cat_id'],
 	                        'sale_price' => $orderinfo['sale_price'],
                             'cgd_price' => $cgd['good_price'],
+                            'cgdNo' => $cgd['cgdNo'],
 	                        'apply_id' => $info['apply_id'],
 	                        'apply_name' => $info['apply_name'],
 	                        'addtime' => $date,

app/admin/listener/ThData.php

@@ -48,8 +48,9 @@ use app\admin\model\OrderReturn;use app\admin\model\SaleReturn;class ThData
     	    	"th_cgd_price"=>$event['sale_price'],
     	    	"th_sale_price"=>$event['cgd_price'],
     	    	"good_code"=>$info->good_code,
-    	    	"good_name"=>$info->good_code,
+    	    	"good_name"=>$info->good_name,
     	    	"orderCode"=>$info->orderCode,
+    	    	'cgdCode'=>$event['cgdNo'],
     	    	"apply_id"=>$info->apply_id,
     	    	"apply_name"=>$info->apply_name,
     	    ];
@@ -76,8 +77,9 @@ use app\admin\model\OrderReturn;use app\admin\model\SaleReturn;class ThData
     	    	'th_cgd_price'=>$event['sale_price'],
     	    	'th_sale_price'=>$event['cgd_price'],
     	    	'good_code'=>$info->good_code,
-    	    	'good_name'=>$info->good_code,
+    	    	'good_name'=>$info->good_name,
     	    	'orderCode'=>$info->orderCode,
+    	    	'cgdCode'=>$event['cgdNo'],
     	    	'apply_id'=>$info->apply_id,
     	    	'apply_name'=>$info->apply_name,
     	    ];