wesmiler 1 年之前
父节点
当前提交
f6055ee8d2
共有 4 个文件被更改,包括 37 次插入3 次删除
  1. 2 2
      .env
  2. 13 0
      app/Http/Controllers/Api/v1/OrderController.php
  3. 21 0
      app/Services/Api/OrderService.php
  4. 1 1
      routes/api.php

+ 2 - 2
.env

@@ -13,7 +13,7 @@ APP_SIGN_KEY=dysapp # APP接口签名密钥
 
 DB_CONNECTION=mysql
 DB_HOST=47.112.222.163
-DB_PORT=3306
+DB_PORT=63306
 DB_PREFIX=lev_
 DB_DATABASE=nn2023060101
 DB_USERNAME=NN2023060101
@@ -38,7 +38,7 @@ CACHE_DRIVER=redis
 REDIS_PREFIX=null
 REDIS_HOST=47.112.222.163
 REDIS_PASSWORD=derkj&6688
-REDIS_PORT=6379
+REDIS_PORT=16379
 REDIS_DB=0
 
 #socket

+ 13 - 0
app/Http/Controllers/Api/v1/OrderController.php

@@ -239,4 +239,17 @@ class OrderController extends webApp
             return message(OrderService::make()->getError(), true, $result);
         }
     }
+
+    /**
+     * 订单隐藏
+     * @return array
+     */
+    public function hide()
+    {
+        if(!$result = OrderService::make()->hide()){
+            return message(OrderService::make()->getError(), false);
+        }else{
+            return message(OrderService::make()->getError(), true, $result);
+        }
+    }
 }

+ 21 - 0
app/Services/Api/OrderService.php

@@ -2030,4 +2030,25 @@ class OrderService extends BaseService
         $this->error = lang('2692',['time'=> $publishTime? $publishTime:'0']);
         return ['id'=> $commentId];
     }
+
+    public function hide()
+    {
+        $params = request()->all();
+        $id = isset($params['id']) ? $params['id'] : 0;
+        $info = $this->model->where(['id' => $id, 'mark' => 1])
+            ->select(['id','user_id','order_no','merch_id','source_id','status','user_delete'])
+            ->first();
+        if (!$id || empty($info)) {
+            $this->error = 2636;
+            return false;
+        }
+
+        $userDelete = isset($info['user_delete'])? $info['user_delete'] : 0;
+        if($userDelete == 2){
+            $this->error = 2636;
+            return false;
+        }
+
+        if($this->)
+    }
 }

+ 1 - 1
routes/api.php

@@ -225,7 +225,7 @@ Route::prefix('v1')->group(function(){
     Route::post('/order/refund', [\App\Http\Controllers\Api\v1\OrderController::class, 'refund']);
     Route::post('/order/refundConfirm', [\App\Http\Controllers\Api\v1\OrderController::class, 'refundConfirm']);
     Route::post('/order/refundCancel', [\App\Http\Controllers\Api\v1\OrderController::class, 'refundCancel']);
-    Route::post('/order/delete', [\App\Http\Controllers\Api\v1\OrderController::class, 'delete']);
+    Route::post('/order/hide', [\App\Http\Controllers\Api\v1\OrderController::class, 'hide']);
 
     // 文章
     Route::post('/article/index', [\App\Http\Controllers\Api\v1\ArticleController::class, 'index']);