Merge branch 'master' into v1.9.0

feat/task1-c-wallet
devil 2020-05-15 10:24:15 +08:00
commit 1c1d3f5d71
3 changed files with 3 additions and 3 deletions

View File

@ -68,7 +68,7 @@ class PayLogService
*/
public static function PayLogTypeList($params = [])
{
$data = Db::name('PayLog')->field('payment AS id, payment_name AS name')->group('payment')->select();
$data = Db::name('PayLog')->field('any_value(payment) AS id, any_value(payment_name) AS name')->group('payment')->select();
return DataReturn('处理成功', 0, $data);
}

View File

@ -72,7 +72,7 @@ class RefundLogService
*/
public static function RefundLogTypeList($params = [])
{
$data = Db::name('RefundLog')->field('payment AS id, payment_name AS name')->group('payment')->select();
$data = Db::name('RefundLog')->field('any_value(payment) AS id, any_value(payment_name) AS name')->group('payment')->select();
return DataReturn('处理成功', 0, $data);
}

View File

@ -442,7 +442,7 @@ class StatisticalService
{
$data = [];
} else {
$data = Db::name('OrderDetail')->field('title AS name,sum(buy_number) AS value')->where('order_id', 'IN', $order_ids)->group('goods_id')->order('value desc')->limit(10)->select();
$data = Db::name('OrderDetail')->field('any_value(title) AS name,sum(buy_number) AS value')->where('order_id', 'IN', $order_ids)->group('goods_id')->order('value desc')->limit(10)->select();
}
if(!empty($data))