|
|
@@ -4648,6 +4648,8 @@ class StoreOrderRepository extends BaseRepository
|
|
4648
|
4648
|
return $query->field('mer_id,mer_name');
|
|
4649
|
4649
|
}, 'verifyService' => function ($query) {
|
|
4650
|
4650
|
return $query->field('service_id,nickname');
|
|
|
4651
|
+ }, 'user' => function ($query) {
|
|
|
4652
|
+ return $query->field('uid,phone,nickname');
|
|
4651
|
4653
|
}
|
|
4652
|
4654
|
]);
|
|
4653
|
4655
|
$count = $query->where('test_order', 0)->count();
|
|
|
@@ -4661,6 +4663,10 @@ class StoreOrderRepository extends BaseRepository
|
|
4661
|
4663
|
$banclPay = $query->where($this->getOrderType($status))->where('test_order', 0)->where('paid', 1)->where('pay_type', 0)->field('sum(pay_price) as pay_price')->find();
|
|
4662
|
4664
|
$wechatpay = $query->where($this->getOrderType($status))->where('test_order', 0)->where('paid', 1)->where('pay_type', '<>', 0)->field('sum(pay_price) as pay_price')->find();
|
|
4663
|
4665
|
|
|
|
4666
|
+ foreach ($list as $key=>$item) {
|
|
|
4667
|
+ $list[$key]['fzone_paytype'] = json_decode($item['fzone_paytype'], true);
|
|
|
4668
|
+ }
|
|
|
4669
|
+
|
|
4664
|
4670
|
$stat = [
|
|
4665
|
4671
|
[
|
|
4666
|
4672
|
'className' => 'el-icon-s-goods',
|