ad

app/admin/controller/Filing.php

@@ -680,6 +680,7 @@ class Filing extends Base
             "tax" => "",
             "goodNum" => "",
             "goodPrice" => "",
+            "sale_total" => "",
             "goodUnit" => "",
             "mobile" => "",
             "addr" => "",
@@ -689,6 +690,7 @@ class Filing extends Base
             "cat_id" => '',
             "supplierNo" => "",
             "cgdPrice" => "",
+            "cgd_total" => "",
             "platform_id" => "0",
         ], "post", "trim");
 
@@ -702,13 +704,15 @@ class Filing extends Base
             "goodUnit|商品单位" => "require|number|gt:0",
             "tax|税率" => "require|number|gt:0",
             "goodNum|商品数量" => "require|number|gt:0",
-            "goodPrice|商品单价" => "require|float|gt:0",
+            "sale_total|销售总额" => "require|float|gt:0",
+            "cgd_total|采购总额" => "require|float|gt:0",
+//            "goodPrice|商品单价" => "require|float|gt:0",
             "mobile|联系人电话" => "require|number|mobile",
             "contactor|联系人" => "require|max:255|min:1",
             "addr|收货地址" => "require|max:255|min:1",
             "sendtime|发货时间" => "require|date",
             "cat_id|商品分类id" => "require|number|gt:0",
-            "cgdPrice|采购单价" => "require|float|gt:0",
+//            "cgdPrice|采购单价" => "require|float|gt:0",
             "platform_id|平台" => "require|number"
         ]);
         if ($valid->check($param) == false) return error_show(1004, $valid->getError());
@@ -725,15 +729,14 @@ class Filing extends Base
             $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, "平台信息已禁用");
-
-//	            $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, "平台支付渠道含有该业务公司，平台无法使用！");
-	             if($payinfo['is_select_pay_rate']==1 && channel_is_company($param['platform_id'],$param['companyNo']))return error_show(1004, "平台渠道包含当前业务公司 {$tmp['data'][$param['companyNo']]}");
+            if($payinfo['is_select_pay_rate']==1 && channel_is_company($param['platform_id'],$param['companyNo']))return error_show(1004, "平台渠道包含当前业务公司 {$tmp['data'][$param['companyNo']]}");
 
 		$supplierinfo = $userCommon->handle("hqInfo",["code"=>$param['supplierNo']]);
 		if(!isset($supplierinfo['data'])|| empty($supplierinfo['data'])) return json_show(1004, "未找到供应商公司数据");
 		$person =$supplierinfo['data']['child']??["person"=>'',"person_id"=>0];
 		 if($param['companyNo']== $supplierinfo['data']['relation_code']) return json_show(1004,'供应商和业务公司不能为同一家公司');
+		 $cgdprice = round($param['cgd_total']/$param['goodNum'],2);
+		 $saleprice = round($param['sale_total']/$param['goodNum'],2);
         $qrddata = [
             "orderCode" => $qrdcode,
             "apply_id" => $this->uid,
@@ -747,9 +750,9 @@ class Filing extends Base
             "good_name" => $param['goodName'],
             "good_num" => $param['goodNum'],
             "good_type" => 1,
-            "origin_price" => $param['cgdPrice'],
-            "sale_price" => $param['goodPrice'],
-            "total_price" => round($param['goodPrice'] * $param['goodNum'], 2),
+            "origin_price" => $cgdprice,
+            "sale_price" => $saleprice,
+            "total_price" =>$param['sale_total'],
             "post_fee" => 0,
             "is_diff" => 0,
             "is_activity" => 0,
@@ -796,8 +799,8 @@ class Filing extends Base
             "spuCode" => $goodCode,
             "good_name" => $param['goodName'],
             "good_num" => $param['goodNum'],
-            "good_price" => $param['cgdPrice'],
-            "total_fee" => round($param['cgdPrice'] * $param['goodNum'], 2),
+            "good_price" => $cgdprice,
+            "total_fee" => $param['cgd_total'],
             "supplierNo" => $param['supplierNo'],
             "supplier_name" =>$tmp['data'][$param['supplierNo']],
             "companyNo" => $param['companyNo'],
@@ -927,6 +930,7 @@ class Filing extends Base
             "unitName" => Db::name("unit")->where(["id" => $goodinfo['good_unit']])->value("unit", ""),
             "goodNum" => $saleinfo['good_num'],
             "goodPrice" => $saleinfo['sale_price'],
+            "sale_total" => $saleinfo['total_price'],
             "mobile" => $addr['mobile'],
             "addr" => $addr['addr'],
             "addr_cn" => GetAddr(json_encode($addinfo)),
@@ -939,8 +943,9 @@ class Filing extends Base
             "cat_name" => Db::name("cat")->where(["id" => $saleinfo['cat_id']])->value("cat_name", ''),
             "supplierNo" => $cgd['supplierNo'],
             "supplierNanme" => $cgd['supplier_name'],
-            "cgd_tax" => round(($saleinfo['sale_price'] - $saleinfo['origin_price']) / $saleinfo['sale_price'], 4) * 100,
+            "cgd_tax" => round((1 -  $cgd['total_fee']/ $saleinfo['total_price']), 4) * 100,
             "cgdPrice" => $saleinfo['origin_price'],
+            "cgd_total" => $cgd['total_fee'],
             "pay_id" => $saleinfo['pay_id'],
             "pay_name" =>$platform['pay_title']??"",
         ];
@@ -961,7 +966,8 @@ class Filing extends Base
             "contactor" => "",
             "sendtime" => "",
             "supplierNo" => "",
-            "cgdPrice" => ""
+            "cgd_total" => "",
+//            "sale_total" => "",
         ], "post", "trim");
 
         $valid = Validate::rule([
@@ -974,7 +980,8 @@ class Filing extends Base
             "addr|收货地址" => "require|max:255|min:1",
             "sendtime|发货时间" => "require|date",
             "tax|商品利率" => "require|number",
-            "cgdPrice|采购单价" => "require|float|gt:0",
+            "cgd_total|采购总额" => "require|float|gt:0",
+//            "sale_total|销售总额" => "require|float|gt:0",
         ]);
         if ($valid->check($param) == false) return error_show(1004, $valid->getError());
         $saleinfo = Db::name("sale")->where(["orderCode" => $param['orderCode']])->findOrEmpty();
@@ -992,7 +999,8 @@ class Filing extends Base
         if (empty($good)) return error_show(1004, "商品信息不存在");
         $addr = Db::name("order_addr")->where(["orderCode" => $param['orderCode']])->findOrEmpty();
         if (empty($addr)) return error_show(1004, "地址信息不存在");
-        $cgdPrice = $param['cgdPrice'];
+        $cgdPrice = round($param['cgd_total']/$saleinfo['good_num'],2);
+//        $salePrice = round($param['sale_total']/$saleinfo['good_num'],2);
 		$supplierinfo = $userCommon->handle("hqInfo",["code"=>$param['supplierNo']]);
 		if(!isset($supplierinfo['data'])|| empty($supplierinfo['data'])) return json_show(1004, "未找到供应商公司数据");
 		$person =$supplierinfo['data']['child']??["person"=>'',"person_id"=>0];
@@ -1010,7 +1018,7 @@ class Filing extends Base
             "cgder_id" => $person['personid'],
             'cgder' => $person['person'],
             "good_price" => $cgdPrice,
-            "total_fee" => round($cgdPrice * $saleinfo['good_num'], 2),
+            "total_fee" => $param['cgd_total'],
             "supplierNo" => $param['supplierNo'],
             "supplier_name" => $supplierinfo['data']['name'],
 //			"companyNo"=>$param['companyNo'],

app/admin/controller/InterOrder.php

@@ -48,8 +48,8 @@ class InterOrder extends Base
 			"good_unit|商品单位"=>"require|max:255|min:1",
 			"good_tax|商品税率"=>"require|float",
 			"good_num|商品数量"=>"require|number|gt:0",
-			"sale_price|销售总价"=>"require|float|gt:0",
-			"cgd_price|采购总价"=>"require|float|gt:0",
+			"sale_total|销售总价"=>"require|float|gt:0",
+			"cgd_total|采购总价"=>"require|float|gt:0",
 			"contactor|收货联系人"=>"require|max:255|min:1",
 			"mobile|收货联系方式"=>"require|max:255|min:1",
 			"addr|收货地址"=>"require|max:255|min:1",