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

Merge pull request 'dev' (#388) from dev into main

Browse Source 
Reviewed-on: #388
This commit is contained in:
mkm 2024-12-13 17:28:26 +08:00
commit 0535d4513f
3 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/admin/lists/store_product/StoreProductLists.php
View File

@ -112,6 +112,9 @@ class StoreProductLists extends BaseAdminDataLists implements ListsSearchInterfa
case 5: case 5:
$item['product_type_name'] = '批发产品'; $item['product_type_name'] = '批发产品';
break; break;
case 6:
$item['product_type_name'] = '零采商品';
break;
default: default:
$item['product_type_name'] = '普通商品'; $item['product_type_name'] = '普通商品';
} }

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

@ -440,6 +440,7 @@ class BeforehandOrderLogic extends BaseLogic
$datas[$k]['product_id'] = $v['product_id']; $datas[$k]['product_id'] = $v['product_id'];
$datas[$k]['uid'] = $uid; $datas[$k]['uid'] = $uid;
$datas[$k]['cart_num'] = $v['cart_num']; $datas[$k]['cart_num'] = $v['cart_num'];
$datas[$k]['accept_num'] = $v['accept_num'];
$datas[$k]['purchase'] = $v['purchase']; $datas[$k]['purchase'] = $v['purchase'];
$datas[$k]['price'] = $v['price']; $datas[$k]['price'] = $v['price'];
$datas[$k]['total_price'] = $v['total_price']; $datas[$k]['total_price'] = $v['total_price'];

1
app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php
View File

@ -69,6 +69,7 @@ class BeforehandOrderCartInfoLogic extends BaseLogic
$datas[$k]['uid'] = $uid; $datas[$k]['uid'] = $uid;
$datas[$k]['bhoid'] = $bhoid; $datas[$k]['bhoid'] = $bhoid;
$datas[$k]['cart_num'] = $v['nums']; $datas[$k]['cart_num'] = $v['nums'];
$datas[$k]['accept_num'] = $v['nums'];
$datas[$k]['price'] = $v['purchase']; $datas[$k]['price'] = $v['purchase'];
$datas[$k]['total_price'] = $v['total_price']; $datas[$k]['total_price'] = $v['total_price'];
$datas[$k]['pay_price'] = $v['total_price']; $datas[$k]['pay_price'] = $v['total_price'];