df

app/admin/controller/After.php

@@ -76,8 +76,9 @@ class After extends \app\BaseController
                 "error_num"=>$num,
                 "error_img"=>$img,
                 "error_msg"=>$error['result'],
-                "error_remark"=>$remark,
+                "remark"=>$remark,
                 "except_code"=>$except_code,
+                "order_type"=>$order_type,
                 "status"=>0,
                 "is_del"=>0,
                 "addtime"=>date("Y-m-d H:i:s"),
@@ -149,11 +150,11 @@ class After extends \app\BaseController
         if($end!==""){
             $where[]=['a.addtime',"<=", $end];
         }
-        $count=Db::name("order_return")->alias("a")->leftJoin("order_returninfo b","a.orderCode=b.orderCode")->where
+        $count=Db::name("order_return")->alias("a")->leftJoin("order_returninfo b","a.orderCode=b.returnCode")->where
         ($where)->count();
         $total = ceil($count/$size);
         $page = $total>=$page ? $page :$total;
-        $list =Db::name("order_return")->alias("a")->leftJoin("order_returninfo b","a.orderCode=b.orderCode")->where($where)
+        $list =Db::name("order_return")->alias("a")->leftJoin("order_returninfo b","a.orderCode=b.returnCode")->where($where)
             ->field("a.*,b.return_wsm,b.contactor,b.mobile,b.addr,b.addr_code,b.post_code,b.post_company,b.post_fee,b.gys_remark")->page($page,$size)
             ->order("addtime desc")->select();
         $data=[];

app/admin/controller/Sale.php

@@ -332,12 +332,15 @@ public function info(){
             $addr=GetAddr($value['addr_code']);
             $value['addr_info'] = $addr;
             $value['addr_code'] = json_decode($value['addr_code'],true);
-            $send = Db::name("order_out")->where(['addrid'=>$id,'orderCode' => $einfo['orderCode']])->sum("send_num");
+
+            $send = Db::name("order_out")->where(['addrid'=>$value['id'],'orderCode' => $einfo['orderCode']])->sum("send_num");
+
             $value['send_num'] = $send ?? 0;
         }
         $value['wsend_num']=$value['receipt_quantity']-$value['send_num'];
         $addrs[]=$value;
     }
+
     //->field('num,sale_price,wsm_code,stock_id')
     $st = Db::name('sale_info')->where(['orderCode'=>$einfo['orderCode']])->select();
     $data=[];