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

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

Browse Source 
Reviewed-on: #355
This commit is contained in:
mkm 2024-11-21 16:47:58 +08:00
commit 1e7dd22620
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/admin/logic/user/UserLogic.php
View File

@ -296,7 +296,7 @@ class UserLogic extends BaseLogic
->order('id', 'desc')
->select()->toArray();
foreach ($data as &$value) {
if ($value['category'] == 'user_order_purchase_pay') {
if (in_array($value['category'],['user_order_purchase_pay','purchase_refund'])) {
$value['order_sn'] = StoreOrder::where('id', $value['link_id'])->value('order_id');
} elseif ($value['category'] == 'user_balance_recharge') {
$value['order_sn'] = UserRecharge::where('id', $value['link_id'])->value('order_id');

3
app/admin/logic/warehouse_order/WarehouseOrderLogic.php
View File

@ -96,10 +96,11 @@ class WarehouseOrderLogic extends BaseLogic
try {
foreach ($params['product_arr'] as $k => $v) {
$data['order_type'] = $order_type;
$data['supplier_id'] = $v['supplier_id']??0;
$data['pay_type'] = $v['pay_type']??0;
$data['admin_id'] = $params['admin_id'];
$data['store_id'] = $find['store_id'];
$data['oid'] = $find['id'];
$data['supplier_id'] = $find['supplier_id'];
$data['warehouse_id'] = $find['warehouse_id'];
$data['code'] = $find['code'];
$data['product_id'] = $v['id'];