Merge branch 'feat_subOrder_221128' into 'master'

Feat sub order 221128

See merge request !6

packages/toolkit/package.json

 {
   "name": "@ydl-packages/toolkit",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "",
   "main": "./dist/index.umd.js",
   "scripts": {

packages/toolkit/src/Payment/API.ts

 let BASE_URL_JAVA = "";
 let BASE_GATEWAY = "";
-const isDev = typeof window !== 'undefined' ? window.location.hostname.indexOf("dev") > -1 : false;
-const isTest = typeof window !== 'undefined' ? window.location.hostname.indexOf("test") > -1 : false;
-const isLocal = typeof window !== 'undefined' ? window.location.hostname.indexOf("localhost") > -1 : false;
-if(isDev || isTest || isLocal){
-    BASE_URL_JAVA = 'https://testapi.ydl.com';
-    BASE_GATEWAY = 'https://testapp2.yidianling.com'
-}
-else{
+const isTest = typeof window !== 'undefined' ? window.location.hostname.indexOf("-test") > -1 : false;
+const isProd = typeof window !== 'undefined' ? (window.location.hostname.indexOf("dev") == -1 && window.location.hostname.indexOf("test") == -1 && window.location.hostname.indexOf("localhost") == -1 && window.location.hostname.indexOf("127.0.0.1") == -1) : false;
+if(isProd){
     BASE_URL_JAVA = 'https://api.ydl.com';
     BASE_GATEWAY = 'https://app2.yidianling.com'
 }
+else if(isTest){
+    BASE_URL_JAVA = 'https://api-test.ydl.com';
+    BASE_GATEWAY = 'https://app2-test.ydl.com'
+}
+else{
+    BASE_URL_JAVA = 'https://testapi.ydl.com';
+    BASE_GATEWAY = 'https://testapp2.yidianling.com'
+}
 /**
  * doc: http://47.96.181.183:8806/api/swagger-ui.html#!/finance45v45245controller/doUnityPayUsingPOST
  */

packages/toolkit/src/Payment/Defined.ts

@@ -74,7 +74,8 @@ export enum PayChannel {
 
 export type ToPayParams = {
     orderId: number;
-    totalAmount: number
+    subOrderIds?: string;
+    totalAmount: number;
     payType: PayType;
     /**
      * 支付宝h5支付失败回调地址

packages/toolkit/src/Payment/Payment.ts

@@ -189,7 +189,7 @@ export class Payment {
     } 
 
     async toPay(params: ToPayParams): Promise<ToPayReturns> {
-        const {totalAmount, payType, returnUrl, orderId, redirectUrl} = params
+        const {totalAmount, payType, returnUrl, orderId, subOrderIds, redirectUrl} = params
         let quitUrl = params.quitUrl
         // validate start >>>
         switch (payType) {
@@ -258,7 +258,8 @@ export class Payment {
             orderId,
             payType,
             payAmount, 
-            payBalance
+            payBalance,
+            subOrderIds
         }
         if (payChannel !== null) {
             doUnifiedParams.payChannel = payChannel