Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/api/ProductApi.java

@@ -0,0 +1,15 @@
+package com.usoftchina.inquiry.api;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(url = "${b2b.product.base-url}", name = "product-server")
+@RequestMapping("/product")
+public interface ProductApi {
+
+    @PostMapping("/erp/save")
+    void saveProducts(@RequestParam("data") String data, @RequestParam("enUU")Long enUU);
+
+}

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/api/SearchUUApi.java

@@ -0,0 +1,32 @@
+package com.usoftchina.inquiry.api;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.Map;
+
+@FeignClient(url = "${b2b.uu.base-url}", name = "b2b-server")
+@RequestMapping("/public")
+public interface SearchUUApi {
+    /**
+     * 通过企业名称获取UU号, 全名称匹配
+     * @param data
+     * @return
+     */
+    @GetMapping("/queriable/batch/members")
+    Map<String, Map<String, Object>> queryEnterprises(@RequestParam("data") String data);
+
+    /**
+     * 按企业名称、简称、UU号等查找企业信息, 模糊匹配
+     * @param name
+     * @param shortName
+     * @param uu
+     * @return
+     */
+    @GetMapping("/queriable/members")
+    ModelMap queryEnterprise(@RequestParam("name") String name, @RequestParam("shortName") String shortName, @RequestParam("uu") Long uu);
+
+}

applications/transfers/mall-api/src/test/java/com/usoftchina/inquiry/test/ProductApiTest.java

@@ -0,0 +1,28 @@
+package com.usoftchina.inquiry.test;
+
+import com.usoftchina.inquiry.api.ProductApi;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.MethodSorters;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class ProductApiTest {
+
+    @Autowired
+    private ProductApi productApi;
+
+    @Test
+    public void testA_saveProduct(){
+        String data = "[{\"pr_code\":\"0204020020015\",\"pr_detail\":\"P沟道场效应管\",\"pr_id\":3057682,\"pr_ispubsale\":0,\"pr_ispurchase\":1,\"pr_issale\":1,\"pr_isshow\":0,\"pr_leadtime\":28.0,\"pr_ltinstock\":0.0,\"pr_spec\":\"WPM1485-6/TR,-7.4A,-12V,DFN8,SMD,无卤/WPM1485-6/TR/Will SEMI\",\"pr_unit\":\"PCS\",\"pr_zxbzs\":3000.0,\"pr_zxdhl\":3000.0},{\"pr_code\":\"B2B001\",\"pr_detail\":\"B2B平台测试\",\"pr_id\":50688771,\"pr_ispubsale\":0,\"pr_ispurchase\":1,\"pr_issale\":1,\"pr_isshow\":0,\"pr_leadtime\":0.0,\"pr_orispeccode\":\"LMK01020ISQX/NOPB\",\"pr_spec\":\"B2B平台测试01\",\"pr_unit\":\"PCS\",\"pr_uuid\":\"1200200000000521\",\"pr_zxbzs\":0.0,\"pr_zxdhl\":0.0}]";
+        Long enUU = 10050573L;
+        productApi.saveProducts(data, enUU);
+        System.out.println("success");
+    }
+
+}

applications/transfers/mall-api/src/test/java/com/usoftchina/inquiry/test/SearchUUApiTest.java

@@ -0,0 +1,47 @@
+package com.usoftchina.inquiry.test;
+
+import com.usoftchina.inquiry.api.SearchUUApi;
+import com.usoftchina.saas.utils.CollectionUtils;
+import com.usoftchina.saas.utils.JsonUtils;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.MethodSorters;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.ui.ModelMap;
+
+import java.util.Map;
+
+/**
+ * @Description 获取UU号测试
+ * @Author chenwei
+ * @Date 2019/01/09
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class SearchUUApiTest {
+
+    @Autowired
+    private SearchUUApi searchUUApi;
+
+    @Test
+    public void testA_queryEnterprises(){
+        String enterpriseName = "祝通鸿2";
+        Map<String, Map<String, Object>> resultMap = searchUUApi.queryEnterprises(enterpriseName);
+        if (CollectionUtils.isEmpty(resultMap)){
+            System.out.println("empty result!");
+        }
+        System.out.println(JsonUtils.toJsonString(resultMap));
+    }
+
+    @Test
+    public void testB_queryEnterprise(){
+        String enterpriseName = "陈炜测试企业";
+        ModelMap modelMap = searchUUApi.queryEnterprise(enterpriseName, null, null);
+        System.out.println(JsonUtils.toJsonString(modelMap));
+    }
+
+}

applications/transfers/mall-api/src/test/resources/application.yml

@@ -2,4 +2,8 @@ b2b:
   inquiry:
     base-url: https://test-inquiry.uuzcc.cn
   Component:
-    base-url: https://test-mall.uuzcc.cn
+    base-url: https://test-mall.uuzcc.cn
+  product:
+    base-url: http://test-product.uuzcc.cn
+  uu:
+    base-url: https://test-b2b.uuzcc.cn