gsb

5a350c38 · zhaoxiqing · c6e5346a · 5a350c38 · 5a350c38
Commit 5a350c38 authored Mar 14, 2020 by zhaoxiqing
Show whitespace changes
Inline Side-by-side

Showing with 100 additions and 14 deletions

bpo-admin/app/base/api/impl/channelApi.js
+8 -13

bpo-admin/package-lock.json
+92 -1

No files found.
--- a/bpo-admin/app/base/api/impl/channelApi.js
+++ b/bpo-admin/app/base/api/impl/channelApi.js
@@ -47,6 +47,7 @@ class ChannelApi {
                            rtn = await rc.post(this.FQURL, pushData);
                            console.log(pushData)
                            console.log(rtn)
+                            var result = JSON.parse(system.decryption(decodeURIComponent(pushData.param)));
                            if (rtn.success == true) {
                                result.contractNo = rtn.data.contractNo;
                                result.topush = "0";
@@ -68,13 +69,10 @@ class ChannelApi {
                            var rc = system.getObject("util.aliyunClient");
                            var rtn = null;
                            rtn = await rc.post(this.FQURL, pushData);
-<<<<<<< HEAD
                            console.log(pushData)
                            console.log(rtn)
-                            var result = JSON.parse(system.decryption(pushData.param));
+                            var result = JSON.parse(system.decryption(decodeURIComponent(pushData.param)));
-=======
                            // var result = JSON.parse(pushData.param);
->>>>>>> a6d535858f893769da85d53ab5812eeb279a410f
                            if (rtn.success == true) {
                                result.contractNo = rtn.data.contractNo;
                                result.topush = "0";
@@ -123,7 +121,9 @@ class ChannelApi {
            "idempotentSourceName": "BPO",// 来源编号，写死：BPO薪必果
            "thirdPartyChannelId": chnanel.channel_id.toString(),// 渠道id
            "thirdPartyCustomerId": chnanel.id.toString(),// 第三方客户id
-            "productId": "5e6b02cc3290c3000a3a63dc",// 云服产品id (测试环境)
+            // "productId": "5e6b02cc3290c3000a3a63dc",// 云服产品id (测试环境)
+            "productId": "5e6c89d54c52bf000a750bc5",// 云服产品id (生产环境)
            // "allotRatio":"50",// 分润比例(百分比的数字部分（如：50代表50%）)
            "orderPrice": da.deduct_amt,// 订单金额
            "productQuantity": "1",// 产品数量
@@ -137,13 +137,7 @@ class ChannelApi {
            "origin_merchant_id": chnanel.origin_merchant_id,//来源商户id
            "platform_channel_id": chnanel.platform_id,//对方渠道id
        };
-<<<<<<< HEAD
+        resultData.param = encodeURIComponent(system.encryption(System.encryption(JSON.stringify(str))));
-        let encry = system.encryption(JSON.stringify(str));
-        resultData.param = system.encryption(encry);
-=======
-        let encry = System.encryption(JSON.stringify(str));
-        resultData.param = encodeURIComponent(system.encryption(encry));
->>>>>>> a6d535858f893769da85d53ab5812eeb279a410f
        return resultData;
    }
@@ -154,7 +148,8 @@ class ChannelApi {
            "idempotentSourceName": "BPO",// 来源编号，写死：BPO薪必果
            "thirdPartyChannelId": chnanel.channel_id.toString(),// 渠道id
            "thirdPartyCustomerId": chnanel.id.toString(),// 第三方客户id
-            "productId": "5e6b02cc3290c3000a3a63dc",// 云服产品id (测试环境)
+           // "productId": "5e6b02cc3290c3000a3a63dc",// 云服产品id (测试环境)
+            "productId": "5e6c89d54c52bf000a750bc5",// 云服产品id (生产环境)
            // "allotRatio":"50",// 分润比例(百分比的数字部分（如：50代表50%）)
            "orderPrice": da.amt,// 订单金额
            "productQuantity": "1",// 产品数量

--- a/bpo-admin/package-lock.json
+++ b/bpo-admin/package-lock.json
@@ -4,6 +4,33 @@
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
+    "@alicloud/pop-core": {
+      "version": "1.7.9",
+      "resolved": "https://registry.npm.taobao.org/@alicloud/pop-core/download/@alicloud/pop-core-1.7.9.tgz",
+      "integrity": "sha1-l8DFu1kYlP7ah+ioLUXBF7673hM=",
+      "requires": {
+        "debug": "^3.1.0",
+        "httpx": "^2.1.2",
+        "json-bigint": "^0.2.3",
+        "kitx": "^1.2.1",
+        "xml2js": "^0.4.17"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npm.taobao.org/debug/download/debug-3.2.6.tgz",
+          "integrity": "sha1-6D0X3hbYp++3cX7b5fsQE17uYps=",
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz",
+          "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk="
+        }
+      }
+    },
    "@types/geojson": {
      "version": "1.0.6",
      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-1.0.6.tgz",
@@ -112,6 +139,17 @@
        "xml2js": "^0.4.16"
      }
    },
+    "aliyun-api-gateway": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npm.taobao.org/aliyun-api-gateway/download/aliyun-api-gateway-1.1.6.tgz",
+      "integrity": "sha1-C4vfHaF/GKFywq50G9kTHcA54a8=",
+      "requires": {
+        "babel-runtime": "^6.23.0",
+        "debug": "^2.6.0",
+        "httpx": "^2.1.1",
+        "uuid": "^3.0.0"
+      }
+    },
    "ansi-regex": {
      "version": "2.1.1",
      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
@@ -429,6 +467,11 @@
      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.47.tgz",
      "integrity": "sha512-9t9f7X3as2XGX8b52GqG6ox0GvIdM86LyIXASJnDCFhYNgt+A+MByQZ3W2PyMRZjEvG5f8TEbSPfEotVuMJnQg=="
    },
+    "bignumber.js": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npm.taobao.org/bignumber.js/download/bignumber.js-4.1.0.tgz",
+      "integrity": "sha1-228UBnwUC9RmJIFaeRbJLZtsJLE="
+    },
    "binary": {
      "version": "0.3.0",
      "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
@@ -1898,6 +1941,35 @@
        }
      }
    },
+    "httpx": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npm.taobao.org/httpx/download/httpx-2.2.3.tgz",
+      "integrity": "sha1-t+xOVMGUahPzrWY5SDzgO6KA+yQ=",
+      "requires": {
+        "@types/node": "^12.0.2",
+        "debug": "^4.1.1"
+      },
+      "dependencies": {
+        "@types/node": {
+          "version": "12.12.30",
+          "resolved": "https://registry.npm.taobao.org/@types/node/download/@types/node-12.12.30.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fnode%2Fdownload%2F%40types%2Fnode-12.12.30.tgz",
+          "integrity": "sha1-NQHm8JuVTenEBGcc79vMXZ18RfY="
+        },
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npm.taobao.org/debug/download/debug-4.1.1.tgz",
+          "integrity": "sha1-O3ImAlUQnGtYnO4FDx1RYTlmR5E=",
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz",
+          "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk="
+        }
+      }
+    },
    "humanize-ms": {
      "version": "1.2.1",
      "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz",
@@ -1973,6 +2045,11 @@
      "resolved": "https://registry.npmjs.org/is-bluebird/-/is-bluebird-1.0.2.tgz",
      "integrity": "sha1-CWQ5Bg9KpBGr7hkUOoTWpVNG1uI="
    },
+    "is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
+    },
    "is-builtin-module": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
@@ -2092,6 +2169,14 @@
      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
      "optional": true
    },
+    "json-bigint": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npm.taobao.org/json-bigint/download/json-bigint-0.2.3.tgz",
+      "integrity": "sha1-EY1/b/HThlnxn5TPc+ZKdaP5iKg=",
+      "requires": {
+        "bignumber.js": "^4.0.0"
+      }
+    },
    "json-schema": {
      "version": "0.2.3",
      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
@@ -2170,6 +2255,11 @@
      "resolved": "https://registry.npmjs.org/kareem/-/kareem-2.3.1.tgz",
      "integrity": "sha512-l3hLhffs9zqoDe8zjmb/mAN4B8VT3L56EUvKNqLFVs9YlFA+zx7ke1DO8STAdDyYNkeSo1nKmjuvQeI12So8Xw=="
    },
+    "kitx": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npm.taobao.org/kitx/download/kitx-1.3.0.tgz",
+      "integrity": "sha1-qz7nxZjSsdYp/VVWj4aMREDCAOo="
+    },
    "lazystream": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
@@ -4307,7 +4397,8 @@
          "integrity": "sha1-U6s41f48iJG6RlMp6iP6wFQBJvk=",
          "requires": {
            "charenc": "~0.0.1",
-            "crypt": "~0.0.1"
+            "crypt": "~0.0.1",
+            "is-buffer": "~1.1.1"
          }
        }
      }