Преглед изворни кода

修复ä¸线下扫码绑定ç”后bug

hefei пре 1 година
родитељ
комит
5439c679b5

+ 1 - 1
app/common/repositories/user/UserOfflineRechargeRepository.php

@@ -200,7 +200,7 @@ class UserOfflineRechargeRepository extends BaseRepository
200 200
                     $order = (object)$order;
201 201
                     $userRepository = app()->make(UserRepository::class);
202 202
                     $user = $userRepository->getOne(['uid' => $unionUser->uid]);
203
-                    $userRepository->doBind($user, $order, $flag);
203
+                    $OrderMerchantRepository->doBind($user, $order, $flag);
204 204
 
205 205
                     OrderMerchant::getDB()->where('pay_user_id', $unionUser->unionid)->update(['uid' => $unionUser->uid, 'binds' => 1]);
206 206
                 }

+ 5 - 1
app/controller/api/Auth.php

@@ -1093,7 +1093,11 @@ class Auth extends BaseController
1093 1093
         $user->append(['service', 'user_group','total_consume', 'total_collect_product', 'total_collect_store', 'total_coupon', 'total_visit_product', 'total_unread']);
1094 1094
         $userInfo = $user->toArray();
1095 1095
 
1096
-        $data['mweb_info'] = $this->curl_java_login($userInfo['phone'])['data'];
1096
+        $temp = $this->curl_java_login($userInfo['phone']);
1097
+        $data['mweb_info'] = [];
1098
+        if(isset($temp['data'])){
1099
+            $data['mweb_info'] = $temp['data'];
1100
+        }
1097 1101
         $data['merchant_info'] = [];
1098 1102
 
1099 1103
         return app('json')->success($data);