|
|
@@ -39,16 +39,29 @@ class MerchantOfflineOrder extends BaseController
|
|
39
|
39
|
$where = $this->request->params(['keyword', 'date', 'status', 'mer_id']);
|
|
40
|
40
|
$is_excel = $this->request->param('is_excel', 0);
|
|
41
|
41
|
$data = $this->repository->getMerchantListAdmin($this->merId, $where, $page, $limit);
|
|
42
|
|
-
|
|
|
42
|
+ $list = $data['list'];
|
|
43
|
43
|
if($is_excel){
|
|
44
|
44
|
$arr = [];
|
|
45
|
|
- foreach ($data as $item){
|
|
|
45
|
+ foreach ($list as $item) {
|
|
46
|
46
|
switch ($item['status']) {
|
|
47
|
|
- case 0: $status = '待支付'; break;
|
|
48
|
|
- case 1: $status = '已支付'; break;
|
|
49
|
|
- case 2: $status = '申请退款'; break;
|
|
50
|
|
- case 3: $status = '退款完成'; break;
|
|
51
|
|
- case 5: $status = '已失效'; break;
|
|
|
47
|
+ case 0:
|
|
|
48
|
+ $status = '待支付';
|
|
|
49
|
+ break;
|
|
|
50
|
+ case 1:
|
|
|
51
|
+ $status = '已支付';
|
|
|
52
|
+ break;
|
|
|
53
|
+ case 2:
|
|
|
54
|
+ $status = '申请退款';
|
|
|
55
|
+ break;
|
|
|
56
|
+ case 3:
|
|
|
57
|
+ $status = '退款完成';
|
|
|
58
|
+ break;
|
|
|
59
|
+ case 5:
|
|
|
60
|
+ $status = '已失效';
|
|
|
61
|
+ break;
|
|
|
62
|
+ default:
|
|
|
63
|
+ $status = '未知';
|
|
|
64
|
+ break;
|
|
52
|
65
|
}
|
|
53
|
66
|
$arr[] = [
|
|
54
|
67
|
$item['id'],
|