in

app/admin/controller/After.php

@@ -265,22 +265,35 @@ class After extends \app\BaseController
         if(empty($info)){
             return error_show(1005,"未找到售后数据");
         }
+        $contactor = isset($this->post['contactor']) && $this->post['contactor']!="" ? trim($this->post['contactor']) :"";
+
+        $mobile = isset($this->post['mobile']) && $this->post['mobile']!="" ? trim($this->post['mobile']):"";
+
+        $addr = isset($this->post['addr']) && $this->post['addr']!="" ? trim($this->post['addr']):"";
+        $addr_code = isset($this->post['addr_code']) && $this->post['addr_code']!=""&&!empty($this->post['addr_code']) ?
+            $this->post['addr_code']:"";
         $wsm_code = isset($this->post['wsm_code']) && $this->post['wsm_code']!="" ? trim($this->post['wsm_code']):"";
         if($wsm_code==""){
                 return error_show(1005,"参数 wsm_code不能为空");
         }
+       // var_dump($contactor);
         if($info['is_th']==0&&$info['order_type']==1) {
             $wsm = Db::name("warehouse_info")->where(["wsm_code" => $wsm_code])->find();
             if (empty($wsm)) {
                 return error_show(1005, "未找到仓库数据");
             }
-        }
-        $contactor = isset($this->post['contactor']) && $this->post['contactor']!="" ? trim($this->post['contactor'])
-            :"";
-        $mobile = isset($this->post['mobile']) && $this->post['mobile']!="" ? trim($this->post['mobile']):"";
-        $addr = isset($this->post['addr']) && $this->post['addr']!="" ? trim($this->post['addr']):"";
-        $addr_code = isset($this->post['addr_code']) && $this->post['addr_code']!=""&&!empty($this->post['addr_code']) ?
-            $this->post['addr_code']:"";
+            $sm = Db::name("warehouse_addr")->where(["wsm_code" => $wsm_code,"is_del"=>0])->find();
+         // var_dump(Db::name("warehouse_addr")->getLastSql());
+            $contactor==""?(isset($sm['wsm_name']) ?  $contactor=$sm['wsm_name']:""):"";
+            $sm['wsm_name'] =isset($sm['wsm_name']) ? $sm['wsm_name']:"";
+            $mobile==""?(isset($sm['wsm_mobile']) ?  $mobile=$sm['wsm_mobile']:""):"";
+            $sm['wsm_mobile'] =isset($sm['wsm_mobile']) ? $sm['wsm_mobile']:"";
+            $addr==""?(isset($sm['wsm_addr']) ?  $addr=$sm['wsm_addr']:""):"";
+            $sm['wsm_addr'] =isset($sm['wsm_addr']) ? $sm['wsm_addr']:"";
+            $addr_code==""?(isset($sm['addr_code']) ?  $addr=$sm['addr_code']:""):"";
+            $sm['addr_code'] =isset($sm['addr_code']) ? $sm['addr_code']:"";
+        }
+        //var_dump($contactor);
         $remark = isset($this->post['remark']) && $this->post['remark']!="" ? trim($this->post['remark']):"";
         if($info['is_th']==1 && $info['order_type']==1){
             if($contactor==''){
@@ -312,6 +325,7 @@ class After extends \app\BaseController
             $info['updatetime']=date("Y-m-d H:i:s");
             $up =Db::name("order_return")->save($info);
             if($up){
+              //  var_dump($contactor);
                 $returninfo = Db::name("order_returninfo")->where(["returnCode"=>$bkcode])->find();
                 if(empty($returninfo)){
                     $returninfo=[
@@ -325,13 +339,15 @@ class After extends \app\BaseController
                     ];
                 }else{
                     $returninfo['return_wsm'] = $wsm_code;
-                    if($info['is_th']==1 && $info['order_type']==1) {
-                        $returninfo['contactor'] = $contactor;
-                        $returninfo['mobile'] = $mobile;
-                        $returninfo['addr'] = $addr;
-                        $returninfo['addr_code'] = $addr_code;
-                    }
+                    //if($info['is_th']==1 && $info['order_type']==1) {
+                    $contactor !==""? $returninfo['contactor'] = $contactor:"";
+                    $mobile!==""?$returninfo['mobile'] = $mobile:"";
+                    $addr!==""?  $returninfo['addr'] = $addr:"";
+                    $addr_code!==""?$returninfo['addr_code'] = $addr_code:"";
+                   // }
                 }
+//                var_dump($contactor);
+//                var_dump($returninfo);
                 $in=Db::name("order_returninfo")->save($returninfo);
                 if($in){
                     $order = ["order_code"=>$info['returnCode'],"status"=>$var,"action_remark"=>'',"action_type"=>"edit"];
@@ -570,8 +586,8 @@ class After extends \app\BaseController
                 $temp['contactor'] = isset($ware['wsm_name'])?$ware['wsm_name']:"";
                 $temp['mobile'] =isset($ware['wsm_mobile'])?$ware['wsm_mobile']:"";
                 $temp['addr'] =isset($ware['wsm_addr'])?$ware['wsm_addr']:"";
-                $temp['addr_cn'] =GetAddr( $ware['addr_code']);
                 $temp['addr_code'] = isset($ware['addr_code'])?$ware['addr_code']:"";
+                $temp['addr_cn'] =GetAddr( $ware['addr_code']);
                 $list[]=$temp;
             }else {
                 $returninfo = Db::name("order_returninfo")->where(["returnCode" => $bkcode])->find();