Explorar o código

LANG接入系统发货。

hexiugang hai 5 meses
pai
achega
b494cbeaad

+ 12 - 2
watero-rst-web/src/main/java/com/iamberry/rst/controllers/mq/TaobaoTask.java

@@ -58,6 +58,10 @@ public class TaobaoTask {
      * 美塔璞儿淘宝店铺 rst id
      */
     public static final int STORE_ID_METAPURE = 186;
+    /**
+     * 美塔璞儿淘宝店铺 rst id
+     */
+    public static final int STORE_TB_LANG = 200;
 
     private static Logger logger = LoggerFactory.getLogger(TaobaoTask.class);
 
@@ -106,7 +110,7 @@ public class TaobaoTask {
         }
 
         // 同时拉取爱贝源和美塔璞儿的淘宝店铺
-        int[] storeIds = new int[]{STORE_ID_METAPURE, STORE_ID_IAMBERRY };
+        int[] storeIds = new int[]{STORE_ID_METAPURE, STORE_ID_IAMBERRY, STORE_TB_LANG};
         for (int storeId : storeIds) {
             // 销售公司 tb_rst_sales_company
             int salesCompanyId;
@@ -117,12 +121,18 @@ public class TaobaoTask {
                 if (iamberryTokenMap != null) {
                     token = (String) iamberryTokenMap.get("token");
                 }
-            } else {
+            } else if (storeId == STORE_ID_METAPURE){
                 salesCompanyId = 16;
                 Map<String, Object> metaureTokenMap = AdminTaobaoAuthController.getMetaureToken();
                 if (metaureTokenMap != null) {
                     token = (String)metaureTokenMap.get("token");
                 }
+            } else {
+                salesCompanyId = 19;
+                Map<String, Object> langTokenMap = AdminTaobaoAuthController.getLangToken();
+                if (langTokenMap != null) {
+                    token = (String)langTokenMap.get("token");
+                }
             }
             if (StringUtils.isEmpty(token)) {
                 continue;

+ 26 - 2
watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminTaobaoAuthController.java

@@ -86,6 +86,17 @@ public class AdminTaobaoAuthController {
         jdMetapureToken.put("name", "京东美塔璞儿认证");
         jdMetapureToken.put("type", "4");
         reuslt.add(jdMetapureToken);
+
+        // LANG企业店
+        Map<String, Object> taobaoLangToken = getLangToken();
+        if (taobaoLangToken == null || taobaoLangToken.size() == 0) {
+            taobaoLangToken = new HashMap<>();
+        }
+        taobaoLangToken.put("name", "Lang淘宝企业店");
+        taobaoLangToken.put("type", "5");
+        reuslt.add(taobaoLangToken);
+
+
         return new ModelAndView("taobao/token").addObject("result", reuslt);
     }
 
@@ -103,6 +114,14 @@ public class AdminTaobaoAuthController {
     public static Map<String, Object> getMetaureToken() {
         return getToken("TAOBAO_METAPURE_SESSION");
     }
+
+    /**
+     * 淘宝LANG
+     * @return
+     */
+    public static Map<String, Object> getLangToken() {
+        return getToken("TAOBAO_LANG_SESSION");
+    }
     
     public static Map<String, Object> getToken(String redisKey) {
         //淘宝授权token
@@ -166,13 +185,18 @@ public class AdminTaobaoAuthController {
             data.put("token", token);
             data.put("time", DateTimeUtil.addMinute(new Date(), (timeout/60)-30));
 
-            // type 1 爱贝源淘宝 3美塔璞儿淘宝
+            // type 1 爱贝源淘宝 3美塔璞儿淘宝 5LANG淘宝企业店
             String type = HREF_CACHE.get(state + "_type");
             if (StringUtils.isNotBlank(type)) {
                 if ("1".equals(type)) {
+                    // 爱贝源天猫
                     RedisUtils.put("TAOBAO_SESSION", JSONObject.toJSONString(data));
                 } else if ("3".equals(type)) {
+                    // 美塔天猫
                     RedisUtils.put("TAOBAO_METAPURE_SESSION", JSONObject.toJSONString(data));
+                } else {
+                    // LANG淘宝企业店
+                    RedisUtils.put("TAOBAO_LANG_SESSION", JSONObject.toJSONString(data));
                 }
                 HREF_CACHE.remove(state + "_type");
             }
@@ -192,7 +216,7 @@ public class AdminTaobaoAuthController {
     /**
      *
      * @param href
-     * @param type 1 爱贝源淘宝 3美塔璞儿淘宝
+     * @param type 1爱贝源淘宝 3美塔璞儿淘宝 5淘宝LANG
      * @return
      */
     @RequestMapping("/auth")

+ 2 - 0
watero-rst-web/src/main/webapp/WEB-INF/views/taobao/token.ftl

@@ -67,6 +67,8 @@
                                 <a title="重新授权" href="javascript:re_auth(3)" class="ml-5" style="text-decoration:none"><i class="Hui-iconfont">&#xe61d;</i></a>
                             <#elseif data.type == "4">
                                 <a title="重新授权" href="javascript:re_jd_auth(4)" class="ml-5" style="text-decoration:none"><i class="Hui-iconfont">&#xe61d;</i></a>
+                            <#elseif data.type == "5">
+                                <a title="重新授权" href="javascript:re_auth(5)" class="ml-5" style="text-decoration:none"><i class="Hui-iconfont">&#xe61d;</i></a>
                             </#if>
                         </td>
                     </tr>