@etsoo/smarterp-core 1.1.3 → 1.1.4

package/lib/cjs/PublicApi.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PublicApi = void 0;
 const shared_1 = require("@etsoo/shared");
+const PlaceQueryRQ_1 = require("./rq/public/PlaceQueryRQ");
 const appscript_1 = require("@etsoo/appscript");
 const unitPrefix = "unit";
 /**
@@ -154,8 +155,32 @@ class PublicApi extends appscript_1.BaseApi {
      * @param payload Payload
      * @returns Result
      */
-    queryPlace(rq, payload) {
-        return this.api.post("Public/QueryPlace", rq, payload);
+    async queryPlace(rq, payload) {
+        // For simplified Chinese, or CN region, use China map
+        if (rq.provider === null &&
+            (rq.language === "zh-Hans" ||
+                rq.language === "zh-CN" ||
+                rq.region === "CN")) {
+            // Amap first
+            const amapRq = {
+                ...rq,
+                region: undefined,
+                provider: PlaceQueryRQ_1.ApiProvider.Amap
+            };
+            const amapResult = await this.api.post("Public/QueryPlace", amapRq, payload);
+            if (amapResult && amapResult.length > 0)
+                return amapResult;
+            // Baidu
+            const baiduRq = {
+                ...rq,
+                region: undefined,
+                provider: PlaceQueryRQ_1.ApiProvider.Baidu
+            };
+            const baiduResult = await this.api.post("Public/QueryPlace", baiduRq, payload);
+            if (baiduResult && baiduResult.length > 0)
+                return baiduResult;
+        }
+        return await this.api.post("Public/QueryPlace", rq, payload);
     }
     /**
      * Read member invitation

package/lib/cjs/rq/public/PlaceQueryRQ.d.ts

@@ -12,8 +12,21 @@ export declare enum ApiOutput {
  * 接口供应商
  */
 export declare enum ApiProvider {
+    /**
+     * Google Maps
+     * 谷歌地图
+     */
     Google = 0,
-    Baidu = 1
+    /**
+     * Baidu Maps
+     * 百度地图
+     */
+    Baidu = 1,
+    /**
+     * Amap
+     * 高德地图
+     */
+    Amap = 2
 }
 /**
  * Place query request

package/lib/cjs/rq/public/PlaceQueryRQ.js

@@ -16,6 +16,19 @@ var ApiOutput;
  */
 var ApiProvider;
 (function (ApiProvider) {
+    /**
+     * Google Maps
+     * 谷歌地图
+     */
     ApiProvider[ApiProvider["Google"] = 0] = "Google";
+    /**
+     * Baidu Maps
+     * 百度地图
+     */
     ApiProvider[ApiProvider["Baidu"] = 1] = "Baidu";
+    /**
+     * Amap
+     * 高德地图
+     */
+    ApiProvider[ApiProvider["Amap"] = 2] = "Amap";
 })(ApiProvider || (exports.ApiProvider = ApiProvider = {}));

package/lib/mjs/PublicApi.js

@@ -1,4 +1,5 @@
 import { DataTypes } from "@etsoo/shared";
+import { ApiProvider } from "./rq/public/PlaceQueryRQ";
 import { BaseApi, ProductUnit, RepeatOption } from "@etsoo/appscript";
 const unitPrefix = "unit";
 /**
@@ -151,8 +152,32 @@ export class PublicApi extends BaseApi {
      * @param payload Payload
      * @returns Result
      */
-    queryPlace(rq, payload) {
-        return this.api.post("Public/QueryPlace", rq, payload);
+    async queryPlace(rq, payload) {
+        // For simplified Chinese, or CN region, use China map
+        if (rq.provider === null &&
+            (rq.language === "zh-Hans" ||
+                rq.language === "zh-CN" ||
+                rq.region === "CN")) {
+            // Amap first
+            const amapRq = {
+                ...rq,
+                region: undefined,
+                provider: ApiProvider.Amap
+            };
+            const amapResult = await this.api.post("Public/QueryPlace", amapRq, payload);
+            if (amapResult && amapResult.length > 0)
+                return amapResult;
+            // Baidu
+            const baiduRq = {
+                ...rq,
+                region: undefined,
+                provider: ApiProvider.Baidu
+            };
+            const baiduResult = await this.api.post("Public/QueryPlace", baiduRq, payload);
+            if (baiduResult && baiduResult.length > 0)
+                return baiduResult;
+        }
+        return await this.api.post("Public/QueryPlace", rq, payload);
     }
     /**
      * Read member invitation

package/lib/mjs/rq/public/PlaceQueryRQ.d.ts

@@ -12,8 +12,21 @@ export declare enum ApiOutput {
  * 接口供应商
  */
 export declare enum ApiProvider {
+    /**
+     * Google Maps
+     * 谷歌地图
+     */
     Google = 0,
-    Baidu = 1
+    /**
+     * Baidu Maps
+     * 百度地图
+     */
+    Baidu = 1,
+    /**
+     * Amap
+     * 高德地图
+     */
+    Amap = 2
 }
 /**
  * Place query request

package/lib/mjs/rq/public/PlaceQueryRQ.js

@@ -13,6 +13,19 @@ export var ApiOutput;
  */
 export var ApiProvider;
 (function (ApiProvider) {
+    /**
+     * Google Maps
+     * 谷歌地图
+     */
     ApiProvider[ApiProvider["Google"] = 0] = "Google";
+    /**
+     * Baidu Maps
+     * 百度地图
+     */
     ApiProvider[ApiProvider["Baidu"] = 1] = "Baidu";
+    /**
+     * Amap
+     * 高德地图
+     */
+    ApiProvider[ApiProvider["Amap"] = 2] = "Amap";
 })(ApiProvider || (ApiProvider = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/smarterp-core",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "TypeScript APIs for SmartERP Core",
   "main": "lib/cjs/index.js",
   "module": "lib/mjs/index.js",

package/src/PublicApi.ts

@@ -4,7 +4,7 @@ import { PinyinRQ } from "./rq/public/PinyinRQ";
 import { CreateBarcodeRQ } from "./rq/public/CreateBarcodeRQ";
 import { CurrencyItem } from "./dto/public/CurrencyItem";
 import { RegionData } from "./dto/public/RegionData";
-import { PlaceQueryRQ } from "./rq/public/PlaceQueryRQ";
+import { ApiProvider, PlaceQueryRQ } from "./rq/public/PlaceQueryRQ";
 import { PlaceCommon } from "./dto/public/PlaceCommon";
 import {
   BaseApi,
@@ -192,8 +192,46 @@ export class PublicApi extends BaseApi {
    * @param payload Payload
    * @returns Result
    */
-  queryPlace(rq: PlaceQueryRQ, payload?: IApiPayload<PlaceCommon[]>) {
-    return this.api.post("Public/QueryPlace", rq, payload);
+  async queryPlace(rq: PlaceQueryRQ, payload?: IApiPayload<PlaceCommon[]>) {
+    // For simplified Chinese, or CN region, use China map
+    if (
+      rq.provider === null &&
+      (rq.language === "zh-Hans" ||
+        rq.language === "zh-CN" ||
+        rq.region === "CN")
+    ) {
+      // Amap first
+      const amapRq: PlaceQueryRQ = {
+        ...rq,
+        region: undefined,
+        provider: ApiProvider.Amap
+      };
+
+      const amapResult = await this.api.post(
+        "Public/QueryPlace",
+        amapRq,
+        payload
+      );
+
+      if (amapResult && amapResult.length > 0) return amapResult;
+
+      // Baidu
+      const baiduRq: PlaceQueryRQ = {
+        ...rq,
+        region: undefined,
+        provider: ApiProvider.Baidu
+      };
+
+      const baiduResult = await this.api.post(
+        "Public/QueryPlace",
+        baiduRq,
+        payload
+      );
+
+      if (baiduResult && baiduResult.length > 0) return baiduResult;
+    }
+
+    return await this.api.post("Public/QueryPlace", rq, payload);
   }
 
   /**

package/src/rq/public/PlaceQueryRQ.ts

@@ -14,8 +14,23 @@ export enum ApiOutput {
  * 接口供应商
  */
 export enum ApiProvider {
+  /**
+   * Google Maps
+   * 谷歌地图
+   */
   Google,
-  Baidu
+
+  /**
+   * Baidu Maps
+   * 百度地图
+   */
+  Baidu,
+
+  /**
+   * Amap
+   * 高德地图
+   */
+  Amap
 }
 
 /**