12.27

application/admin/controller/users/Users.php

@@ -67,7 +67,7 @@ class Users extends Backend
                     ->select();
 
             foreach ($list as $row) {
-                $row->visible(['user_id','user_nickname','user_tel','user_avatar','user_level','user_money','user_redbean','user_whitebean','user_line_num','create_time','update_time','status_switch']);
+                $row->visible(['user_id','user_nickname','user_tel','user_avatar','user_level','user_money','user_redbean','user_whitebean','create_time','update_time','status_switch']);
                 
             }
             $list = collection($list)->toArray();

application/admin/lang/zh-cn/users/users.php

@@ -9,7 +9,6 @@ return [
     'User_money'     => '余额',
     'User_redbean'   => '红米',
     'User_whitebean' => '白米',
-    'User_line_num'  => '排队剩余次数',
     'Create_time'    => '创建时间',
     'Update_time'    => '修改时间',
     'Status_switch'  => '0封号1正常'

application/admin/view/users/users/edit.html

@@ -44,12 +44,12 @@
             <input id="c-user_whitebean" class="form-control" step="0.01" name="row[user_whitebean]" type="number" value="{$row.user_whitebean|htmlentities}">
         </div>
     </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('User_line_num')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-user_line_num" class="form-control" name="row[user_line_num]" type="number" value="{$row.user_line_num|htmlentities}">
-        </div>
-    </div>
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('User_line_num')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <input id="c-user_line_num" class="form-control" name="row[user_line_num]" type="number" value="{$row.user_line_num|htmlentities}">-->
+<!--        </div>-->
+<!--    </div>-->
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Create_time')}:</label>
         <div class="col-xs-12 col-sm-8">

application/api/controller/Member.php

@@ -1,23 +1,22 @@
 <?php
 namespace app\api\controller;
 
+use alipay\aop\AopClient;
+use alipay\aop\request\AlipayTradeAppPayRequest;
 use app\admin\model\BuyVipLogModel;
 use app\admin\model\Cardtip;
-use app\api\model\QueueModel;
 use app\api\model\UsersModel;
 use app\common\controller\Api;
 use app\admin\model\Equity;
 use app\common\lib\WxPay;
 use think\Db;
-use function fast\array_except;
 
 /**
- * VIP接口
+ * 开通VIP接口
  */
 class Member extends Api
 {
     protected $noNeedLogin = '*';
-
     /**
      * 开通VIP页面
      *
@@ -26,10 +25,6 @@ class Member extends Api
      * @ApiMethod   (POST)
      * @ApiRoute    (/api/member/index)
      * @ApiParams   (name="user_id", type="int", required=true, description="用户id")
-     * @ApiReturnParams   (name="code", type="int", required=true, sample="200")
-     * @ApiReturnParams   (name="msg", type="string", required=true, sample="ok")
-     * @ApiReturnParams   (name="data", type="array", description="数据返回")
-     * @ApiReturn   ()
      */
     public function index()
     {
@@ -45,6 +40,7 @@ class Member extends Api
         //头部卡片
         $info = Cardtip::find(1);
         $info['avatar'] = UsersModel::where('user_id', $userId)->value('user_avatar');
+        $info['desc'] = explode(' ', $info['desc']);
         $this->result('ok', ['card' => $info, 'equityList' => $list], 200);
     }
     /**
@@ -55,21 +51,35 @@ class Member extends Api
      * @ApiMethod   (POST)
      * @ApiRoute    (/api/member/buyVip)
      * @ApiParams   (name="user_id", type="int", required=true, description="用户id")
-     * @ApiReturnParams   (name="code", type="int", required=true, sample="200")
-     * @ApiReturnParams   (name="msg", type="string", required=true, sample="ok")
-     * @ApiReturnParams   (name="data", type="array", description="数据返回")
-     * @ApiReturn   ()
+     * @ApiParams   (name="pay_type", type="int", required=true, description="支付类型 2-微信 3-支付宝")
      */
     public function buyVip()
     {
         $userId = $this->request->post('user_id');
-        $amount = 68;
-        $notify_url = config('site.httpurl').'/api/member/notify_url';
+        $payType = $this->request->post('pay_type');
 
-        if (!$userId) {
+        $amount = 0.01;
+        // 微信回调
+        $notify_url = config('site.httpurl').'/api/member/notify_url_vip';
+        // 支付宝回调
+        $notify_url2 = config('site.httpurl').'/api/member/notify_url_vip2';
+
+        if (!$userId || !$payType) {
             $this->result('参数错误', [], 200);
         }
 
+        $user = UsersModel::get($userId);
+
+        if (!$user) {
+            $this->result('用户不存在', [], 100);
+        }
+
+        // 查询剩余开通次数
+        $canUseOpenNum = UsersModel::where('user_id', $userId)->value('vip_use_num');
+        if ($canUseOpenNum == 5) {
+            $this->result('您本月可开通VIP的次数已用完', [], 200);
+        }
+
         $out_trade_no = createOutTradeNo();
         $orderInfo = array(
             'uid' => $userId,
@@ -79,10 +89,12 @@ class Member extends Api
         );
 
         Db::startTrans();
-        try {
-            $insert = BuyVipLogModel::insert($orderInfo);
-            if ($insert) {
-                Db::commit();
+        $insert = BuyVipLogModel::insert($orderInfo);
+        if ($insert) {
+            Db::commit();
+            // 支付类型
+            // 微信支付
+            if ($payType == 2) {
                 $payObj = new WxPay();
                 $getPrePayInfo = $payObj->getPrePayOrder('VIP会员购买', $out_trade_no, ($amount * 100), $notify_url);
                 if ($getPrePayInfo) {
@@ -96,172 +108,203 @@ class Member extends Api
                     $this->result('支付订单发起失败，请稍后再试', [], 100);
                 }
             }
-        } catch (\Exception $exception) {
-            Db::rollback();
-            $this->result('支付订单发起失败，请稍后再试('.$exception->getMessage().')', [], 100);
+            // 支付宝支付
+            if ($payType == 3) {
+                $aop = new AopClient;
+                $aop->gatewayUrl = "https://openapi.alipay.com/gateway.do";
+                $aop->appId = config('alipay.app_id');
+                $aop->rsaPrivateKey = config('alipay.private_key');
+                $aop->format = "json";
+                $aop->charset = "utf-8";
+                $aop->signType = "RSA2";
+                $aop->alipayrsaPublicKey = config('alipay.public_key');
+                //实例化具体API对应的request类,类名称和接口名称对应,当前调用接口名称：alipay.trade.app.pay
+                $request = new AlipayTradeAppPayRequest();
+
+                // 订单标题
+                $subject = 'VIP会员购买';
+                // 订单详情
+                $body = '优享街68元VIP会员购买';
+
+                // SDK已经封装掉了公共参数，这里只需要传入业务参数
+                $bizcontent = json_encode([
+                    'body' => $body,
+                    'subject' => $subject,
+                    'out_trade_no' => $out_trade_no,
+                    'timeout_express' => '90m',
+                    'total_amount' => $amount,
+                    'product_code' => 'QUICK_MSECURITY_PAY'
+                ]);
+
+                $request->setNotifyUrl($notify_url2);
+                $request->setBizContent($bizcontent);
+                // 这里和普通的接口调用不同，使用的是sdkExecute
+                $response = $aop->sdkExecute($request);
+                // 注意：这里不需要使用htmlspecialchars进行转义，直接返回即可
+                // return $response;
+                $this->result('订单发起成功', ['payInfoString' => $response], 200);
+            }
         }
     }
+
     /**
-     * 排队
-     *
-     * @ApiTitle    (排队)
-     * @ApiSummary  (排队)
-     * @ApiMethod   (POST)
-     * @ApiRoute    (/api/member/queue)
-     * @ApiParams   (name="user_id", type="int", required=true, description="用户id")
-     * @ApiParams   (name="pay_type", type="int", required=true, description="支付方式：1-余额 2-微信 3-支付宝")
-     * @ApiReturnParams   (name="code", type="int", required=true, sample="200")
-     * @ApiReturnParams   (name="msg", type="string", required=true, sample="ok")
-     * @ApiReturnParams   (name="data", type="array", description="数据返回")
-     * @ApiReturn   ()
+     * 测试接口
+     * @ApiInternal
      */
-    public function queue()
+    public function test()
     {
-        $userId = $this->request->post('user_id');
-        $payType = $this->request->post('pay_type'); // 1-余额 2-微信 3-支付宝
-        $amount = 1.2;
-        $income = 2;
-
-        if (!$userId || !$payType) {
-            $this->result('参数错误', [], 100);
-        }
-
-        $user = UsersModel::get($userId);
+        $order_trade_no = $this->request->post('trade');
 
-        if ($user->user_level == 1) {
-            $this->result('您还不是VIP用户，不能进行排队哦', [], 100);
-        }
-        // 剩余总排队次数是否足够
-        if ($user->user_line_num <= 0) {
-            $this->result('您的排队次数不足，不能进行排队哦', [], 100);
-        }
-        // 每天可排队次数是否足够
-        if ($user->can_line_num_perday <= 0) {
-            $this->result('您每天可排队次数不足哦', [], 100);
-        }
-        // 今天排队次数是否足够
-        if ($user->can_line_num_perday == $user->line_num_today) {
-            $this->result('您今天的可排队次数已用完', [], 100);
+        $order = BuyVipLogModel::where('out_trade_no', $order_trade_no)->find();
+        if ($order) {
+            // 更新支付状态
+            $updatePayStatus = BuyVipLogModel::where('out_trade_no', $order_trade_no)
+                ->setField('pay_status', 1);
+            // 修改会员等级
+            $updateVipLevel = UsersModel::where('user_id', $order->uid)->setField('user_level', 2);
+            if ($updatePayStatus && $updateVipLevel) {
+                $successArray = array(
+                    'return_code' => 'SUCCESS',
+                    'return_msg'  => 'OK'
+                );
+                return $this->arrayToXml($successArray);
+            }
         }
+    }
+    /**
+     * 购买会员微信支付异步回调
+     * @ApiInternal
+     */
+    public function notify_url_vip()
+    {
+        //获取返回的xml格式数据
+        $payXml = file_get_contents("php://input");
+        //将xml格式转化为json格式
+        $jsonXml = json_encode(simplexml_load_string($payXml, 'SimpleXMLElement', LIBXML_NOCDATA));
+        //将json格式转成数组格式
+        $result = json_decode($jsonXml, true);
 
-        $nowTime = time();
-        $startTime = strtotime(date('Y-m-d').' 09:00:00');
-        $endTime = strtotime(date('Y-m-d').' 22:00:00');
-
-        if ($startTime < $nowTime && $nowTime < $endTime) {
-
-            $nowHour = date("Y-m-d H:00:00", time());
-            $nextHour = date("Y-m-d H:i:s", strtotime("+1 hour"));
-
-            //是否在本时间段内排过队
-            $hasOnLine = QueueModel::where(['uid' => $userId, 'pay_status' => 1])
-                ->whereTime('time', 'between', [$nowHour, $nextHour])
-                ->find();
-
-            if (!empty($hasOnLine)) {
-                $this->result('您当前已排过队', [], 100);
-            }
+        if ($result) {
+            //如果成功返回
+            if ($result['return_code'] == 'SUCCESS') {
+                if ($result['result_code'] == 'SUCCESS') {
+                    // sign 值校验
+                    // 校验时不包含返回的 sign 字段，需踢除 sign 字段
+                    foreach($result as $k => $v) {
+                        if ($k == 'sign') {
+                            $sign = $result[$k];
+                            unset($result[$k]);
+                        };
+                    }
+                    //按字典排序
+                    ksort($result);
+                    //转为 url 键值对
+                    $signTemp = http_build_query($result);
+                    //md5处理，$key 为微信商户平台的 api 安全密钥
+                    $key = 'b3ae6bbf3cc4fa017eb169ae219e2c27';
+                    $signTemp = md5($signTemp.'&key='.$key);
+                    //转大写得最终 sign 值
+                    $resultSign = strtoupper($signTemp);
+                    //如果sign值正确
+                    if ($sign === $resultSign) {
+                        $order = BuyVipLogModel::where('out_trade_no', $result['out_trade_no'])->find();
+                        if ($order) {
+                            // 更新支付状态
+                            $updatePayStatus = BuyVipLogModel::where('out_trade_no', $result['out_trade_no'])
+                                ->setField('pay_status', 1);
+                            // 修改会员等级
+                            $updateVipLevel = UsersModel::where('user_id', $order->uid)->update(['user_level' => 2]);
+                            // 限购份数加一
+                            $addLimitNum = UsersModel::where('user_id', $order->uid)->setInc('vip_use_num', 1);
+                            // 增加话费优惠额度
+                            $addChargeQuota = UsersModel::where('user_id', $order->uid)->setInc('vip_discount_quota', 100);
+                            // 查询我的推荐人手机号
+                            $myRecTel = UsersModel::where('user_id', $order->uid)->value('user_tjtel');
+                            // 查询我的推荐人user_id
+                            $myRecId = UsersModel::where('user_tel', $myRecTel)->value('user_id');
+                            // 我加一次排队次数
+                            $addMyQueueNum = UsersModel::where('user_id', $order->uid)->setInc('get_queue_num', 1);
+                            // 推荐人加一次排队次数
+                            $addRecQueueNum = UsersModel::where('user_id', $myRecId)->setInc('get_queue_num', 1);
 
-            //当前时间段排队人数
-            $lineNum = QueueModel::whereTime('time', 'between', [$nowHour, $nextHour])->where('pay_status',1)->count();
-            $trade = createOutTradeNo();
-            $lineInfo = array(
-                'uid'      => $userId,
-                'trade'    => $trade,
-                'amount'   => $amount,
-                'line_num' => $lineNum,
-                'income'   => $income,
-                'time'     => date('Y-m-d H:i:s', time()),
-                'pay_type' => $payType
-            );
-            Db::startTrans();
-            $insert = QueueModel::insert($lineInfo);
-            if ($insert) {
-                Db::commit();
-                if ($payType == 1) {
-                    $this->result('订单创建成功', ['out_trade_no' => $trade, 'fee' => $amount], 200);
+                            if ($updatePayStatus && $updateVipLevel !== false && $addLimitNum && $addChargeQuota && $addMyQueueNum && $addRecQueueNum) {
+                                $successArray = array(
+                                    'return_code' => 'SUCCESS',
+                                    'return_msg'  => 'OK'
+                                );
+                                return $this->arrayToXml($successArray);
+                            }
+                        }
+                    }
+                } else {
+                    return false;
                 }
             } else {
-                Db::rollback();
-                $this->result('服务器繁忙', [], 100);
+                return false;
             }
-        } else {
-            $this->result('今日排队活动已经结束了哦', [], 100);
         }
     }
     /**
-     * 排队余额支付
-     *
-     * @ApiTitle    (排队余额支付)
-     * @ApiSummary  (排队余额支付)
-     * @ApiMethod   (POST)
-     * @ApiRoute    (/api/member/balancePayQueue)
-     * @ApiParams   (name="user_id", type="int", required=true, description="用户id")
-     * @ApiParams   (name="fee", type="decimal", required=true, description="排队接口返回的支付金额fee字段的值")
-     * @ApiParams   (name="out_trade_no", type="string", required=true, description="排队接口返回的支付订单编号out_trade_no字段的值")
-     * @ApiParams   (name="pay_password", type="string", required=true, description="用户支付密码")
-     * @ApiReturnParams   (name="code", type="int", required=true, sample="200")
-     * @ApiReturnParams   (name="msg", type="string", required=true, sample="ok")
-     * @ApiReturnParams   (name="data", type="array", description="数据返回")
-     * @ApiReturn   ()
+     * 数组转xml
+     * @ApiInternal
      */
-    public function balancePayQueue()
+    public function arrayToXml($arr)
     {
-        $userId = $this->request->post('user_id');
-        $fee = $this->request->post('fee');
-        $trade = $this->request->post('out_trade_no');
-        $payPwd = $this->request->post('pay_password');
-
-        if (!$userId || !$fee || !$trade || !$payPwd) {
-            $this->result('参数错误', [], 100);
-        }
-
-        $user = UsersModel::get($userId);
-
-        // 用户是否存在
-        if (!$user) {
-            $this->result('用户不存在', [], 100);
-        }
-        // 订单是否存在
-        $order = QueueModel::where('trade', $trade)->find();
-        if (!$order) {
-            $this->result('订单不存在', [], 100);
-        }
-        if ($fee <= 0) {
-            $this->result('请输入正确的支付金额', [], 100);
-        }
-        // 余额是否满足本次扣费金额
-        if ($user->user_money < $fee) {
-            $this->result('账户余额不足', [], 100);
-        }
-        // 是否设置支付密码
-        if (empty($user->user_paypwd)) {
-            $this->result('请先设置支付密码', [], 100);
-        }
-        // 支付密码是否正确
-        if ($user->user_paypwd != $payPwd) {
-            $this->result('支付密码错误', [], 100);
+        $xml = "<xml>";
+        foreach ($arr as $key=>$val)
+        {
+            if (is_numeric($val))
+            {
+                $xml.="<".$key.">".$val."</".$key.">";
+            }
+            else
+                $xml.="<".$key."><![CDATA[".$val."]]></".$key.">";
         }
-        Db::startTrans();
-        // 扣除账户余额
-        $dec = UsersModel::where('user_id', $userId)->setDec('user_money', $fee);
-        // 增加排队收入
-        $amount = 2;
-        $inc = UsersModel::where('user_id', $userId)->setInc('user_money', $amount);
-        // 更新支付状态和支付时间
-        $updatePayStatus = QueueModel::where('trade', $trade)
-            ->update(['pay_status' => 1, 'pay_time' => date('Y-m-d H:i:s', time())]);
-        // 消耗一次今日可排队次数
-        $addPerDayQueueNum = UsersModel::where('user_id', $userId)->setInc('line_num_today', 1);
-        // 消耗一次总排队次数
-        $decTotalQueueNum = UsersModel::where('user_id', $userId)->setDec('user_line_num', 1);
-
-        if ($dec && $inc && $updatePayStatus && $addPerDayQueueNum && $decTotalQueueNum) {
-            Db::commit();
-            $this->result('排队成功', [], 200);
-        } else {
-            Db::rollback();
-            $this->result('支付失败，稍后再试', [], 100);
+        $xml.="</xml>";
+        return $xml;
+    }
+    /**
+     * 购买会员支付宝支付异步回调
+     * @ApiInternal
+     */
+    public function notify_url_vip2()
+    {
+        $params = $this->request->post();
+        if (!empty($params) && $params['trade_status'] == 'TRADE_SUCCESS') {
+            // 验证签名
+            $aop = new AopClient();
+            $aop->alipayrsaPublicKey = config('alipay.public_key');
+            // 此处反转义参数中的字符，否则验签不通过
+            $params['fund_bill_list'] = htmlspecialchars_decode($params['fund_bill_list']);
+            $checkSign = $aop->rsaCheckV1($params, null, 'RSA2');
+            if ($checkSign) {
+                // 是不是向此商户号付款
+                if ($params['app_id'] == config('alipay.app_id')) {
+                    // 查询订单是否存在
+                    $order = BuyVipLogModel::where('out_trade_no', $params['out_trade_no'])->find();
+                    if (!empty($order)) {
+                        // 更新支付状态
+                        $updatePayStatus = BuyVipLogModel::where('out_trade_no', $params['out_trade_no'])->setField('pay_status', 1);
+                        // 修改会员等级
+                        $updateVipLevel = UsersModel::where('user_id', $order->uid)->update(['user_level' => 2]);
+                        // 限购份数加一
+                        $addLimitNum = UsersModel::where('user_id', $order->uid)->setInc('vip_use_num', 1);
+                        // 增加话费优惠额度
+                        $addChargeQuota = UsersModel::where('user_id', $order->uid)->setInc('vip_discount_quota', 100);
+                        // 查询我的推荐人手机号
+                        $myRecTel = UsersModel::where('user_id', $order->uid)->value('user_tjtel');
+                        // 查询我的推荐人user_id
+                        $myRecId = UsersModel::where('user_tel', $myRecTel)->value('user_id');
+                        // 我加一次排队次数
+                        $addMyQueueNum = UsersModel::where('user_id', $order->uid)->setInc('get_queue_num', 1);
+                        // 推荐人加一次排队次数
+                        $addRecQueueNum = UsersModel::where('user_id', $myRecId)->setInc('get_queue_num', 1);
+                        if ($updatePayStatus && $updateVipLevel !== false && $addLimitNum && $addChargeQuota && $addMyQueueNum && $addRecQueueNum) {
+                            echo 'success';
+                        }
+                    }
+                }
+            }
         }
     }
 }

application/api/controller/Order.php

@@ -137,7 +137,7 @@ class Order extends Api
      * 支付订单
      * @ApiMethod   (POST)
      * @param string $pre_id 预存id
-     * @param string $list 商品参数 c_id buy_number p_id colorid name(颜色名) p_name（规格名） color（图片）
+     * @param string $list 商品参数 c_id buy_number p_id
      * @param string $user_id 用户id
      * @param string $money 总价
      * @param string $a_id 地址id
@@ -189,8 +189,76 @@ class Order extends Api
          $order = new OrderModel();
         if ($parames['type'] == 0) {
             $res = $order->userMoneyPay($parames);
-            halt($res);
+           return $res;
+        }
+    }
+    /**
+     * 全部订单
+     * @ApiMethod   (POST)
+     * @param string $user_id 用户id
+     */
+    public function allOrder()
+    {
+        $user_id = $this->request->post('user_id');
+        if (!isset($user_id)) {
+            return $this->result('网络错误','',100);
+        }
+        $order = new OrderModel();
+        $data = $order->allOrder($user_id);
+        return $data;
+    }
+    /**
+     * 确认收货
+     * @ApiMethod   (POST)
+     * @param string $o_id 订单id；
+     */
+    public function trueOrder()
+    {
+        $o_id = $this->request->post('o_id');
+        if (!isset($o_id)) {
+            return $this->result('网络错误','',100);
+        }
+        $updOrder = OrderModel::where('o_id',$o_id)->update(['state' => 6]);
+        if ($updOrder) {
+            return $this->result('收货成功','', 200);
+        } else {
+            return $this->result('网络错误','',100);
+        }
+     }
+    /**
+     * 取消订单
+     * @ApiMethod   (POST)
+     * @param string $o_id 订单id；
+     */
+    public function orderCancel()
+    {
+        $o_id = $this->request->post('o_id');
+        if (!isset($o_id)) {
+            return $this->result('网络错误','',100);
+        }
+        $updOrder = OrderModel::where('o_id',$o_id)->update(['state' => 5]);
+        if ($updOrder) {
+            return $this->result('取消成功','', 200);
+        } else {
+            return $this->result('网络错误','',100);
+        }
+    }
+    /**
+     * 删除订单
+     * @ApiMethod   (POST)
+     * @param string $o_id 订单id；
+     */
+    public function delOeder()
+    {
+        $o_id = $this->request->post('o_id');
+        if (!isset($o_id)) {
+            return $this->result('网络错误','',100);
+        }
+        $updOrder = OrderModel::where('o_id',$o_id)->delete();
+        if ($updOrder) {
+            return $this->result('删除成功','', 200);
+        } else {
+            return $this->result('网络错误','',100);
         }
     }
-
 }

application/api/model/OrderAddress.php

@@ -0,0 +1,13 @@
+<?php
+namespace app\api\model;
+use think\Model;
+
+class OrderAddress extends Model
+{
+    protected $name = 'order_address';
+
+    public function order()
+    {
+        return $this->belongsTo('order','o_id','o_id');
+    }
+}

application/api/model/OrderCommodityModel.php

@@ -5,4 +5,9 @@ use think\Model;
 class OrderCommodityModel extends Model
 {
     protected $name = 'order_commodity';
+
+    public function order()
+    {
+        return $this->belongsTo('order','o_id','o_id');
+    }
 }

application/api/model/OrderModel.php

@@ -27,9 +27,9 @@ class OrderModel extends Model
             return json(['code' => 100, 'msg' => '您的余额不足', 'data' => '']);
         }
         Db::startTrans();
-        try{
+        try {
             //扣除用户余额
-            $updUserMoney = UsersModel::where('user_id',$params['user_id'])->setDec('user_money',$params['money']);
+            $updUserMoney = UsersModel::where('user_id', $params['user_id'])->setDec('user_money', $params['money']);
             Db::commit();
         } catch (\Exception $e) {
             Db::rollback();
@@ -37,15 +37,23 @@ class OrderModel extends Model
         if (!$updUserMoney) {
             return json(['code' => 100, 'msg' => '扣款失败', 'data' => '']);
         }
+        $list = $params['list'];
+        //循环加入奖励的白豆
+        $whitebean = 0;  // 白豆初始化
+        foreach ($list as &$v) {
+            $commodity = CommodityModel::where('c_id', $v['c_id'])->find()->toArray(); // 查出商品详情
+            $whitebean = $commodity['c_whitebean'] + $whitebean;
+        }
         //创建订单信息
         $orderdata = array(
-            'user_id' => $params['user_id'],
-            'money' => $params['money'],
-            'freight' => $params['freight'],
-            'number' => $params['number'],
+            'user_id'     => $params['user_id'],
+            'money'       => $params['money'],
+            'freight'     => $params['freight'],
+            'number'      => $params['number'],
             'create_time' => $params['create_time'],
-            'pay_time' => date("Y-m-d H:i:s",time()),
-            'state' => 1,
+            'whitebeon'   => $whitebean,
+            'pay_time'    => date("Y-m-d H:i:s", time()),
+            'state'       => 2,
         );
         //生成已支付订单
         $addOrderId = Db::name('order')->insertGetId($orderdata);
@@ -55,6 +63,10 @@ class OrderModel extends Model
         $list = $params['list'];
         //创建订单商品信息
         foreach ($list as &$v) {
+            $commoditycolor = Commoditycolor::where('colorid', $v['colorid'])->find()->toArray();                     //查 出商品颜色表参数
+            $parameter = Parameter::where('p_id', $v['p_id'])->find()->toArray();                                     // 查出商品规格表参数
+            $commodity = CommodityModel::where('c_id', $v['c_id'])->field('c_vipprice,c_freight')->find()->toArray(); // 查出商品价格和运费
+            $v = array_merge($commoditycolor, $parameter, $commodity, $v);                                            // 合并颜色表、规格表、商品表、以及传过来的数据
             $order_commodity_data = array(
                 'c_id'       => $v['c_id'],
                 'p_id'       => $v['p_id'],
@@ -63,6 +75,8 @@ class OrderModel extends Model
                 'p_name'     => $v['p_name'],
                 'color'      => $v['color'],
                 'buy_number' => $v['buy_number'],
+                'c_vipprice' => $v['c_vipprice'],
+                'c_freight'  => $v['c_freight'],
                 'o_id'       => $addOrderId,
             );
             //循环插入订单商品信息
@@ -73,12 +87,12 @@ class OrderModel extends Model
         }
         //创建地址信息
         $order_address = array(
-            'a_id' => $params['a_id'],
+            'a_id'   => $params['a_id'],
             'a_name' => $params['a_name'],
-            'a_tel' => $params['a_tel'],
+            'a_tel'  => $params['a_tel'],
             'a_city' => $params['city'],
             'a_area' => $params['area'],
-            'o_id' => $addOrderId
+            'o_id'   => $addOrderId
         );
         //订单地址添加
         $add_order_address = Db::name('order_address')->insert($order_address);
@@ -88,4 +102,77 @@ class OrderModel extends Model
             return json(['code' => 200, 'msg' => '下单失败', 'data' => $addOrderId]);
         }
     }
+
+    /**
+     * 全部订单
+     */
+    public function allOrder($user_id)
+    {
+        //全部订单
+        $data = $this->with(['OrderCommodityModel', 'OrderAddress'])
+            ->where('user_id', $user_id)
+            ->select();
+        if (!$data) {
+            $data = [];
+        }
+        //待支付订单
+        $data1 = $this->with(['OrderCommodityModel', 'OrderAddress'])
+            ->where('state', 1)
+            ->where('user_id', $user_id)
+            ->select();
+        if (!$data1) {
+            $data1 = [];
+        }
+        //待发货订单
+        $data2 = $this->with(['OrderCommodityModel', 'OrderAddress'])
+            ->where('state', 2)
+            ->where('user_id', $user_id)
+            ->select();
+        if (!$data2) {
+            $data2 = [];
+        }
+        //待收货订单
+        $data3 = $this->with(['OrderCommodityModel', 'OrderAddress'])
+            ->where('state', 3)
+            ->where('user_id', $user_id)
+            ->select();
+        if (!$data3) {
+            $data3 = [];
+        }
+        //订单取消
+        $data5 = $this->with(['OrderCommodityModel', 'OrderAddress'])
+            ->where('state', 5)
+            ->where('user_id', $user_id)
+            ->select();
+        if (!$data5) {
+            $data5 = [];
+        }
+        //已完成订单
+        $data6 = $this->with(['OrderCommodityModel', 'OrderAddress'])
+            ->where('state', 6)
+            ->where('user_id', $user_id)
+            ->select();
+        if (!$data6) {
+            $data6 = [];
+        }
+        //退款售后
+        $data4 = $this->with(['OrderCommodityModel', 'OrderAddress'])
+            ->where('state', 4)
+            ->where('user_id', $user_id)
+            ->select();
+        if (!$data4) {
+            $data4 = [];
+        }
+        return json(['code' => 200, 'msg' => '', 'allorder' => $data, 'daizhifu' => $data1, 'daifahuo' => $data2, 'daishouhuo' => $data3, 'quxiao' => $data5, 'yiwancheng' => $data6, 'tuikuan' => $data4]);
+    }
+
+    public function OrderCommodityModel()
+    {
+        return $this->hasMany('OrderCommodityModel', 'o_id', 'o_id');
+    }
+
+    public function OrderAddress()
+    {
+        return $this->hasOne('OrderAddress', 'o_id', 'o_id');
+    }
 }

public/assets/js/backend/users/users.js

@@ -32,9 +32,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'user_money', title: __('User_money'), operate:'BETWEEN'},
                         {field: 'user_redbean', title: __('User_redbean'), operate:'BETWEEN'},
                         {field: 'user_whitebean', title: __('User_whitebean'), operate:'BETWEEN'},
-                        {field: 'user_line_num', title: __('User_line_num')},
                         {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'create_time', formatter: Table.api.formatter.datetime},
                         {field: 'update_time', title: __('Update_time'), operate:'RANGE', addclass:'update_time', formatter: Table.api.formatter.datetime},
+                        {field: 'update_time', title: __('Update_time'), operate:'RANGE', addclass:'update_time', formatter: Table.api.formatter.datetime},
                         {field: 'status_switch', title: __('状态'), searchList: {1:__('启用'),0:__('禁用')}, formatter: Table.api.formatter.toggle},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]