wugg 2 년 전
부모
커밋
ca7d5f7eeb
3개의 변경된 파일24개의 추가작업 그리고 27개의 파일을 삭제
  1. 16 19
      app/admin/controller/Sale.php
  2. 6 6
      app/command/ImportOrderFromCHandleData.php
  3. 2 2
      app/command/handleYzOrderData.php

+ 16 - 19
app/admin/controller/Sale.php

@@ -184,8 +184,8 @@ class Sale extends Base
             "gold_price" => isset($ct['cgd_gold_price']) ? $ct['cgd_gold_price'] : 0,
             "order_type" => $is_stock == 1 ? 1 : 2,
             "order_source" => 1,//1直接下单
-            "createrid" => $ct['createrid'],
-            "creater" => $ct['creater'],
+            "createrid" =>$supplier_info['personid'],
+            "creater" =>$supplier_info['person'],
             'send_way' => 2,
             'good_createrid' => $goodinfo['createrid'],
             'good_creater' => $goodinfo['creater'],//商品创建人
@@ -849,7 +849,10 @@ class Sale extends Base
             return error_show(1003, "业务公司数据未找到");
         }
         $remark = isset($this->post['remark']) && $this->post['remark'] != "" ? trim($this->post['remark']) : "";
-
+		 $supplier_temp_info=Db::name("supplier")
+                ->field('id,person,personid')
+                ->where(["code"=>$zxinfo['supplierNo']])
+                ->findOrEmpty();
         $orderCode = makeNo("QR");
         $spuCode = $zxinfo['spuCode'];
         $skuCode = "";
@@ -872,8 +875,8 @@ class Sale extends Base
             "nake_fee" => $zxinfo['nake_fee'],
             "delivery_fee" => $zxinfo['delivery_fee'],
             "good_num" => $good_num,
-            "createrid" => $zxinfo['createrid'],
-            "creater" => $zxinfo['creater'],
+            "createrid" =>$supplier_temp_info['personid'],
+            "creater" =>$supplier_temp_info['person'],
             "good_type" => 1,
             "weight" => $zxinfo['good_weight'],
             "gold_price" => $zxinfo['gold_price'],
@@ -932,10 +935,6 @@ class Sale extends Base
                     return error_show(1003, "咨询单更新业务公司失败");
                 }
             }
-            $supplier_temp_info=Db::name("supplier")
-                ->field('id,person,personid')
-                ->where(["code"=>$zxinfo['supplierNo']])
-                ->findOrEmpty();
 
             $data = [
                 "orderCode" => $orderCode,
@@ -1429,7 +1428,11 @@ class Sale extends Base
             return false;
         }
         $orderCode = makeNo("QR");
-        $cgd = [
+        $supplier_temp_info = Db::name('supplier')
+            ->field('id,person,personid')
+            ->where('code',$goodinfo['supplierNo'])
+            ->findOrEmpty();
+		 $cgd = [
             "supplierNo" => $goodinfo['supplierNo'],
             "companyNo" => $data['companyNo'],
             "spuCode" => $data['spuCode'],
@@ -1447,8 +1450,8 @@ class Sale extends Base
             "nake_fee" => $goodinfo['nake_fee'],
             "good_num" => $data['good_num'],
             "delivery_fee" => $goodinfo['delivery_fee'],
-            "createrid" => $goodinfo['createrid'],
-            "creater" => $goodinfo['creater'],
+            "createrid" =>$supplier_temp_info['personid'],
+            "creater" =>$supplier_temp_info['person'],
             "weight" => $goodinfo['good_weight'],
             "gold_price" => $goodinfo['gold_price'],
             "good_type" => 1,
@@ -1458,11 +1461,6 @@ class Sale extends Base
             'good_createrid' => $goodinfo['createrid'],
             'good_creater' => $goodinfo['creater'],//商品创建人
         ];
-        $supplier_temp_info = Db::name('supplier')
-            ->field('id,person,personid')
-            ->where('code',$goodinfo['supplierNo'])
-            ->findOrEmpty();
-
         $datas = [
             "orderCode" => $orderCode,
             "good_code" => $data['spuCode'],
@@ -3303,8 +3301,7 @@ class Sale extends Base
             // $where[]=["a.apply_id","in",$role['write']];
             $cgdArr =\think\facade\Config::get("app");
         	$cgdids =implode(",",$cgdArr['wsm_cgder_role']);
-            $condition .= " (b.is_stock=1 and {$this->roleid} in ($cgdids)) or (b.is_stock=0 and wpo.cgder_id = {$this->uid}) or a.apply_id in (" . implode(',',
-                    $role['write']) . ")";
+            $condition .= " (b.is_stock=1 and {$this->roleid} in ($cgdids)) or (b.is_stock=0 and wpo.cgder_id = {$this->uid}) or a.apply_id in (" . implode(',', $role['write']) . ")";
         }
 //        if(!empty($role['platform']) ){
 //            $where[]=["b.platform_id","in",$role['platform']];

+ 6 - 6
app/command/ImportOrderFromCHandleData.php

@@ -192,6 +192,10 @@ class ImportOrderFromCHandleData extends Command
                             //$sale_price = $act['activity_price'];//不能改动价格
                         }
                     }
+                     $supplier_temp_info = Db::name('supplier')
+                        ->field('id,person,personid')
+                        ->where('code', $ct['supplierNo'])
+                        ->findOrEmpty();
                     $cgd = [
                         "supplierNo" => $ct['supplierNo'],
                         "companyNo" => $supplierNo,
@@ -213,8 +217,8 @@ class ImportOrderFromCHandleData extends Command
                         "good_type" => $goodtype,
                         "order_type" => $order_type,
                         "order_source" => $order_source,
-                        "createrid" => $ct['createrid'],
-                        "creater" => $ct['creater'],
+                        "createrid" =>$supplier_temp_info['personid'],
+                         "creater" =>$supplier_temp_info['person'],
                         'send_way' => 2,
                         'gold_price' => $ct['cgd_gold_price'],
                         'good_createrid' => $goodinfo['createrid'],
@@ -227,10 +231,6 @@ class ImportOrderFromCHandleData extends Command
                     $rm = $c_data['createrid'];
                     $ri = $c_data['creater'];
 
-                    $supplier_temp_info = Db::name('supplier')
-                        ->field('id,person,personid')
-                        ->where('code', $ct['supplierNo'])
-                        ->findOrEmpty();
 
                     $data = [
                         "orderCode" => $orderCode,

+ 2 - 2
app/command/handleYzOrderData.php

@@ -345,8 +345,8 @@ class handleYzOrderData extends Command
                             "good_type" => $goodtype,
                             "order_type" => $order_type,
                             "order_source" => $order_source,
-                            "createrid" => $ct['createrid'],
-                            "creater" => $ct['creater'],
+                            "createrid" =>$supplier_temp_info['personid'],
+                             "creater" =>$supplier_temp_info['person'],
                             'send_way' => 2,
                             'gold_price' => $ct['cgd_gold_price'],
                             'good_createrid' => $goodinfo['createrid'],