Merge branch 'master-new-dev-wf' of wugg/phpstock into master-new

app/admin/controller/Consult.php

@@ -338,8 +338,11 @@ class Consult extends Base
         if($zxorder==false){
             return error_show(1004,"未找到咨询信息数据");
         }
-        $cat =Db::name("cat")->where(["id"=>$zxinfo['cat_id']])->find();
-        $budget = isset($cat['order_rate']) ? $cat['order_rate']:0;
+//        $cat =Db::name("cat")->where(["id"=>$zxinfo['cat_id']])->find();
+//        $budget = isset($cat['order_rate']) ? $cat['order_rate']:0;
+
+        $budget = get_budget($zxinfo['cat_id'], $zxorder['companyNo'], $zxorder['platform_code']);
+
         $zxinfo['can']= isset($zxinfo['cat_id']) && $zxinfo['cat_id'] !=0 ? made($zxinfo['cat_id'],[]):[];
         $zxinfo['khname']="";
         $zxinfo['original_price']=sprintf("%.2f",$zxinfo['budget_price']* (1 -$budget/100));
@@ -613,8 +616,7 @@ class Consult extends Base
                 }
 
                 //更新consule_order记录
-             $op = Db::name('consult_order')->where('zxNo',$zxinfo['zxNo'])->update(['endtime'=>$endtime,
-                    'updatetime'=>date('Y-m-d H:i:s')]);
+                $op = Db::name('consult_order')->where('zxNo',$zxinfo['zxNo'])->update(['endtime'=>$endtime, 'updatetime'=>date('Y-m-d H:i:s')]);
                 if($op==false){
                     Db::rollback();
                     return error_show(1004,'咨询单结束时间更新失败');
@@ -679,7 +681,7 @@ class Consult extends Base
                 "action_remark" => '',//备注
                 "action_type" => "status"//新建create，编辑edit，更改状态status
             ], "ZXD", $zxinfo['status'], $zxinfo);
-                        return app_show(0,"状态更新成功");
+            return app_show(0,"状态更新成功");
         }else{
             return error_show(1003,"状态更新失败");
         }
@@ -763,8 +765,8 @@ class Consult extends Base
         $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo'] != '' ? trim($this->post['relaComNo']) : "";
         if ($relaComNo == '') return error_show(1004, '关联公司不能为空');
 
-        $platform_id = isset($this->post['platform_id']) && $this->post['platform_id'] != '' ? intval($this->post['platform_id']) : 0;
-        if ($platform_id == 0) return error_show(1004, '平台id不能为空');
+//        $platform_id = isset($this->post['platform_id']) && $this->post['platform_id'] != '' ? intval($this->post['platform_id']) : 0;
+//        if ($platform_id == 0) return error_show(1004, '平台id不能为空');
 
 
 //        $token = isset($this->post['token'])&& $this->post['token']!='' ? trim($this->post['token']):"";
@@ -782,8 +784,7 @@ class Consult extends Base
 //        $catinfo = Db::name("cat")->where(["id"=>$cat_id])->find();
 
         //计算毛利率
-        $budget = get_budget($zxinfo['cat_id'],$relaComNo,$platform_id);
-
+        $budget = get_budget($zxinfo['cat_id'], $relaComNo, $zx['platform_code']);
 //        $budget = isset($catinfo['order_rate']) ? $catinfo['order_rate']/100:0;
 
         //部分参数的大小校验

app/admin/controller/Good.php

@@ -344,7 +344,7 @@ class Good extends Base
         }
         $plat =Db::name("platform")->where(["id"=>$good_platform['platform_code']])->find();
         $data['skuCode']=$good_platform['skuCode'];
-        $data['platform_code']=$good_platform['id'];
+        $data['platform_id']=$good_platform['platform_code'];
         $data['platform_code_en']=isset($plat['platform_code'])?$plat['platform_code']:"";
         $data['platform_name']=isset($plat['platform_name'])?$plat['platform_name']:"";
         $data['online_reason']=$good_platform['online_reason'];

app/admin/controller/Goodup.php

@@ -2352,7 +2352,7 @@ class Goodup extends Base
         $param = $this->request->only(['spuCode', 'min_num', 'platform_id', 'relaComNo'], 'post', 'trim');
 
         $val = Validate::rule([
-            'spuCode|商品成本编码' => 'require|length:18',
+            'spuCode|商品成本编码' => 'require',
             'min_num|起订量' => 'require|number|gt:0',
             'platform_id|上线平台ID' => 'require|number|gt:0',
             'relaComNo'=>'require'

app/admin/controller/Sale.php

@@ -36,18 +36,27 @@ class Sale extends Base
             return error_show(1002, "客户customer_code不能为空");
         }
 
-        $customer = Db::name("customer_info")->where(["companyNo" => $customer_code])->find();
-        if ($customer == false) {
-            return error_show(1004, "未找到客户数据");
-        }
+
+//        $customer = Db::name("customer_info")->where(["companyNo" => $customer_code])->find();
+//        if ($customer == false) {
+//            return error_show(1004, "未找到客户数据");
+//        }
         $supplierNo = isset($this->post['supplierNo']) && $this->post['supplierNo'] !== "" ? trim($this->post['supplierNo']) : "";
-        if ($supplierNo == "") {
-            return error_show(1002, "参数supplierNo不能为空");
-        }
-        $supplier = Db::name("business")->where(["companyNo" => $supplierNo])->find();
-        if ($supplier == false) {
-            return error_show(1004, "未找到平台供应商数据");
-        }
+//        if ($supplierNo == "") {
+//            return error_show(1002, "参数supplierNo不能为空");
+//        }
+//        $supplier = Db::name("business")->where(["companyNo" => $supplierNo])->find();
+//        if ($supplier == false) {
+//            return error_show(1004, "未找到平台供应商数据");
+//        }
+
+        $userCommon = new \app\admin\common\User();
+        $tmp = $userCommon->handle('getCodeAndName',['code'=>[$customer_code,$supplierNo]]);
+        if(!isset($tmp['code']) || $tmp['code']!=0) return json_show($tmp['code'],$tmp['message'],$tmp['data']);
+        if(!isset($tmp['data'][$customer_code])) return json_show(1004, "未找到客户数据");
+        if(!isset($tmp['data'][$supplierNo])) return json_show(1004, "未找到平台供应商数据");
+
+
         $goodtype = isset($this->post['goodtype']) && $this->post['goodtype'] !== "" ? intval($this->post['goodtype']) : "1";
         $order_type = isset($this->post['order_type']) && $this->post['order_type'] !== "" ? intval($this->post['order_type']) : "1";
         $sendtype = isset($this->post['sendtype']) && $this->post['sendtype'] !== "" ? intval($this->post['sendtype']) : "";
@@ -465,10 +474,10 @@ class Sale extends Base
                 Db::name('standing_book')->insert(array_merge($standing_book_da, ['addtime' => date('Y-m-d H:i:s'), 'updatetime' => date('Y-m-d H:i:s'), 'standBookNo' => makeNo('IO')]));
 
                 Db::commit();
-                return app_show(0, "咨询订单创建成功", ["order_code" => $orderCode]);
+                return app_show(0, "订单创建成功", ["order_code" => $orderCode]);
             }
             Db::rollback();
-            return error_show(1002, "咨询订单创建失败");
+            return error_show(1002, "订单创建失败");
         } catch (\Exception $e) {
             Db::rollback();
             return error_show(1005, $e->getMessage());

app/admin/model/OrderMsg.php

@@ -16,8 +16,7 @@ class OrderMsg extends Model
         $conf=Config::get("order");
         $order_type = $conf['order_type'];
         $order_status = $conf['order_status'][$msg['order_type']];
-        $content = $order_type[$msg['order_type']].':'.$msg['order_code']."状态由".$msg['action_name']."修改为"
-            .$order_status[$msg['action_process']];
+        $content = $order_type[$msg['order_type']].':'.$msg['order_code']."状态由".$msg['action_name']."修改为".$order_status[$msg['action_process']];
         $mguid =ProcessOrder::Where(["order_type"=>$msg['order_type'],'order_code'=>$msg['order_code']])->column('action_uid,action_name');
         if(!empty($mguid)){
             $data=[];