Pre Merge pull request !22 from elonfun/v6

This commit is contained in:
elonfun 2022-02-25 02:31:34 +00:00 committed by Gitee
commit 81934439e3

View File

@ -89,7 +89,11 @@ class Order extends Controller
UserAdminService::instance()->buildByUid($data); UserAdminService::instance()->buildByUid($data);
UserAdminService::instance()->buildByUid($data, 'puid1', 'from'); UserAdminService::instance()->buildByUid($data, 'puid1', 'from');
OrderService::instance()->buildData($data); OrderService::instance()->buildData($data);
foreach ($data as &$vo) $vo['payment_name'] = PaymentService::name($vo['payment_type']); foreach ($data as &$vo){
if (!is_null($vo['payment_type']) and ''!=$vo['payment_type']) {
$vo['payment_name'] = PaymentService::name($vo['payment_type']);
}
}
} }
/** /**