orderType

app-hd/controllers/ConsoleController.php

@@ -54,7 +54,7 @@ class ConsoleController extends BaseController
         $admin = $this->admin;
         $subscribe = $admin['subscribe'] ?? 0;
         if ($subscribe == 0) {
-            $notice = array_merge($notice, [['title' => '开启提醒，批发店花材做特价及时通知您', 'action' => '开启', 'page' => '/pagesClient/official/warn']]);
+            //$notice = array_merge($notice, [['title' => '开启提醒，批发店花材做特价及时通知您', 'action' => '开启', 'page' => '/pagesClient/official/warn']]);
         }
 
         if (isset($this->shop) && !empty($this->shop)) {

biz-hd/purchase/services/PurchaseService.php

@@ -64,6 +64,7 @@ class PurchaseService extends BaseService
         $remark = $data['remark'] ?? '';
         $xj = $data['xj'] ?? '';
         $sendTimeWant = isset($data['sendTimeWant']) && !empty($data['sendTimeWant']) ? $data['sendTimeWant'] : date("Y-m-d");
+        $orderType = 2;
         $arr = [
             'product' => $product,
             'sjId' => $currentSjId,
@@ -95,6 +96,7 @@ class PurchaseService extends BaseService
             'xj' => $xj,
             'sendTimeWant' => $sendTimeWant,
             'discount' => $discount,
+            'orderType' => $orderType
         ];
         $result = OrderClass::addOrder($arr);
         $saleId = $result['id'] ?? 0;

common/components/dict.php

@@ -78,12 +78,12 @@ class dict
             'mall' => 3,//商城
             'kmGhs' => 4,//昆明供应商
         ],
-        //采购发起方，与ptStyle一致
+        //订单发起方，与ptStyle一致
         'cgStyle' => [
             'hd' => 1,//零售花店
             'ghs' => 2,//供应商
             'mall' => 3,//商城
-            'kmGhs' => 4,//昆明供应商
+            'kmGhs' => 4,//基地供应商
         ],
 
         //结帐方式