Browse Source

提交数据

lvhao 2 months ago
parent
commit
41b8264635
2 changed files with 9 additions and 39 deletions
  1. 0 5
      core/CoreApp/controllers/Fullorder.php
  2. 9 34
      core/CoreApp/models/Model_logic_order.php

+ 0 - 5
core/CoreApp/controllers/Fullorder.php

@@ -1802,11 +1802,6 @@ class Fullorder extends Start_Controller {
 			{
 				echo json_encode(array('msg'=>'非英国无法选择CNE和GES!','success'=>false));exit;
 			}
-			//减少代码复用吧
-			// $lo_ret = $this->logic_order->checkEditReadOnly($post);
-			// if($lo_ret['code'] != 1){
-			// 	echo json_encode(array('msg'=>$lo_ret['msg'],'success'=>false));exit;
-			// }
 			$express = $this->express->read($post['express']);
 			/**
 			if($express['ioss'] == 1 && $post['ioss'] == '')

+ 9 - 34
core/CoreApp/models/Model_logic_order.php

@@ -270,6 +270,14 @@ class Model_logic_order extends Lin_Model {
                 "msg"=>"此快递方式不能美仓发货!"
             ];
         }
+        if($post['express'] == 2 && strlen($post['zipcode']) != 5)//如果usps 邮编不是5位
+        {
+            return [
+                'code'=>-1,
+                "msg"=>"USPS-USA的邮编需按5位数格式提交!"
+            ];
+        }
+
         return [
             'code'=>1,
             "msg"=>"ok"
@@ -298,38 +306,5 @@ class Model_logic_order extends Lin_Model {
             return false;
         }
     }
-    /**
-     * 解决readonly的验证和edit的验证记录不一致的问题
-     */
-    public function checkEditReadOnly($post){
-        if($post['type'] != 5 && in_array($post['express'],[2,63,64]))
-        {
-            return [
-                'code'=>-1,
-                "msg"=>"此快递方式必须从美仓发货!"
-            ];
-        }
-
-        if($post['type'] == 5 && !in_array($post['express'],[2,63,64]))
-        {
-            return [
-                'code'=>-1,
-                "msg"=>"此快递方式不能美仓发货!"
-            ];
-        }
-        
-        if($post['express'] == 2 && strlen($post['zipcode']) != 5)//如果usps 邮编不是5位
-        {
-            return [
-                'code'=>-1,
-                "msg"=>"USPS-USA的邮编需按5位数格式提交!"
-            ];
-        }
-
-        return [
-            'code'=>1,
-            "msg"=>"ok"
-        ];
-
-    }
+   
 }