ad

app/admin/controller/Filing.php

@@ -664,15 +664,13 @@ class Filing extends Base
             "cat_id" => '',
             "supplierNo" => "",
             "cgd_tax" => "",
-            "pay_id" => "0",
+            "platform_id" => "0",
         ], "post", "trim");
 
         $valid = Validate::rule([
-//    		"sale_id|销售员"=>"require|number|gt:0",
             "companyNo|业务公司编号" => "require|max:255|min:1",
             "supplierNo|业务公司编号" => "require|max:255|min:1",
             "poCode|PO编号" => "require|max:255|min:1",
-//	 		"workCode|单据编号"=>"require|max:255|min:1",
             "khNo|客户公司编号" => "require|max:255|min:1",
             "qrdType|订单类型" => "require|number|in:1,2,3",
             "goodName|商品名称" => "require|max:255|min:1",
@@ -688,25 +686,35 @@ class Filing extends Base
             "sendtime|发货时间" => "require|date",
             "cat_id|商品分类id" => "require|number|gt:0",
             "cgd_tax|采购毛利率" => "require|float|gt:0",
-            "pay_id|支付渠道" => "require|number"
+            "platform_id|平台" => "require|number"
         ]);
         if ($valid->check($param) == false) return error_show(1004, $valid->getError());
         $qrdcode = makeNo("QR");
         $cgddcode = makeNo("CG");
         $goodCode = makeNo("SKU");
-        $customer = Db::name("customer_info")->where('companyNo', "=", $param['khNo'])->find();
-        if ($customer == false) return error_show(1004, "客户信息未找到");
-        $supplierName = Db::name("supplier")->where('code', "=", $param['supplierNo'])->value("name", "");
-        if ($supplierName == '') return error_show(1004, "供应商信息未找到");
-        $companyName = Db::name("supplier")->where('code', "=", $param['companyNo'])->value("name", "");
-        if ($companyName == '') return error_show(1004, "业务公司信息未找到");
-        if ($param['pay_id'] != 0) {
-            $payinfo = Db::name("pay")->where("id", $param['pay_id'])->findOrEmpty();
-            if (empty($payinfo)) return error_show(1004, "支付渠道信息未找到");
-            if ($payinfo['status'] != 1) return error_show(1004, "支付渠道已禁用");
-            $supplierArr = Db::name("pay_rate")->where(["pay_id" => $param['pay_id'], "status" => 1, "is_del" => 0])->column("companyNo");
-            if (in_array($param['companyNo'], $supplierArr)) return error_show(1004, "支付渠道含有该业务公司，支付渠道无法使用！");
-        }
+        $userCommon = new \app\admin\common\User();
+        $tmp = $userCommon->handle('getCodeAndName',['code'=>[$param['khNo'],$param['supplierNo'],$param['companyNo']]]);
+        if(!isset($tmp['code']) || $tmp['code']!=0) return json_show($tmp['code'],$tmp['message'],$tmp['data']);
+        if(!isset($tmp['data'][$param['khNo']])) return json_show(1004, "未找到客户数据");
+        if(!isset($tmp['data'][$param['supplierNo']])) return json_show(1004, "未找到平台供应商数据");
+        if(!isset($tmp['data'][$param['companyNo']])) return json_show(1004, "未找到平台业务公司数据");
+
+//        $customer = Db::name("customer_info")->where('companyNo', "=", $param['khNo'])->find();
+//        if ($customer == false) return error_show(1004, "客户信息未找到");
+//        $supplierName = Db::name("supplier")->where('code', "=", $param['supplierNo'])->value("name", "");
+//        if ($supplierName == '') return error_show(1004, "供应商信息未找到");
+//        $companyName = Db::name("supplier")->where('code', "=", $param['companyNo'])->value("name", "");
+//        if ($companyName == '') return error_show(1004, "业务公司信息未找到");
+//        if ($param['platform_id'] != 0) {
+            $payinfo = Db::name("platform")->where(["id"=> $param['platform_id'],"is_del"=>0])->findOrEmpty();
+            if (empty($payinfo)) return error_show(1004, "平台信息未找到");
+            if ($payinfo['status'] != 1) return error_show(1004, "平台信息已禁用");
+            if($payinfo['is_select_pay_rate']==1){
+	            $supplierArr = Db::name("platform_pay_rate")->where(["platform_id" => $param['platform_id'], "status" => 1, "is_del" => 0])->column("companyNo");
+	            if (in_array($param['companyNo'], $supplierArr)) return error_show(1004, "平台支付渠道含有该业务公司，平台无法使用！");
+            }
+
+//        }
         $param["cgd_tax"] = $param["cgd_tax"] / 100;
         $cgdPrice = round($param['goodPrice'] * (1 - $param['cgd_tax']), 2);
         $qrddata = [
@@ -715,7 +723,7 @@ class Filing extends Base
             "apply_name" => $this->uname,
             "order_type" => $param['qrdType'],
             "order_source" => 9,
-            "platform_id" => 0,
+            "platform_id" => $param['platform_id'],
             "good_code" => $goodCode,
             "skuCode" => '',
             "cat_id" => $param['cat_id'],
@@ -740,7 +748,7 @@ class Filing extends Base
             "send_type" => 1,
             "status" => 2,
             "is_del" => 0,
-            "pay_id" => $param['pay_id'],
+            "pay_id" => 0,
             "workNo" => $param['workCode'],
             "addtime" => date("Y-m-d H:i:s"),
             "updatetime" => date("Y-m-d H:i:s"),
@@ -770,7 +778,7 @@ class Filing extends Base
             "good_price" => $cgdPrice,
             "total_fee" => round($cgdPrice * $param['goodNum'], 2),
             "supplierNo" => $param['supplierNo'],
-            "supplier_name" => $supplierName,
+            "supplier_name" =>$tmp['data'][$param['supplierNo']],
             "companyNo" => $param['companyNo'],
             "send_status" => 3,
             "send_num" => $param['goodNum'],
@@ -793,6 +801,7 @@ class Filing extends Base
             "good_type" => 1,
             "moq" => 1,
             "customized" => 0,
+            "platform_id" => $param['platform_id'],
             "tax" => $param['tax'],
             "supplierNo" => $param['supplierNo'],
             "is_auth" => 1,
@@ -841,9 +850,9 @@ class Filing extends Base
             if ($qrd == false) throw new Exception("商品信息录入生成失败");
             $qrd = Db::name("order_addr")->insert($orderAddr);
             if ($qrd == false) throw new Exception("销售单地址生成失败");
-            if ($param['pay_id'] != 0) {
-                pay_log($param['pay_id'], $param['companyNo'], $qrdcode);
-            }
+//            if ($param['pay_id'] != 0) {
+//                pay_log($param['pay_id'], $param['companyNo'], $qrdcode);
+//            }
 
             Db::commit();
             return app_show(0, '订单生成成功');
@@ -914,10 +923,10 @@ class Filing extends Base
     {
         $param = $this->request->param([
             "orderCode" => "",
-            "companyNo" => '',
+//            "companyNo" => '',
             "poCode" => "",
             "workCode" => "",
-            "khNo" => "",
+//            "khNo" => "",
             "tax" => "",
             "goodUnit" => "",
             "mobile" => "",
@@ -950,12 +959,12 @@ class Filing extends Base
             "cgd_tax|采购毛利率" => "require|float|gt:0",
         ]);
         if ($valid->check($param) == false) return error_show(1004, $valid->getError());
-        $customer = Db::name("customer_info")->where('companyNo', "=", $param['khNo'])->find();
-        if ($customer == false) return error_show(1004, "客户信息未找到");
-        $supplierName = Db::name("supplier")->where('code', "=", $param['supplierNo'])->value("name", "");
-        if ($supplierName == '') return error_show(1004, "供应商信息未找到");
-        $companyName = Db::name("supplier")->where('code', "=", $param['companyNo'])->value("name", "");
-        if ($companyName == '') return error_show(1004, "业务公司信息未找到");
+        $userCommon = new \app\admin\common\User();
+        $tmp = $userCommon->handle('getCodeAndName',['code'=>$param['supplierNo']]);
+        if(!isset($tmp['code']) || $tmp['code']!=0) return json_show($tmp['code'],$tmp['message'],$tmp['data']);
+//        if(!isset($tmp['data'][$param['khNo']])) return json_show(1004, "未找到客户数据");
+        if(!isset($tmp['data'][$param['supplierNo']])) return json_show(1004, "未找到平台供应商数据");
+//        if(!isset($tmp['data'][$param['companyNo']])) return json_show(1004, "未找到平台业务公司数据");
         $param["cgd_tax"] = $param["cgd_tax"] / 100;
         $saleinfo = Db::name("sale")->where(["orderCode" => $param['orderCode']])->findOrEmpty();
         if (empty($saleinfo)) return error_show(1004, "销售单不存在");
@@ -971,11 +980,10 @@ class Filing extends Base
         $addr = Db::name("order_addr")->where(["orderCode" => $param['orderCode']])->findOrEmpty();
         if (empty($addr)) return error_show(1004, "地址信息不存在");
         $cgdPrice = round($saleinfo['sale_price'] * (1 - $param['cgd_tax']), 2);
-        if ($saleinfo['pay_id'] != 0) {
-            $supplierArr = Db::name("pay_rate")->where(["pay_id" => $saleinfo['pay_id'], "status" => 1, "is_del" => 0])->column("companyNo");
-            if (in_array($param['companyNo'], $supplierArr)) return error_show(1004, "支付渠道含有该业务公司，支付渠道无法使用！");
-
-        }
+//        if ($saleinfo['platform_id'] != 0) {
+//				$supplierArr = Db::name("platform_pay_rate")->where(["platform_id" => $param['platform_id'], "status" => 1, "is_del" => 0])->column("companyNo");
+//	            if (in_array($param['companyNo'], $supplierArr)) return error_show(1004, "平台支付渠道含有该业务公司，平台无法使用！");
+//        }
         $qrddata = [
             "origin_price" => $cgdPrice,
             "arrive_time" => $param['sendtime'],
@@ -993,7 +1001,7 @@ class Filing extends Base
             "good_price" => $cgdPrice,
             "total_fee" => round($cgdPrice * $saleinfo['good_num'], 2),
             "supplierNo" => $param['supplierNo'],
-            "supplier_name" => $supplierName,
+            "supplier_name" => $tmp['data'][$param['supplierNo']],
 //			"companyNo"=>$param['companyNo'],
             "updatetime" => date("Y-m-d H:i:s"),
         ];
@@ -1001,7 +1009,7 @@ class Filing extends Base
             "good_unit" => $param['goodUnit'],
             "tax" => $param['tax'],
             "supplierNo" => $param['supplierNo'],
-            "companyNo" => $param['companyNo'],
+//            "companyNo" => $param['companyNo'],
             "updatetime" => date("Y-m-d H:i:s"),
         ];
         $orderAddr = [
@@ -1010,7 +1018,7 @@ class Filing extends Base
             "contactor" => $param['contactor'],
             "mobile" => $param['mobile'],
             "arrive_time" => $param['sendtime'],
-            "customer_code" => $param['khNo'],
+//            "customer_code" => $param['khNo'],
             "updatetime" => date("Y-m-d H:i:s"),
         ];
         Db::startTrans();