Merge remote-tracking branch 'origin/dev' into dev

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'] ?? [];

app/controller/api/store/service/Huafei.php

@@ -185,7 +185,9 @@ class Huafei extends BaseController
 			}else{
 				return app('json')->fail('创建话费充值预支付订单失败');
 			}
-		}else{
+        } elseif ($verify['code'] == '1004') {
+            return app('json')->fail('各位用户您好：因中国移动充值端口升级，目前暂时无法使用，恢复充值需要等待官方通知，感谢理解');
+        } else {
 			return app('json')->fail($verify['msg'].'MSG');
 		}
     }