订单已取消

@@ -190,7 +190,7 @@ class Order extends Api
      * @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
      * @ApiParams (name="page", type="inter", required=false, description="当前页(默认1)")
      * @ApiParams (name="page_num", type="inter", required=false, description="每页显示数据个数（默认10）")
-     * @ApiParams (name="type", type="inter", required=true, description="类型:1=待抢单,2=进行中,3=待确认,4=已结束,5=售后")
+     * @ApiParams (name="type", type="inter", required=true, description="类型:1=待抢单,2=进行中,3=待确认,4=已结束,5=售后,6=已取消")
      *
      * @ApiReturn({
         "code": 1,
@@ -249,6 +249,8 @@ class Order extends Api
             case '5':
                 $where['status'] = '5';
                 break;
+            case '6':
+                $where['status'] = ['in','7,8'];
             default:
                 $this->error('参数不合法');
                 break;

@@ -61,6 +61,7 @@ class User extends Api
                 "count3": 0, //待确认数量
                 "count4": 0, //已结束数量
                 "count5": 0  //售后数量
+                "count6": 0  //已取消数量
             },
             "grab_count": { //抢单信息
                 "count1": 1, //抢单中数量
@@ -68,6 +69,7 @@ class User extends Api
                 "count3": 0, //待确认数量
                 "count4": 0, //已结束数量
                 "count5": 0  //售后数量
+                "count6": 0  //已取消数量
             },
             "url": "/u/1"
         }
@@ -84,6 +86,7 @@ class User extends Api
             'count3' => $this->getOrderCount(['user_id'=>$user['id'],'status'=>'3']), // 待确认
             'count4' => $this->getOrderCount(['user_id'=>$user['id'],'status'=>['in','4,6']]), // 已完成/已拒绝
             'count5' => $this->getOrderCount(['user_id'=>$user['id'],'status'=>'5']), // 售后
+            'count6' => $this->getOrderCount(['user_id'=>$user['id'],'status'=>['in','7,8']]), // 已取消
         ];
         // 抢单信息
         $user->grab_count = [
@@ -92,6 +95,7 @@ class User extends Api
             'count3' => $this->getGrabCount(['a.user_id'=>$user['id'],'a.status'=>'3']), // 待确认
             'count4' => $this->getGrabCount(['a.user_id'=>$user['id'],'a.status'=>['in','4,6']]), // 已完成/已拒绝
             'count5' => $this->getGrabCount(['a.user_id'=>$user['id'],'a.status'=>'5']), // 售后
+            'count6' => $this->getGrabCount(['a.user_id'=>$user['id'],'a.status'=>['in','7,8']]), // 已取消
         ];
         $user->visible(['id','avatar','nickname','mobile','score','money','order_count','grab_count']);
         $this->success('成功', $user);

@@ -2981,7 +2981,7 @@
                                                         <td>type</td>
                                                         <td>inter</td>
                                                         <td>是</td>
-                                                        <td>类型:1=待抢单,2=进行中,3=待确认,4=已结束,5=售后</td>
+                                                        <td>类型:1=待抢单,2=进行中,3=待确认,4=已结束,5=售后,6=已取消</td>
                                                     </tr>
                                                                                                     </tbody>
                                             </table>
@@ -3022,7 +3022,7 @@
                                                         </div>
                                                                                                                 <div class="form-group">
                                                             <label class="control-label" for="type">type</label>
-                                                            <input type="inter" class="form-control input-sm" id="type" required placeholder="类型:1=待抢单,2=进行中,3=待确认,4=已结束,5=售后" name="type">
+                                                            <input type="inter" class="form-control input-sm" id="type" required placeholder="类型:1=待抢单,2=进行中,3=待确认,4=已结束,5=售后,6=已取消" name="type">
                                                         </div>
                                                                                                                 <div class="form-group">
                                                             <button type="submit" class="btn btn-success send" rel="20">提交</button>
@@ -5665,6 +5665,7 @@
                 "count3": 0, //待确认数量
                 "count4": 0, //已结束数量
                 "count5": 0  //售后数量
+                "count6": 0  //已取消数量
             },
             "grab_count": { //抢单信息
                 "count1": 1, //抢单中数量
@@ -5672,6 +5673,7 @@
                 "count3": 0, //待确认数量
                 "count4": 0, //已结束数量
                 "count5": 0  //售后数量
+                "count6": 0  //已取消数量
             },
             "url": "/u/1"
         }
@@ -10076,7 +10078,7 @@
 
             <div class="row mt0 footer">
                 <div class="col-md-6" align="left">
-                    Generated on 2021-01-19 17:51:05                </div>
+                    Generated on 2021-03-19 11:02:32                </div>
                 <div class="col-md-6" align="right">
                     <a href="./" target="_blank">停车缴费</a>
                 </div>