|
@@ -236,11 +236,10 @@ class After extends \app\BaseController
|
|
|
if(empty($info)){
|
|
|
return error_show(1005,"未找到售后数据");
|
|
|
}
|
|
|
-
|
|
|
- $wsm_code = isset($this->post['wsm_code']) && $this->post['wsm_code']!="" ? trim($this->post['wsm_code']):"";
|
|
|
- if($wsm_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不能为空");
|
|
|
- }
|
|
|
+ }
|
|
|
if($info['is_th']==0&&$info['order_type']==1) {
|
|
|
$wsm = Db::name("warehouse_info")->where(["wsm_code" => $wsm_code])->find();
|
|
|
if (empty($wsm)) {
|
|
@@ -265,13 +264,14 @@ class After extends \app\BaseController
|
|
|
if($addr_code==''){
|
|
|
return error_show(1005,"参数 addr_code 不能为空");
|
|
|
}
|
|
|
- if(is_array($addr_code)){
|
|
|
- $addrs=[];
|
|
|
- $addrs['provice_code'] = $addr_code[0];
|
|
|
- $addrs['city_code'] = $addr_code[1];
|
|
|
- $addrs['area_code'] = $addr_code[2];
|
|
|
- $addr_code = json_encode($addrs);
|
|
|
- }
|
|
|
+
|
|
|
+ }
|
|
|
+ if($addr_code!==''&&is_array($addr_code)){
|
|
|
+ $addrs=[];
|
|
|
+ $addrs['provice_code'] = $addr_code[0];
|
|
|
+ $addrs['city_code'] = $addr_code[1];
|
|
|
+ $addrs['area_code'] = $addr_code[2];
|
|
|
+ $addr_code = json_encode($addrs);
|
|
|
}
|
|
|
Db::startTrans();
|
|
|
try{
|
|
@@ -304,7 +304,7 @@ class After extends \app\BaseController
|
|
|
}
|
|
|
}
|
|
|
Db::rollback();
|
|
|
- return error_show(1004,"更新失败");
|
|
|
+ return error_show(1004,"更新失败");
|
|
|
}catch (\Exception $e){
|
|
|
Db::rollback();
|
|
|
return error_show(1004,$e->getMessage());
|