1. 订单列表添加修改状态

2. 用户列表修改手机号码添加验证

app/admin/controller/mall/ShopOrder.php

@@ -2,10 +2,14 @@
 
 namespace app\admin\controller\mall;
 
+use app\admin\logic\ShopOrderLogic;
 use app\common\controller\AdminController;
+use app\validate\admin\mall\shopOrder\EditStatus;
+use app\validate\admin\user\user\PhoneSet;
 use EasyAdmin\annotation\ControllerAnnotation;
 use EasyAdmin\annotation\NodeAnotation;
 use think\App;
+use think\exception\ValidateException;
 use think\facade\Db;
 
 /**
@@ -16,17 +20,18 @@ class ShopOrder extends AdminController
 
     use \app\admin\traits\Curd;
 
-    public function __construct (App $app)
+    public function __construct(App $app)
     {
         parent::__construct($app);
 
         $this->model = new \app\common\model\ShopOrder();
 
     }
+
     /**
      * @NodeAnotation(title="列表")
      */
-    public function index ()
+    public function index()
     {
         if ($this->request->isAjax()) {
 //            if (input('selectFields')) {
@@ -38,16 +43,16 @@ class ShopOrder extends AdminController
 
             list($page, $limit, $where) = $this->buildTableParames();
 
-            foreach ($where as $key=>$val){
-                if ($val[0] == 'status'){
+            foreach ($where as $key => $val) {
+                if ($val[0] == 'status') {
                     $where[$key][0] = 'o.status';
                 }
-                if ($val[0] == 'created_time'){
+                if ($val[0] == 'created_time') {
                     $where[$key][0] = 'o.created_time';
                     $where[$key][2] = sr_getcurtime($where[$key][2]);
                 }
 
-                if ($val[0] == 'order_type'){
+                if ($val[0] == 'order_type') {
                     $where[$key][0] = 'o.order_type';
                 }
 
@@ -72,30 +77,29 @@ class ShopOrder extends AdminController
                 ->leftJoin('shop_order_shipping s', 's.order_id = o.order_id')
                 ->field('o.*,u.mobile,s.sp_id,s.sp_name,s.sp_mergename,s.sp_mobile')
                 ->order('o.order_id desc')
-                ->withAttr('order_sn', function($val, $data){
-                    return '编号:'.$val;
+                ->withAttr('order_sn', function ($val, $data) {
+                    return '编号:' . $val;
                 })
                 ->page($page, $limit)
                 ->select()->toArray();
 
 
-
             foreach ($list as $k => $v) {
-                $goods_id = $v['goods'][0]['goods_id'];
+                $goods_id   = $v['goods'][0]['goods_id'];
                 $goods_info = Db::name('shop_goods')->where('goods_id', $goods_id)->find();
-                if ($goods_info){
+                if ($goods_info) {
                     $list[$k]['cost_price'] = $goods_info['cost_price'];
-                }else{
+                } else {
                     $list[$k]['cost_price'] = 0;
                 }
 
-                if ($v['status'] == 5 || $v['status'] == 6){
+                if ($v['status'] == 5 || $v['status'] == 6) {
                     // 新的地址
-                    $ygOrderInfo = Db::name('yg_order')->where('order_sn', str_replace('编号:', '', $v['order_sn']))->find();
-                    $newAddress_info = Db::name('user_address')->where('id', $ygOrderInfo['address_id'])->find();
-                    $list[$k]['sp_id'] = 99999;
-                    $list[$k]['sp_mobile'] = $newAddress_info['mobile'];
-                    $list[$k]['sp_name'] = $newAddress_info['name'];
+                    $ygOrderInfo              = Db::name('yg_order')->where('order_sn', str_replace('编号:', '', $v['order_sn']))->find();
+                    $newAddress_info          = Db::name('user_address')->where('id', $ygOrderInfo['address_id'])->find();
+                    $list[$k]['sp_id']        = 99999;
+                    $list[$k]['sp_mobile']    = $newAddress_info['mobile'];
+                    $list[$k]['sp_name']      = $newAddress_info['name'];
                     $list[$k]['sp_mergename'] = $newAddress_info['mergename'];
 
                 }
@@ -103,10 +107,10 @@ class ShopOrder extends AdminController
 
             }
             $data = [
-                'code' => 0,
-                'msg' => '',
+                'code'  => 0,
+                'msg'   => '',
                 'count' => $count,
-                'data' => $list,
+                'data'  => $list,
             ];
             return json($data);
         }
@@ -116,11 +120,11 @@ class ShopOrder extends AdminController
     /**
      * @NodeAnotation(title="修改备注")
      */
-    public function editdesc ($id)
+    public function editdesc($id)
     {
-        if ($this->request->isPost()){
+        if ($this->request->isPost()) {
             $post = $this->request->post();
-            $row = $this->model->where('order_id', $id)->find();
+            $row  = $this->model->where('order_id', $id)->find();
             empty($row) && $this->error('取消失败');
 
             $row->order_remark = $post['error_text'];
@@ -133,7 +137,7 @@ class ShopOrder extends AdminController
                 Db::commit();
             } catch (\Exception $e) {
                 Db::rollback();
-                $this->error('设置失败'.$e->getMessage());
+                $this->error('设置失败' . $e->getMessage());
             }
             $this->success('设置成功');
         }
@@ -144,52 +148,83 @@ class ShopOrder extends AdminController
         return $this->fetch();
     }
 
+    /**
+     * @NodeAnotation(title="修改订单状态")
+     */
+    public function editstatus($id)
+    {
+        if ($this->request->isPost()) {
+            $post = $this->request->post();
+
+            try {
+                validate(EditStatus::class)->check($post);
+            } catch (ValidateException $e) {
+                $this->error($e->getMessage());
+            }
+
+            $result = ShopOrderLogic::editStatus($post['id'], $post['status']);
+            if ($result !== true) {
+                $this->error($result);
+            }
+
+            $this->success('修改订单状态成功');
+        }
+
+        $row               = $this->model->where('order_id', $id)->find();
+        $row['status_map'] = ShopOrderLogic::getStatusMap();
+        $this->assign('info', $row);
+
+        return $this->fetch('editstatus');
+    }
+
 
     /**
      * @NodeAnotation(title="列表")
      */
-    public function details ($orderId)
+    public function details($orderId)
     {
         $order = $this->model->where(['order_id' => $orderId])->with(['user', 'goods', 'shipping'])->find()->toArray();
 
-        if ($order['status'] == 5 || $order['status'] == 6){
+        if ($order['status'] == 5 || $order['status'] == 6) {
             // 新的地址
-            $ygOrderInfo = Db::name('yg_order')->where('order_sn', str_replace('编号:', '', $order['order_sn']))->find();
-            $newAddress_info = Db::name('user_address')->where('id', $ygOrderInfo['address_id'])->find();
-            $order['shipping']['sp_id'] = 99999;
-            $order['shipping']['sp_mobile'] = $newAddress_info['mobile'];
-            $order['shipping']['sp_name'] = $newAddress_info['name'];
+            $ygOrderInfo                       = Db::name('yg_order')->where('order_sn', str_replace('编号:', '', $order['order_sn']))->find();
+            $newAddress_info                   = Db::name('user_address')->where('id', $ygOrderInfo['address_id'])->find();
+            $order['shipping']['sp_id']        = 99999;
+            $order['shipping']['sp_mobile']    = $newAddress_info['mobile'];
+            $order['shipping']['sp_name']      = $newAddress_info['name'];
             $order['shipping']['sp_mergename'] = $newAddress_info['mergename'];
         }
         $this->assign('data', $order);
         return $this->fetch();
     }
+
     /**
      * @NodeAnotation(title="列表")
      */
-    public function delivery ($orderId)
+    public function delivery($orderId)
     {
-        $express = Db::name('express')->field('id,name,code')->select()->toArray();
+        $express  = Db::name('express')->field('id,name,code')->select()->toArray();
         $shipping = Db::name('shop_order_shipping')->where(['order_id' => $orderId])->findOrEmpty();
-        $order = Db::name('shop_order')->where('order_id', $shipping['order_id'])->find();
+        $order    = Db::name('shop_order')->where('order_id', $shipping['order_id'])->find();
         $this->assign('express', $express);
-        if ($order['status'] == 5 || $order['status'] == 6){
+        if ($order['status'] == 5 || $order['status'] == 6) {
             // 新的地址
-            $ygOrderInfo = Db::name('yg_order')->where('order_sn', str_replace('编号:', '', $order['order_sn']))->find();
-            $newAddress_info = Db::name('user_address')->where('id', $ygOrderInfo['address_id'])->find();
-            $shipping['sp_id'] = 99999;
-            $shipping['sp_mobile'] = $newAddress_info['mobile'];
-            $shipping['sp_name'] = $newAddress_info['name'];
+            $ygOrderInfo              = Db::name('yg_order')->where('order_sn', str_replace('编号:', '', $order['order_sn']))->find();
+            $newAddress_info          = Db::name('user_address')->where('id', $ygOrderInfo['address_id'])->find();
+            $shipping['sp_id']        = 99999;
+            $shipping['sp_mobile']    = $newAddress_info['mobile'];
+            $shipping['sp_name']      = $newAddress_info['name'];
             $shipping['sp_mergename'] = $newAddress_info['mergename'];
         }
         $this->assign('shipping', $shipping);
 
         return $this->fetch();
     }
+
     /**
      * @NodeAnotation(title="列表")
      */
-    public function deliverySave ()
+    public function deliverySave()
     {
         if ($this->request->isPost()) {
             $data = $this->request->post();
@@ -203,18 +238,18 @@ class ShopOrder extends AdminController
             // 发货
             if ($order_info = Db::name('shop_order')->where(['order_id' => $data['order_id']])->where('status', 'in', [5])->find()) {
 
-                $res = Db::name('shop_order')->where(['order_id' => $data['order_id']])->save(['ship_code' => $ex[0], 'ship_name' => $ex[1], 'ship_number' => $data['ship_number'], 'status' => 6]);
+                $res          = Db::name('shop_order')->where(['order_id' => $data['order_id']])->save(['ship_code' => $ex[0], 'ship_name' => $ex[1], 'ship_number' => $data['ship_number'], 'status' => 6]);
                 $yg_orderinfo = Db::name('yg_order')->where('order_sn', $order_info['order_sn'])->find();
                 Db::name('yg_buy_record')->where('yg_id', $yg_orderinfo['id'])->where('status', 3)->save(['ship_code' => $ex[0], 'ship_name' => $ex[1], 'ship_number' => $data['ship_number'], 'status' => 4]);
 
                 // 重新发货
-            }elseif($order_info = Db::name('shop_order')->where(['order_id' => $data['order_id']])->where('status', 'in', [6])->find()){
-                $res = Db::name('shop_order')->where(['order_id' => $data['order_id']])->save(['ship_code' => $ex[0], 'ship_name' => $ex[1], 'ship_number' => $data['ship_number'], 'status' => 6]);
+            } elseif ($order_info = Db::name('shop_order')->where(['order_id' => $data['order_id']])->where('status', 'in', [6])->find()) {
+                $res          = Db::name('shop_order')->where(['order_id' => $data['order_id']])->save(['ship_code' => $ex[0], 'ship_name' => $ex[1], 'ship_number' => $data['ship_number'], 'status' => 6]);
                 $yg_orderinfo = Db::name('yg_order')->where('order_sn', $order_info['order_sn'])->find();
                 Db::name('yg_buy_record')->where('yg_id', $yg_orderinfo['id'])->where('status', 4)->save(['ship_code' => $ex[0], 'ship_name' => $ex[1], 'ship_number' => $data['ship_number']]);
 
-            }else{
-                $res = Db::name('shop_order')->where(['order_id' => $data['order_id']])->save(['ship_code' => $ex[0], 'ship_name' => $ex[1], 'ship_number' => $data['ship_number'],'status' => 2]);
+            } else {
+                $res = Db::name('shop_order')->where(['order_id' => $data['order_id']])->save(['ship_code' => $ex[0], 'ship_name' => $ex[1], 'ship_number' => $data['ship_number'], 'status' => 2]);
             }
 
 

app/admin/controller/user/User.php

@@ -19,9 +19,12 @@ use app\common\controller\AdminController;
 use app\common\model\UserMoneyModel;
 use app\common\model\UserteamLogModel;
 use app\Request;
+use app\validate\admin\mall\shopOrder\EditStatus;
+use app\validate\admin\user\user\PhoneSet;
 use EasyAdmin\tool\CommonTool;
 use jianyan\excel\Excel;
 use think\App;
+use think\exception\ValidateException;
 use think\facade\Db;
 
 
@@ -238,6 +241,40 @@ class User extends AdminController
     }
 
     /**
+     * 增加余额
+     * @return mixed
+     */
+    public function phoneset()
+    {
+        if ($this->request->isPost()) {
+
+            $post = $this->request->post();
+
+            try {
+                validate(PhoneSet::class)->check($post);
+            } catch (ValidateException $e) {
+                $this->error($e->getMessage());
+            }
+
+
+            $user  = $this->model->findOrEmpty(['id' => $post['id']]);
+            $phone = $post['phone'];
+            empty($user) && $this->error('用户不存在');
+
+            $userLogic = new UserLogic();
+            $result    = $userLogic->modifyPhone($post['id'], $phone);
+            if ($result !== true) {
+                $this->error($result);
+            }
+
+            $this->success('成功');
+        }
+        $user = $this->model->findOrEmpty(['id' => $this->request['id']]);
+        $this->assign('info', $user);
+        return $this->fetch('phoneset');
+    }
+
+    /**
      * 等级设置
      * @return mixed
      */

app/admin/logic/ShopOrderLogic.php

@@ -0,0 +1,54 @@
+<?php
+
+
+namespace app\admin\logic;
+
+use app\admin\model\dao\ShopOrder;
+use think\facade\Db;
+
+class ShopOrderLogic
+{
+
+    // 0待付款 1待发货 2已发货 3取消订单  4.已完成
+    private static $statusMap = [
+        ['id' => 0, 'name' => '待付款'],
+        ['id' => 1, 'name' => '待发货'],
+        ['id' => 2, 'name' => '已发货'],
+        ['id' => 3, 'name' => '取消订单'],
+        ['id' => 4, 'name' => '已完成']
+    ];
+
+    /**
+     * @return array[]
+     */
+    public static function getStatusMap(): array
+    {
+        return self::$statusMap;
+    }
+
+    public static function editStatus($orderId, $status)
+    {
+        $shopOrder = ShopOrder::getOrderById($orderId);
+        if (empty($shopOrder)) {
+            return "订单不存在";
+        }
+
+        if ($shopOrder['status'] != $status) {
+            Db::startTrans();
+            try {
+                $result = ShopOrder::editStatus($orderId, $status);
+                if (!$result) {
+                    Db::rollback();
+                    return "订单更新状态失败";
+                }
+                Db::commit();
+            } catch (\Exception $exception) {
+                Db::rollback();
+                return "失败:" . $exception->getMessage();
+            }
+        }
+
+
+        return true;
+    }
+}

app/admin/logic/UserLogic.php

@@ -89,4 +89,37 @@ class UserLogic
 
     }
 
+    /**
+     * 修改用户手机号码
+     * @param mixed $uid
+     * @param mixed $phone
+     */
+    public function modifyPhone($uid, $phone)
+    {
+        // 判断手机号码是否使用过
+        $user = User::getUserById($uid);
+        if ($user['mobile'] == $phone) {
+            return "请输入新的手机号码";
+        }
+
+        $user = User::getUserByMobile($phone);
+
+        if ($user) {
+            return "该手机号码已注册";
+        }
+
+        // 修改用户信息
+        try {
+            $result = User::ModifyMobile($uid, $phone);
+            if (!$result) {
+                return "更新手机号码失败，请稍后重试";
+            }
+        } catch (\Exception $e) {
+            return '失败' . $e->getMessage();
+        }
+
+        return true;
+
+    }
+
 }

app/admin/model/dao/ShopOrder.php

@@ -0,0 +1,38 @@
+<?php
+
+
+namespace app\admin\model\dao;
+
+
+use app\common\model\ShopOrder as ShopOrderModel;
+use app\common\model\UserModel;
+use think\facade\Db;
+
+class ShopOrder extends BaseDao
+{
+
+    protected $model;
+
+    public static $table = "db_shop_order";
+
+    public function __construct()
+    {
+        $this->model = new ShopOrderModel();
+    }
+
+    public static function editStatus($orderId, $status)
+    {
+        return Db::table(self::$table)
+            ->where(['order_id' => $orderId])
+            ->update([
+                'status'       => $status,
+                'updated_time' => date('Y-m-d H:i:s')
+            ]);
+    }
+
+    public static function getOrderById($orderId)
+    {
+        return Db::table(self::$table)->where(['order_id' => $orderId])->find();
+    }
+
+}

app/admin/model/dao/User.php

@@ -35,6 +35,26 @@ class User extends BaseDao
         return Db::table(self::$table)->whereIn('id', $uids)->sum('money');
     }
 
+    public static function getUserById($uid)
+    {
+        return Db::table(self::$table)->where('id', $uid)->find();
+    }
+
+    public static function getUserByMobile($mobile)
+    {
+        return Db::table(self::$table)->where('mobile', $mobile)->find();
+    }
+
+    public static function ModifyMobile($uid, $phone)
+    {
+        return Db::table(self::$table)
+            ->where(['id' => $uid])
+            ->update([
+                'mobile'      => $phone,
+                'update_time' => date('Y-m-d H:i:s')
+            ]);
+    }
+
     public function getCount($where, $userMap)
     {
         return $this->model

app/admin/view/mall/shop_order/editdesc.html

@@ -17,13 +17,6 @@
             </div>
         </div>
 
-
-
-
-
-
-
-
         <input type="hidden" name="id" value="{$Request.param.id}">
         <div class="hr-line"></div>
         <div class="layui-form-item text-center">

app/admin/view/mall/shop_order/editstatus.html

@@ -0,0 +1,38 @@
+<style>
+    .layui-iconpicker-body.layui-iconpicker-body-page .hide {
+        display: none;
+    }
+</style>
+<link rel="stylesheet" href="__STATIC__/plugs/lay-module/autocomplete/autocomplete.css?v={$version}" media="all">
+<div class="layuimini-container">
+    <form id="app-form" class="layui-form layuimini-form" method="post">
+
+
+        <div class="layui-form-item  layui-row layui-col-xs12">
+            <label class="layui-form-label required">订单状态</label>
+            <div class="layui-input-block">
+                <select name="status">
+                    <option value="">请选择</option>
+                    {foreach $info.status_map as $v}
+                    <option value="{$v.id}" {$info.status==$v.id?'selected=""':''}>{$v.name}</option>
+                    {/foreach}
+                </select>
+            </div>
+        </div>
+
+        <input type="hidden" name="id" value="{$Request.param.id}">
+        <div class="hr-line"></div>
+        <div class="layui-form-item text-center">
+            <button type="submit" class="layui-btn layui-btn-normal layui-btn-sm" lay-submit="mall.shoporder/editstatus" data-refresh="true">确认
+            </button>
+            <button type="reset" class="layui-btn layui-btn-primary layui-btn-sm">重置</button>
+        </div>
+    </form>
+</div>
+
+<script>
+    layui.use('form', function(){
+        var form = layui.form;
+        form.render();
+    })
+</script>

app/admin/view/user/user/phoneset.html

@@ -0,0 +1,36 @@
+<style>
+    .layui-iconpicker-body.layui-iconpicker-body-page .hide {
+        display: none;
+    }
+</style>
+<link rel="stylesheet" href="__STATIC__/plugs/lay-module/autocomplete/autocomplete.css?v={$version}" media="all">
+<div class="layuimini-container">
+    <form id="app-form" class="layui-form layuimini-form" method="post">
+
+
+        <div class="layui-form-item  layui-row layui-col-xs12">
+            <label class="layui-form-label required">新的手机号码</label>
+            <div class="layui-input-block">
+                <input type="text" name="phone" class="layui-input" lay-verify="required" lay-reqtext="请输入新的手机号码"
+                       placeholder="请输入新的手机号码" value="{$info.phone}">
+
+            </div>
+        </div>
+
+
+        <input type="hidden" name="id" value="{$Request.param.id}">
+        <div class="hr-line"></div>
+        <div class="layui-form-item text-center">
+            <button type="submit" class="layui-btn layui-btn-normal layui-btn-sm" lay-submit="user.user/phoneset" data-refresh="true">确认
+            </button>
+            <button type="reset" class="layui-btn layui-btn-primary layui-btn-sm">重置</button>
+        </div>
+    </form>
+</div>
+
+<!--<script>-->
+<!--    layui.use('form', function(){-->
+<!--        var form = layui.form;-->
+<!--        form.render();-->
+<!--    })-->
+<!--</script>-->

app/validate/admin/mall/shopOrder/EditStatus.php

@@ -0,0 +1,21 @@
+<?php
+declare (strict_types=1);
+
+namespace app\validate\admin\mall\shopOrder;
+
+use think\Validate;
+
+class EditStatus extends Validate
+{
+    protected $rule = [
+        'id'     => 'require|integer',
+        'status' => 'require|in:0,1,2,3,4',
+    ];
+
+    protected $message = [
+        'id.require'     => '订单ID不能为空',
+        'id.integer'     => '订单ID格式错误',
+        'status.require' => '订单状态不能为空',
+        'status.in'      => '订单状态格式错误',
+    ];
+}

app/validate/admin/user/user/PhoneSet.php

@@ -0,0 +1,18 @@
+<?php
+declare (strict_types=1);
+
+namespace app\validate\admin\user\user;
+
+use think\Validate;
+
+class PhoneSet extends Validate
+{
+    protected $rule = [
+        'phone' => 'require|mobile',
+    ];
+
+    protected $message = [
+        'phone.require' => '手机号码不能为空',
+        'phone.mobile'   => '手机号码格式错误'
+    ];
+}

public/static/admin/js/mall/shop_order.js

@@ -80,12 +80,13 @@ define(["jquery", "easy-admin"], function ($, ea) {
                         }, selectList: {0: '待支付订单', 1: '待发货订单', 2: '已发货订单',3:'取消订单',4:'正在竞拍',5:'回购完成待发货',6:'回购完成已发货'}
                     },
                     {
-                        width: 180,
+                        width: 200,
                         title: '操作',
 
                         templet: function (d) {
                             var btn = `<span class="layui-btn layui-btn-xs layui-btn-success" onclick="openDetails(${d.order_id})">操作</span>`;
                             btn += '<button class="layui-btn layui-btn-xs layui-btn-danger" data-open="mall.shopOrder/editdesc?id=' + d.order_id + '" data-title="充值失败">修改备注</button>';
+                            btn += '<button class="layui-btn layui-btn-xs layui-btn-normal" data-open="mall.shopOrder/editstatus?id=' + d.order_id + '" data-title="修改状态">修改状态</button>';
                             // if (d.status == 1) {
                             //     btn += `<span class="layui-btn layui-btn-xs layui-btn-warm" onclick="openFahuo(${d.order_id})">发货</span>`
                             // }
@@ -112,6 +113,9 @@ define(["jquery", "easy-admin"], function ($, ea) {
         editdesc: function () {
             ea.listen();
         },
+        editstatus: function () {
+            ea.listen();
+        },
 
     };
     return Controller;

public/static/admin/js/user/user.js

@@ -113,8 +113,8 @@ define(["jquery", "easy-admin"], function ($, ea) {
                                 button += '<button class="layui-btn layui-btn-xs layui-btn-normal" data-open="user.user/levelset?id=' + d.id + '" data-title="等级设置">等级设置</button>';
                             }
 
-                            if (ea.checkAuth('levelset', init.table_elem)) {
-                                button += '<button class="layui-btn layui-btn-xs layui-btn-normal" data-open="user.user/levelset?id=' + d.id + '" data-title="修改手机号码">修改手机号码</button>';
+                            if (ea.checkAuth('phoneset', init.table_elem)) {
+                                button += '<button class="layui-btn layui-btn-xs layui-btn-normal" data-open="user.user/phoneset?id=' + d.id + '" data-title="修改手机号码">修改手机号码</button>';
                             }
                             if (ea.checkAuth('lookpidlevel', init.table_elem)) {
                                 button += '<button class="layui-btn layui-btn-xs layui-btn-normal" data-open="user.user/lookpidlevel?id=' + d.id + '" data-title="查看上级">上级</button>';
@@ -163,6 +163,9 @@ define(["jquery", "easy-admin"], function ($, ea) {
         levelset: function () {
             ea.listen();
         },
+        phoneset: function () {
+            ea.listen();
+        },