1

app/api/controller/v1/Order.php

@@ -314,4 +314,31 @@ class Order extends BaseController
         $data = (new OrderModel)->getUserOrderList($request->user['uid'], $where);
         return app('json')->success($data);
     }
+
+    /**
+     * 取消订单
+     * @param Request $request
+     */
+    public function cancelOrder(Request $request)
+    {
+        $post = UtilService::getMore([
+            ['id', '', 'empty', '参数错误'],
+        ], $request);
+        $order = new OrderModel;
+        $data  = $order
+            ->where('uid', $request->user['uid'])
+            ->where('id', $post['id'])
+            ->find();
+        if (empty($data)) {
+            return app('json')->fail('找不到订单信息');
+        }
+        //订单状态
+        if ($data['status'] != 0) {
+            return app('json')->fail('当前订单无法取消');
+        }
+        $order->where('id', $data['id'])->save(['status' => -1,]);
+        (new OrderInfo)->where('o_id', $data['id'])->save(['status' => -1]);
+        return app('json')->success(['msg' => '取消成功']);
+    }
+
 }

app/api/controller/v1/User.php

@@ -703,36 +703,7 @@ class User extends AuthController
         ]);
     }
 
-    /**
-     * 取消订单
-     * @param Request $request
-     */
-    public function cancelOrder(Request $request)
-    {
-        $post  = UtilService::getMore(
-            [
-                ['id', '', 'empty', '参数错误'],
-            ], $request
-        );
-        $order = new Order;
-        $data  = $order
-            ->where('sassid', $request->site['sassid'])
-            ->where('uid', $request->user['uid'])
-            ->where('id', $post['id'])
-            ->find();
-        if (empty($data)) {
-            return app('json')->fail('找不到订单信息');
-        }
-        //订单状态
-        if ($data['status'] != 0) {
-            return app('json')->fail('当前订单无法取消');
-        }
-        $order->where('id', $data['id'])->save([
-            'status' => -1,
-        ]);
-        (new OrderInfo())->where('o_id', $data['id'])->save(['status' => -1]);
-        return app('json')->success(['msg' => '取消成功']);
-    }
+
 
     /**
      * 子订单数据

app/api/route/order.php

@@ -21,6 +21,8 @@ Route::group('order',function () {
     Route::rule('balancePay','v1.order/balancePay');
     //订单列表
     Route::rule('getOrderList','v1.order/getOrderList');
+    //取消订单
+    Route::rule('cancelOrder','v1.order/cancelOrder');
 
 })->middleware([
     AllowOriginMiddleware::class,

app/api/route/user.php

@@ -29,8 +29,6 @@ Route::group('user',function () {
     Route::rule('warehouse', 'v1.user/warehouse');
     //getPayOrder
     Route::rule('getPayOrder','v1.user/getPayOrder');
-    //取消订单
-    Route::rule('cancelOrder','v1.user/cancelOrder');
     //查看订单详情
     Route::rule('orderSubItem','v1.user/orderSubItem');
     //订单初始化数据

app/model/api/Order.php

@@ -2,6 +2,7 @@
 
 namespace app\model\api;
 
+use app\model\system\ProductAttrValue;
 use library\basic\BaseModel;
 use think\Model;
 
@@ -13,6 +14,14 @@ class Order extends BaseModel
     public function getUserOrderList($uid, $where){
         $list = $this->where('status', $where['type'])->where('uid', $uid)
             ->order('time DESC')->page((int)$where['page'], (int)$where['limit'])->select()->toArray();
+        foreach ($list as $k =>$v){
+            $list[$k]['_time'] = date('Y-m-d H:i:s', $v['time']);
+            $product = ProductAttrValue::alias('a')->join('product s', 'a.product_id=s.id')
+                ->where('a.product_id',$v['pro_id'])->where('a.unique',$v['unique'])->field('a.*,s.store_name')->find();
+            $list[$k]['store_name'] = $product['store_name'];
+            $list[$k]['image'] = $product['image'];
+            $list[$k]['suk'] = $product['suk'];
+        }
         return $list;
     }
 

app/model/system/AttachmentCategory.php

@@ -33,17 +33,25 @@ class AttachmentCategory extends BaseModel
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException
      */
-    public static function getAll($name, $mer_id = ''){
-        $model = new self;
-        if($name) $model = $model->where('name','LIKE',"%$name%");
-        if($mer_id) $model = $model->where('mer_id', 'in', [0, $mer_id]);
-        $list=self::tidyMenuTier($model->select(),0);
+    public static function getAll($name){
+        if($name){
+            $menu = self::where('name','LIKE',"%$name%")->select()->toArray();
+            $all = [];
+            foreach ($menu as $k=>$v){
+                $res = self::where('pid',$v['id'])->select()->toArray();
+                $all = array_merge($all,$res);
+            }
+            $all = array_merge($all,$menu);
+        }else{
+            $all = self::select()->toArray();
+        }
+        $list=self::tidyMenuTier($all,0);
         return compact('list');
     }
+
     public static function tidyMenuTier($menusList,$pid = 0,$navList = [])
     {
         foreach ($menusList as $k=>$menu){
-            $menu = $menu->getData();
             $menu['title']=$menu['name'];
             if($menu['pid'] == $pid){
                 unset($menusList[$k]);