|
|
@@ -170,8 +170,11 @@ class StoreOrder extends BaseModel
|
|
|
case 'offline':
|
|
|
if ($item['offline_type'] == 0)
|
|
|
$item['pay_type_name'] = '现金支付';
|
|
|
- else
|
|
|
+ else if ($item['offline_type'] == 1)
|
|
|
$item['pay_type_name'] = '扫码支付';
|
|
|
+ else {
|
|
|
+ $item['pay_type_name'] = '智慧8度积分支付';
|
|
|
+ }
|
|
|
break;
|
|
|
case 'jialie':
|
|
|
$item['pay_type_name'] = '嘉联支付';
|
|
|
@@ -570,6 +573,9 @@ HTML;
|
|
|
case 5:
|
|
|
$model = $model->where($aler . 'pay_type', 'offline')->where('offline_type', 1);
|
|
|
break;
|
|
|
+ case 6:
|
|
|
+ $model = $model->where($aler . 'pay_type', 'offline')->where('offline_type', 2);
|
|
|
+ break;
|
|
|
case 4:
|
|
|
$model = $model->where($aler . 'pay_type', 'jialie');
|
|
|
break;
|
|
|
@@ -685,6 +691,13 @@ HTML;
|
|
|
'background_color' => 'layui-bg-blue',
|
|
|
'col' => 2
|
|
|
],
|
|
|
+ [
|
|
|
+ 'name' => '智慧8度积分支付金额',
|
|
|
+ 'field' => '元',
|
|
|
+ 'count' => $price['pay_price_offline_2'],
|
|
|
+ 'background_color' => 'layui-bg-blue',
|
|
|
+ 'col' => 2
|
|
|
+ ],
|
|
|
[
|
|
|
'name' => '门店扫码支付金额',
|
|
|
'field' => '元',
|
|
|
@@ -784,6 +797,7 @@ HTML;
|
|
|
}
|
|
|
}
|
|
|
$price['pay_price_offline_1'] = self::getOrderWhere($where, $model)->where($whereData)->where('pay_type', 'offline')->where('offline_type', 1)->sum('pay_price');
|
|
|
+ $price['pay_price_offline_2'] = self::getOrderWhere($where, $model)->where($whereData)->where('pay_type', 'offline')->where('offline_type', 2)->sum('pay_price');
|
|
|
// $price['pay_price_offline'] -= $price['pay_price_offline_1'];
|
|
|
$price['pay_price_offline'] = self::getOrderWhere($where, $model)->where($whereData)->where('pay_type', 'offline')->where('offline_type', 0)->sum('pay_price');
|
|
|
return $price;
|
|
|
@@ -1385,7 +1399,9 @@ HTML;
|
|
|
$jialie = self::getOrderWhere($where, new self)->count();
|
|
|
$where['pay_type'] = 5;
|
|
|
$scan = self::getOrderWhere($where, new self)->count();
|
|
|
+ $where['pay_type'] = 6;
|
|
|
+ $badu = self::getOrderWhere($where, new self)->count();
|
|
|
$offline = $cash + $scan;
|
|
|
- return compact('weixin', 'yue', 'offline', 'jialie', 'cash', 'scan');
|
|
|
+ return compact('weixin', 'yue', 'offline', 'jialie', 'cash', 'scan', 'badu');
|
|
|
}
|
|
|
}
|