Merge branch 'dev' into dev-sxb

app/common/repositories/user/UserRepository.php

@@ -4495,6 +4495,12 @@ class UserRepository extends BaseRepository
      */
     public function createUserOperatingRecord($uid, $model, $type, $mark)
     {
+        $exists = Db::name('user_operating_record')
+            ->where('uid', $uid)
+            ->value('id');
+        if ($exists) {
+            return;
+        }
         Db::name('user_operating_record')->insert([
             'uid' => $uid,
             'operation_model' => $model,

app/controller/api/Auth.php

@@ -1421,9 +1421,6 @@ class Auth extends BaseController
             if ($num > 9) {
                 if (!$data['code'])
                     return app('json')->make(402, '操作过于频繁，请稍后重试~');
-                if (!$this->smslogin($data['phone'], $data['code'])) {
-                    return app('json')->fail('登录验证码输入有误');
-                }
             }
         }
 
@@ -1439,9 +1436,6 @@ class Auth extends BaseController
             if ($num > 9) {
                 if (!$data['code'])
                     return app('json')->make(402, '操作过于频繁，请稍后重试~');
-                if (!$this->registersmscode($data['phone'], $data['code'])) {
-                    return app('json')->fail('注册验证码输入有误');
-                }
             }
         }
         $sms_key = 'api.auth.sms.' . $data['phone'];

app/controller/api/store/product/Vip.php

@@ -50,7 +50,7 @@ class Vip extends BaseController
      * $params  参数
      * $request  应用级参数
      * */
-    public function getUrlResult($apiName, $method, $request = [])
+    public function getUrlResult($apiName, $method, $request = [], $version = '1.0.0')
     {
         if (empty($apiName)) {
             return false;
@@ -60,7 +60,7 @@ class Vip extends BaseController
         $requestParams = [
             'service' => $apiName,
             'method' => $method,
-            'version' => "1.0.0",
+            'version' => $version,
             'format' => 'JSON',
             'appKey' => "68979f85",
             'timestamp' => time(),
@@ -805,10 +805,10 @@ class Vip extends BaseController
             'requestId' => microtime(true) . rand(1000, 9999)
         ]);
         $orderLists = [];
-        $apiName = 'com.vip.adp.api.open.service.UnionOrderService';
+        $apiName = 'com.vip.adp.api.open.service.UnionOrderV2Service';
         do {
             $request = ['queryModel' => $queryModel];
-            $result = $this->getUrlResult($apiName, "orderList", $request);
+            $result = $this->getUrlResult($apiName, "orderList", $request, '2.0.0');
             log::info("vip===返回订单数据");
             log::info($result);
             $lists = $result['result']['orderInfoList'] ?? [];