订单模块增加线上订单类型

- 在订单列表中新增线上订单类型标识
- 修改订单创建逻辑，默认订单类型为线上订单
- 更新购物车信息列表，增加mark字段
- 调整采购产品报价逻辑，将notes字段改为mark字段

app/admin/lists/beforehand_order/BeforehandOrderLists.php

@@ -53,11 +53,13 @@ class BeforehandOrderLists extends BaseAdminDataLists implements ListsSearchInte
                     $item->admin_name='';
                 }
                 if($item->order_type==1){
-                    $item->order_type_name='普通订单';
+                    $item->order_type_name='铺货订单';
                 }elseif($item->order_type==2){
                     $item->order_type_name='商贩订单';
                 }elseif($item->order_type==3){
                     $item->order_type_name='一条龙订单';
+                }elseif($item->order_type==4){
+                    $item->order_type_name='线上订单';
                 }
             })
             ->toArray();

app/admin/lists/beforehand_order_cart_info/BeforehandOrderCartInfoLists.php

@@ -45,7 +45,7 @@ class BeforehandOrderCartInfoLists extends BaseAdminDataLists implements ListsSe
     public function lists(): array
     {
         return BeforehandOrderCartInfo::where($this->searchWhere)
-            ->field(['id', 'bhoid', 'uid', 'is_buyer','buyer_uid','product_id', 'attr_value_id', 'is_pay', 'purchase', 'price', 'total_price', 'cart_num'])
+            ->field(['id', 'bhoid', 'uid', 'is_buyer','buyer_uid','product_id', 'attr_value_id', 'is_pay', 'purchase', 'price', 'total_price', 'cart_num','mark'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()->each(function($item){

app/admin/logic/beforehand_order/BeforehandOrderLogic.php

@@ -67,7 +67,7 @@ class BeforehandOrderLogic extends BaseLogic
                 'deduction_price' => 0,
                 'paid' => 0,
                 'mark' => $params['mark'] ?? '',
-                'order_type' => $params['order_type'] ?? 0
+                'order_type' => $params['order_type'] ?? 4
             ]);
             foreach ($datas as $k => $v) {
                 $datas[$k]['bhoid'] = $order['id'];

app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php

@@ -36,7 +36,7 @@ class PurchaseProductOfferLogic extends BaseLogic
                 'unit' => $params['unit'],
                 'is_buyer' => $params['is_buyer'],
                 'need_num' => $params['need_num'],
-                'notes' => $params['notes'] ?? '',
+                'mark' => $params['mark'] ?? '',
                 'buyer_id' => $params['buyer_id'],
                 'status' => 0,
 
@@ -74,7 +74,7 @@ class PurchaseProductOfferLogic extends BaseLogic
                 'is_storage' => $params['is_storage'],
                 'is_stream' => $params['is_stream'],
                 'need_num' => $params['need_num'],
-                'notes' => $params['notes'],
+                'mark' => $params['mark'],
                 'buyer_id' => $params['buyer_id'],
                 'status' => $params['status'],
                 'stream_admin_id' => $params['stream_admin_id'],