diff --git a/app/admin/logic/user/UserLogic.php b/app/admin/logic/user/UserLogic.php index 577c8f7ec..5638c46ae 100644 --- a/app/admin/logic/user/UserLogic.php +++ b/app/admin/logic/user/UserLogic.php @@ -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'); diff --git a/app/admin/logic/warehouse_order/WarehouseOrderLogic.php b/app/admin/logic/warehouse_order/WarehouseOrderLogic.php index 91144e113..f2e976072 100644 --- a/app/admin/logic/warehouse_order/WarehouseOrderLogic.php +++ b/app/admin/logic/warehouse_order/WarehouseOrderLogic.php @@ -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'];