server/baji
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改问题

Browse Source
This commit is contained in:
baji 2025-03-10 23:32:04 +08:00
parent 3fd6d3b435
commit 8399adb563
3 changed files with 187 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/admin/controller/Order.php
View File

@ -287,19 +287,27 @@ class Order extends Base
$field = '*'; $field = '*';
$order = 'id desc'; $order = 'id desc';
$all_goodslist_money = 0; $all_goodslist_money = 0;
// 获取测试用户ID列表
$userList = User::where('istest', 1)->column('id');
// 订单筛选条件
$data = OrderListSend::getList($whe, $field, $order, $this->page); $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) { 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) { if ($user_info) {
$value['nickname'] = $user_info['nickname']; $value['nickname'] = $user_info['nickname'];
$value['headimg'] = $user_info['headimg']; $value['headimg'] = $user_info['headimg'];
$value['mobile'] = $user_info['mobile']; $value['mobile'] = $user_info['mobile'];
$value['istest'] = $user_info['istest'];
} else { } else {
$value['nickname'] = ''; $value['nickname'] = '';
$value['headimg'] = ''; $value['headimg'] = '';
$value['mobile'] = ''; $value['mobile'] = '';
$value['istest'] = '';
} }
$goodslist_money = OrderList::where('send_num', '=', $value['send_num'])->sum('goodslist_money'); $goodslist_money = OrderList::where('send_num', '=', $value['send_num'])->sum('goodslist_money');
$value['goodslist_money'] = $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('user_id', $user_id ? $user_id : 0);
View::assign('mobile', $mobile ? $mobile : 0); View::assign('mobile', $mobile ? $mobile : 0);
View::assign('send_num', $send_num ? $send_num : 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_sum', $all_goodslist_money_sum ? $all_goodslist_money_sum : 0);
View::assign('all_goodslist_money', $all_goodslist_money ? $all_goodslist_money : 0); View::assign('all_goodslist_money', $all_goodslist_money ? $all_goodslist_money : 0);
View::assign('status', $status ? $status : 0); View::assign('status', $status ? $status : 0);

39
app/admin/view/Order/send_order.html
View File

@ -7,17 +7,20 @@
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-inline"> <div class="layui-inline">
<div class="layui-input-inline" style="width: 150px;margin-left: 0px"> <div class="layui-input-inline" style="width: 150px;margin-left: 0px">
<input type="text" name="user_id" value="{$Request.get.user_id}" placeholder="请输入UID" autocomplete="off" class="layui-input"> <input type="text" name="user_id" value="{$Request.get.user_id}" placeholder="请输入UID"
autocomplete="off" class="layui-input">
</div> </div>
</div> </div>
<div class="layui-inline"> <div class="layui-inline">
<div class="layui-input-inline" style="width: 150px;margin-left: 0px"> <div class="layui-input-inline" style="width: 150px;margin-left: 0px">
<input type="text" name="mobile" value="{$Request.get.mobile}" placeholder="请输入手机号" autocomplete="off" class="layui-input"> <input type="text" name="mobile" value="{$Request.get.mobile}" placeholder="请输入手机号"
autocomplete="off" class="layui-input">
</div> </div>
</div> </div>
<div class="layui-inline"> <div class="layui-inline">
<div class="layui-input-inline" style="width: 300px;margin-left: 0px"> <div class="layui-input-inline" style="width: 300px;margin-left: 0px">
<input type="text" name="send_num" value="{$Request.get.send_num}" placeholder="请输入订单号" autocomplete="off" class="layui-input"> <input type="text" name="send_num" value="{$Request.get.send_num}" placeholder="请输入订单号"
autocomplete="off" class="layui-input">
</div> </div>
</div> </div>
<div class="layui-inline"> <div class="layui-inline">
@ -33,11 +36,13 @@
</div> </div>
<div class="layui-inline"> <div class="layui-inline">
<div class="layui-input-inline" style="width: 300px;margin-left: 0px"> <div class="layui-input-inline" style="width: 300px;margin-left: 0px">
<input type="text" id="addtime" name="addtime" value="{$Request.get.addtime}" class="layui-input" placeholder="申请时间" autocomplete="off" > <input type="text" id="addtime" name="addtime" value="{$Request.get.addtime}"
class="layui-input" placeholder="申请时间" autocomplete="off">
</div> </div>
</div> </div>
<div class="layui-inline"> <div class="layui-inline">
<button class="layui-btn layuiadmin-btn-useradmin" lay-submit lay-filter="LAY-user-front-search"> <button class="layui-btn layuiadmin-btn-useradmin" lay-submit
lay-filter="LAY-user-front-search">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i> <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button> </button>
</div> </div>
@ -47,8 +52,10 @@
<div class="layui-card-body"> <div class="layui-card-body">
<xblock> <xblock>
<div style="padding-bottom: 10px;"> <div style="padding-bottom: 10px;">
<a class="layui-btn" href="{:url('/admin/send_order_daochu',['user_id'=>$user_id,'mobile'=>$mobile,'send_num'=>$send_num,'addtime'=>$str_addtime,'status'=>$status])}">导出订单</a> <a class="layui-btn"
<span style="line-height:40px;float:right;">共有数据： {$count}条,全部价值：{$all_goodslist_money_sum},本页总发货价值：{$all_goodslist_money}</span> href="{:url('/admin/send_order_daochu',['user_id'=>$user_id,'mobile'=>$mobile,'send_num'=>$send_num,'addtime'=>$str_addtime,'status'=>$status])}">导出订单</a>
<span style="line-height:40px;float:right;">共有数据：
{$count}条,全部价值：{$all_goodslist_money_sum},本页总发货价值：{$all_goodslist_money}，去除测试账号成本：{$all_goodslist_money_sum1}</span>
</div> </div>
</xblock> </xblock>
<table class="layui-table" style="text-align:center"> <table class="layui-table" style="text-align:center">
@ -75,6 +82,14 @@
<p style="color: #ff5722c2;font-size: 9px">UID：{$vo['user_id']+1260}</p> <p style="color: #ff5722c2;font-size: 9px">UID：{$vo['user_id']+1260}</p>
<p style="color: #666666ba;font-size: 9px">{$vo['mobile']}</p> <p style="color: #666666ba;font-size: 9px">{$vo['mobile']}</p>
<p style="color: #666666ba;font-size: 9px">{$vo['nickname']}</p> <p style="color: #666666ba;font-size: 9px">{$vo['nickname']}</p>
<p style="color: #666666ba;font-size: 8px"></p>
{if $vo['istest'] eq 1 /}
测试账号
{else}
正常
{/if}
[{$vo['istest']}]
</p>
</div> </div>
</div> </div>
</td> </td>
@ -103,14 +118,17 @@
<td style="width: 200px"> <td style="width: 200px">
{if $vo.status lt 4} {if $vo.status lt 4}
<a onClick="detail({$vo.id})" class="layui-btn layui-btn-normal layui-btn-xs">查看详情</a> <a onClick="detail({$vo.id})" class="layui-btn layui-btn-normal layui-btn-xs">查看详情</a>
<a onClick="cancel_order({$vo.id})" class="layui-btn layui-btn-danger layui-btn-xs">取消发货</a> <a onClick="cancel_order({$vo.id})"
class="layui-btn layui-btn-danger layui-btn-xs">取消发货</a>
{/if} {/if}
</td> </td>
</tr> </tr>
{/volist} {/volist}
{if condition="empty($list)"} {if condition="empty($list)"}
<tr><td colspan='10' style="text-align:center;">暂时没有数据！</td></tr> <tr>
<td colspan='10' style="text-align:center;">暂时没有数据！</td>
</tr>
{/if} {/if}
</tbody> </tbody>
</table> </table>
@ -166,6 +184,5 @@
</script> </script>
</body> </body>
</html> </html>

1
app/config/session.php
View File

@ -14,4 +14,5 @@ return [
'store' => null, 'store' => null,
// 前缀 // 前缀
'prefix' => '', 'prefix' => '',
'expire' => 3600,
]; ];