diff --git a/app/admin/controller/Order.php b/app/admin/controller/Order.php index 1a73d02..1e5f024 100755 --- a/app/admin/controller/Order.php +++ b/app/admin/controller/Order.php @@ -287,19 +287,27 @@ class Order extends Base $field = '*'; $order = 'id desc'; $all_goodslist_money = 0; + + // 获取测试用户ID列表 + $userList = User::where('istest', 1)->column('id'); + // 订单筛选条件 + $data = OrderListSend::getList($whe, $field, $order, $this->page); - $all_goodslist_money_sum = OrderList::where('status', '=',2)->where($whe1)->sum('goodslist_money'); + $all_goodslist_money_sum = OrderList::where('status', '=', 2)->where($whe1)->sum('goodslist_money'); + $whe1[] = ['user_id', 'not in', $userList]; + $all_goodslist_money_sum1 = OrderList::where('status', '=', 2)->where($whe1)->sum('goodslist_money'); foreach ($data['list'] as &$value) { - $user_info = User::field('nickname,headimg,mobile')->where(['id' => $value['user_id']])->find(); + $user_info = User::field('nickname,headimg,mobile,istest')->where(['id' => $value['user_id']])->find(); if ($user_info) { $value['nickname'] = $user_info['nickname']; $value['headimg'] = $user_info['headimg']; $value['mobile'] = $user_info['mobile']; + $value['istest'] = $user_info['istest']; } else { $value['nickname'] = ''; $value['headimg'] = ''; $value['mobile'] = ''; - + $value['istest'] = ''; } $goodslist_money = OrderList::where('send_num', '=', $value['send_num'])->sum('goodslist_money'); $value['goodslist_money'] = $goodslist_money; @@ -311,7 +319,7 @@ class Order extends Base View::assign('user_id', $user_id ? $user_id : 0); View::assign('mobile', $mobile ? $mobile : 0); View::assign('send_num', $send_num ? $send_num : 0); - + View::assign('all_goodslist_money_sum1', $all_goodslist_money_sum1 ? $all_goodslist_money_sum1 : 0); View::assign('all_goodslist_money_sum', $all_goodslist_money_sum ? $all_goodslist_money_sum : 0); View::assign('all_goodslist_money', $all_goodslist_money ? $all_goodslist_money : 0); View::assign('status', $status ? $status : 0); diff --git a/app/admin/view/Order/send_order.html b/app/admin/view/Order/send_order.html index 4c2dae0..09beac6 100755 --- a/app/admin/view/Order/send_order.html +++ b/app/admin/view/Order/send_order.html @@ -1,171 +1,188 @@ {include file="Public:header2"/} -
-
-
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
- -
-
-
- -
- -
- 导出订单 - 共有数据： {$count}条,全部价值：{$all_goodslist_money_sum},本页总发货价值：{$all_goodslist_money} -
- - - - - - - - - - - - - - - - - {volist name="list" id="vo"} - - - - - - - - - - - - {/volist} + +
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+ +
+ + - {if condition="empty($list)"} - - {/if} - -
用户信息订单号发货数量/总价格运费收货信息订单状态申请时间备注操作
-
-
-
-

UID：{$vo['user_id']+1260}

-

{$vo['mobile']}

-

{$vo['nickname']}

-
+
+
+
+
+
+
+
-
{$vo.send_num}{$vo.count} / {$vo['goodslist_money']}{$vo.freight} -

{$vo['name']} {$vo['mobile']}

-

{$vo['address']}

- 		- {if $vo['status'] eq 1 /} - - {elseif $vo['status'] eq 2 /} - - {elseif $vo['status'] eq 3 /} - - {elseif $vo['status'] eq 4 /} - - {/if} - -

{$vo['addtime']|date="Y-m-d H:i:s"}

- 		{$vo.message} - {if $vo.status lt 4} - 查看详情 - 取消发货 - {/if} -
暂时没有数据！
-
- {$page|raw} +
+ +
+ 导出订单 + 共有数据： + {$count}条,全部价值：{$all_goodslist_money_sum},本页总发货价值：{$all_goodslist_money}，去除测试账号成本：{$all_goodslist_money_sum1} +
+ + + + + + + + + + + + + + + + + {volist name="list" id="vo"} + + + + + + + + + + + + {/volist} + + {if condition="empty($list)"} + + + + {/if} + +
用户信息订单号发货数量/总价格运费收货信息订单状态申请时间备注操作
+
+
+
+

UID：{$vo['user_id']+1260}

+

{$vo['mobile']}

+

{$vo['nickname']}

+

+ {if $vo['istest'] eq 1 /} + 测试账号 + {else} + 正常 + {/if} + [{$vo['istest']}] +

+
+
+ 		{$vo.send_num}{$vo.count} / {$vo['goodslist_money']}{$vo.freight} +

{$vo['name']} {$vo['mobile']}

+

{$vo['address']}

+ 		+ {if $vo['status'] eq 1 /} + + {elseif $vo['status'] eq 2 /} + + {elseif $vo['status'] eq 3 /} + + {elseif $vo['status'] eq 4 /} + + {/if} + +

{$vo['addtime']|date="Y-m-d H:i:s"}

+ 		{$vo.message} + {if $vo.status lt 4} + 查看详情 + 取消发货 + {/if} +
暂时没有数据！
+
+ {$page|raw} +
-
-{include file="Public:footer"/} - + - - + \ No newline at end of file diff --git a/app/config/session.php b/app/config/session.php index 3995d4c..49403e5 100755 --- a/app/config/session.php +++ b/app/config/session.php @@ -14,4 +14,5 @@ return [ 'store' => null, // 前缀 'prefix' => '', + 'expire' => 3600, ];