mkm/multi-store
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
- 在订单列表中新增线上订单类型标识
- 修改订单创建逻辑，默认订单类型为线上订单
- 更新购物车信息列表，增加mark字段
- 调整采购产品报价逻辑，将notes字段改为mark字段
This commit is contained in:
mkm 2024-10-11 11:32:45 +08:00
parent 0218eb3d2e
commit c970b79178
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/admin/lists/beforehand_order/BeforehandOrderLists.php
View File

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

2
app/admin/lists/beforehand_order_cart_info/BeforehandOrderCartInfoLists.php
View File

@ -45,7 +45,7 @@ class BeforehandOrderCartInfoLists extends BaseAdminDataLists implements ListsSe
public function lists(): array public function lists(): array
{ {
return BeforehandOrderCartInfo::where($this->searchWhere) 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) ->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc']) ->order(['id' => 'desc'])
->select()->each(function($item){ ->select()->each(function($item){

2
app/admin/logic/beforehand_order/BeforehandOrderLogic.php
View File

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

4
app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php
View File

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