xialei 1 год назад
Родитель
Сommit
801a3101dc
2 измененных файлов с 5 добавлено и 4 удалено
  1. 2 3
      app/controller/api/user/User.php
  2. 3 1
      route/api.php

+ 2 - 3
app/controller/api/user/User.php

@@ -200,7 +200,7 @@ class User extends BaseController
200
         $uid = $this->request->uid();
200
         $uid = $this->request->uid();
201
         $data = [
201
         $data = [
202
             "name"=>"VR转账",
202
             "name"=>"VR转账",
203
-            "url"=>'https://show.gdjbp.com/?uid=' .$uid,
203
+            "url"=>'https://show.hxxfb.com/?uid=' .$uid,
204
         ];
204
         ];
205
         return app('json')->success($data);
205
         return app('json')->success($data);
206
     }
206
     }
@@ -2624,7 +2624,6 @@ class User extends BaseController
2624
         $today_signintime = strtotime(date('Y-m-d', time()));
2624
         $today_signintime = strtotime(date('Y-m-d', time()));
2625
         $today_signin_info = Db::name('user_sign_score')->where(array('uid' => $uid))->whereDay('signin_time')->find();
2625
         $today_signin_info = Db::name('user_sign_score')->where(array('uid' => $uid))->whereDay('signin_time')->find();
2626
 
2626
 
2627
-        return app('json')->fail('今天已经签到过了xx');
2628
 
2627
 
2629
         if (!empty($today_signin_info)) {
2628
         if (!empty($today_signin_info)) {
2630
             return app('json')->fail('今天已经签到过了');
2629
             return app('json')->fail('今天已经签到过了');
@@ -2837,7 +2836,7 @@ class User extends BaseController
2837
         if (strtotime($check['end_time']) > time() && $check['status'] == 1) {
2836
         if (strtotime($check['end_time']) > time() && $check['status'] == 1) {
2838
             return app('json')->fail("账户已开通,不可重复开通账户");
2837
             return app('json')->fail("账户已开通,不可重复开通账户");
2839
         }
2838
         }
2840
-
2839
+ 
2841
         $insertData = [
2840
         $insertData = [
2842
             'pay_price' => $price,
2841
             'pay_price' => $price,
2843
             'status'    => 0,
2842
             'status'    => 0,

+ 3 - 1
route/api.php

@@ -807,7 +807,7 @@ Route::group('api/', function () {
807
         Route::post('merchant/refundApply', 'api.merchant.order.OrderMerchant/refundApply');
807
         Route::post('merchant/refundApply', 'api.merchant.order.OrderMerchant/refundApply');
808
         //退款查询API
808
         //退款查询API
809
         Route::post('merchant/refundQuery', 'api.merchant.order.OrderMerchant/refundQuery');
809
         Route::post('merchant/refundQuery', 'api.merchant.order.OrderMerchant/refundQuery');
810
-        //账户余额查询
810
+        //账户余额查询  
811
         Route::post('merchant/balanceQuery', 'api.merchant.order.OrderMerchant/balanceQuery');
811
         Route::post('merchant/balanceQuery', 'api.merchant.order.OrderMerchant/balanceQuery');
812
         //商户信息 充值送
812
         //商户信息 充值送
813
         Route::get('merchant/get_mer_info', 'api.merchant.Merchant/get_mer_info');
813
         Route::get('merchant/get_mer_info', 'api.merchant.Merchant/get_mer_info');
@@ -1054,6 +1054,8 @@ Route::group('api/', function () {
1054
     //话费充值回调通知
1054
     //话费充值回调通知
1055
     Route::post('huafei/notify', 'api.store.service.Huafei/notify');
1055
     Route::post('huafei/notify', 'api.store.service.Huafei/notify');
1056
 
1056
 
1057
+    //订单数据补充
1058
+    Route::post('order/buchong', 'api.notify/buchong');
1057
 
1059
 
1058
 
1060
 
1059
     //城市代码
1061
     //城市代码