wesmiler

app/Http/Controllers/Api/v1/AcceptorController.php

@@ -253,36 +253,6 @@ class AcceptorController extends webApp
     }
 
     /**
-     * 确认付款
-     * @return array
-     */
-    public function pay()
-    {
-        $params = request()->post();
-        if(!$result = AcceptorService::make()->pay($this->userId, $params)){
-            $error = AcceptorService::make()->getError();
-            return showJson($error,false, [],$error== 2035? 405:0);
-        }else{
-            return showJson(AcceptorService::make()->getError(),true, $result);
-        }
-    }
-
-    /**
-     * 确认收款
-     * @return array
-     */
-    public function confirm()
-    {
-        $params = request()->post();
-        if(!$result = AcceptorService::make()->confirm($this->userId, $params)){
-            $error = AcceptorService::make()->getError();
-            return showJson($error,false, [],$error== 2035? 405:0);
-        }else{
-            return showJson(AcceptorService::make()->getError(),true, $result);
-        }
-    }
-
-    /**
      * 取消
      * @return array
      */

app/Http/Controllers/Api/v1/TradeController.php

@@ -79,69 +79,26 @@ class TradeController extends webApp
     {
         $params = request()->all();
         if(!$result = TradeService::make()->sell($this->userId, $params, $request)){
-            return showJson(VideoService::make()->getError(), false);
+            return showJson(TradeService::make()->getError(), false);
         }else{
-            return showJson(VideoService::make()->getError(), true, $result);
+            return showJson(TradeService::make()->getError(), true, $result);
         }
     }
 
 
     /**
-     * 点赞
-     * @return array|mixed
-     */
-    public function like()
-    {
-        $params = request()->post();
-        if(!$result = VideoCollectService::make()->collect($this->userId, $params)){
-            return showJson(VideoCollectService::make()->getError(), false);
-        }else{
-            return showJson(VideoCollectService::make()->getError(), true, $result);
-        }
-    }
-
-    /**
-     * 收藏
-     * @return array|mixed
-     */
-    public function collect()
-    {
-        $params = request()->post();
-        if(!$result = VideoCollectService::make()->collect($this->userId, $params)){
-            return showJson(VideoCollectService::make()->getError(), false);
-        }else{
-            return showJson(VideoCollectService::make()->getError(), true, $result);
-        }
-    }
-
-    /**
      * 状态
      * @return array|mixed
      */
     public function status()
     {
-        if(!$result = VideoService::make()->status()){
-            return showJson(VideoService::make()->getError(), false);
-        }else{
-            return showJson(VideoService::make()->getError(), true, $result);
-        }
-    }
-
-    /**
-     * 删除
-     * @return array|mixed
-     */
-    public function delete()
-    {
-        if(!$result = VideoService::make()->delete()){
-            return showJson(VideoService::make()->getError(), false);
+        if(!$result = TradeService::make()->status()){
+            return showJson(TradeService::make()->getError(), false);
         }else{
-            return showJson(VideoService::make()->getError(), true);
+            return showJson(TradeService::make()->getError(), true, $result);
         }
     }
 
-
-
     /**
      * C2C交易-确认
      * @param MemberValidator $validator
@@ -164,4 +121,19 @@ class TradeController extends webApp
         }
     }
 
+    /**
+     * 取消订单
+     * @return array|mixed
+     */
+    public function cancel()
+    {
+        $params = request()->post();
+        if(!$result = TradeService::make()->cancel($this->userId, $params)){
+            return showJson(TradeService::make()->getError(), false);
+        }else{
+            return showJson(TradeService::make()->getError(), true);
+        }
+    }
+
+
 }

app/Services/Api/AcceptorService.php

@@ -208,7 +208,7 @@ class AcceptorService extends BaseService
             $info['usdt_price']     = moneyFormat(1 / $xdPrice, 2);
             $info['price']          = $cnyPrice;
             $info['avatar']         = get_image_url($info['avatar']);
-            $info['custom_uid'] = ConfigService::make()->getConfigByCode('xl_custom_id',100001);
+
         }
 
         return $info;
@@ -1229,8 +1229,5 @@ class AcceptorService extends BaseService
         return ['trade_id' => $orderId, 'money' => $money];
     }
 
-    public function cancel($userId, $params)
-    {
 
-    }
 }

app/Services/Api/TradeService.php

@@ -487,4 +487,42 @@ class TradeService extends BaseService
         return ['trade_id' => $info['id']];
     }
 
+    /**
+     * 取消订单
+     * @param $userId
+     * @param $params
+     * @return bool
+     */
+    public function cancel($userId, $params)
+    {
+        $id     = request()->post('id', 0);
+        $type = request()->post('type', 1);
+        if (!$id || !$info = $this->model->where(['id' => $id, 'mark' => 1])->select(['id','user_id','acceptor_uid','status'])->first()) {
+            $this->error = 3031;
+            return false;
+        }
+
+        if($info['status'] != 1){
+            $this->error = 3032;
+            return false;
+        }
+
+        if($userId && ($userId != $info['user_id'] || $userId != $info['acceptor_uid'])){
+            $this->error = 2913;
+            return false;
+        }
+
+        if($type <=0){
+            $this->error = 3033;
+            return false;
+        }
+
+        if ($this->model->where(['id' => $id, 'mark' => 1])->update(['status' => -1,'cancel_type'=> $type, 'update_time' => time()])) {
+            $this->error = 1002;
+            return true;
+        }
+
+        $this->error = 1003;
+        return true;
+    }
 }

resources/lang/zh-cn/api.php

@@ -243,6 +243,10 @@ return [
     '3013'=> '申请入驻失败，请返回重试',
     '3014'=> '申请入驻成功，请耐心等候审核',
 
+    '3031'=> '该订单不存在',
+    '3032'=> '该订单状态不可操作，请联系客服处理',
+    '3033'=> '请选择取消类型',
+
 
     '3101'=> '抱歉您的抽奖次数不足，请先升级或购买节点获得',
     '3102'=> '抽奖处理失败，请返回重试',

routes/api.php

@@ -182,9 +182,6 @@ Route::prefix('v1')->group(function(){
     Route::post('/acceptor/withdraw', [\App\Http\Controllers\Api\v1\AcceptorController::class, 'withdraw']);
     Route::post('/acceptor/buyxd', [\App\Http\Controllers\Api\v1\AcceptorController::class, 'buyxd']);
     Route::post('/acceptor/sellxd', [\App\Http\Controllers\Api\v1\AcceptorController::class, 'sellxd']);
-    Route::post('/acceptor/pay', [\App\Http\Controllers\Api\v1\AcceptorController::class, 'pay']);
-    Route::post('/acceptor/confirm', [\App\Http\Controllers\Api\v1\AcceptorController::class, 'confirm']);
-    Route::post('/acceptor/cancel', [\App\Http\Controllers\Api\v1\AcceptorController::class, 'cancel']);
 
 
     // 承兑商交易