|
|
@@ -163,8 +163,8 @@ class Model_logic_order extends Lin_Model {
|
|
|
}
|
|
|
|
|
|
//根据提交信息 校验一下快递是够满足对应条件
|
|
|
- public function checkEditExpress($post){
|
|
|
- $r = $this->checkServerType($post);
|
|
|
+ public function checkEditExpress($post,$extra_data =[]){
|
|
|
+ $r = $this->checkServerType($post,$extra_data);
|
|
|
if(!$r){
|
|
|
return [
|
|
|
'code'=>-1,
|
|
|
@@ -355,8 +355,8 @@ class Model_logic_order extends Lin_Model {
|
|
|
}
|
|
|
|
|
|
//根据提交信息 校验一下客户下单是否正确
|
|
|
- public function checkEditCustomer($post){
|
|
|
- $r = $this->checkServerType($post);
|
|
|
+ public function checkEditCustomer($post,$extra_data =[]){
|
|
|
+ $r = $this->checkServerType($post,$extra_data);
|
|
|
if(!$r){
|
|
|
return [
|
|
|
'code'=>-1,
|
|
|
@@ -920,12 +920,15 @@ class Model_logic_order extends Lin_Model {
|
|
|
/**
|
|
|
* 修改订单数据替换
|
|
|
*/
|
|
|
- public function checkServerType($post){
|
|
|
+ public function checkServerType($post,$extra_data){
|
|
|
//将快递类型和服务类型相互转化下
|
|
|
//如果没有服务类型的快递
|
|
|
//有服务类型的快递
|
|
|
// 31 fedex-杭州不报关
|
|
|
//如果上传阐述没有服务类型这一项就将其改为0
|
|
|
+ if($extra_data['plat'] =='fullordersmt'){
|
|
|
+ return true;
|
|
|
+ }
|
|
|
if(!isset($post['js'])){
|
|
|
$post['js'] = 0;
|
|
|
}
|