github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2026-10-29 14:01:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

【程序目录】优化查询

Browse Source
This commit is contained in:
吴昊天 2023-02-16 18:50:32 +08:00
parent 2692263241
commit e6e0289a57
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
crmeb/app/adminapi/controller/v1/order/StoreOrder.php
View File

@ -81,6 +81,7 @@ class StoreOrder extends AuthController
]);
$where['is_system_del'] = 0;
$where['pid'] = 0;
if ($where['status'] == 1) $where = $where + ['shipping_type' => 1];
return app('json')->success($this->services->getOrderList($where, ['*'], ['split' => function ($query) {
$query->field('id,pid');
}, 'pink', 'invoice', 'division']));

2
crmeb/app/services/agent/AgentManageServices.php
View File

@ -66,7 +66,7 @@ class AgentManageServices extends BaseServices
$item['new_money'] = bcsub((string)$item['brokerage_price'], (string)$item['broken_commission'], 2);
else
$item['new_money'] = 0;
$item['brokerage_money'] = $item['brokerage_price'];
$item['brokerage_money'] = bcadd((string)$item['brokerage_price'], (string)$item['extract_count_price'], 2);
unset($item['extract'], $item['order'], $item['bill'], $item['spreadUser'], $item['spreadCount']);
if (strpos($item['headimgurl'], '/statics/system_images/') !== false) {
$item['headimgurl'] = set_file_url($item['headimgurl']);

4
crmeb/app/services/order/StoreOrderRefundServices.php
View File

@ -274,10 +274,10 @@ class StoreOrderRefundServices extends BaseServices
return $splitOrderInfo;
});
//处理开票
app()->make(StoreOrderInvoiceServices::class)->update(['order_id' => $order['id']], ['is_refund' => 1]);
//订单退款记录
ProductLogJob::dispatch(['refund', ['uid' => $order['uid'], 'order_id' => $order['id']]]);
//订单同意退款事件
event('order.refund', [$refundData, $order, 'order_refund']);
event('notice.notice', [['data' => $refundData, 'order' => $order], 'order_refund']);
return true;
}

2
crmeb/app/services/user/UserBillServices.php
View File

@ -780,7 +780,7 @@ class UserBillServices extends BaseServices
$userExtract = app()->make(UserExtractServices::class);
$extractSumList = $userExtract->getUsersSumList($uids);
foreach ($list as &$item) {
$item['sum_number'] = $item['income'] > $item['pay'] ? bcsub($item['income'], $item['pay'], 2) : 0;
$item['sum_number'] = $item['income'];
$item['nickname'] = $item['nickname'] . "|" . ($item['phone'] ? $item['phone'] . "|" : '') . $item['uid'];
$item['extract_price'] = $extractSumList[$item['uid']] ?? 0;
$item['time'] = $item['time'] ? date('Y-m-d H:i:s', $item['time']) : '';