Merge branch 'hotfix/20210718-jdEnumFix' into 'master'

京东枚举，默认波司登问题修复。

See merge request !11

src/main/java/cn/com/duiba/jdactivity/controller/Open2DuibaController.java

@@ -190,17 +190,20 @@ public class Open2DuibaController {
             String redirectUrl = autologinParam.getRedirectUrl();
             String env = autologinParam.getEnv();
 
-            // 京东店铺
-            JdShopEnum jdShopEnum = Optional
-                    .ofNullable(JdShopEnum.getJdShop(autologinParam.getVenderId(), autologinParam.getShopId()))
-                    .orElse(JdShopEnum.BOSIDENG);
+            Long venderId = autologinParam.getVenderId();
+            Long shopId = autologinParam.getShopId();
+            if (venderId == null && shopId == null) {
+                //最开始波司登无这两个参数
+                venderId = JdShopEnum.BOSIDENG.getVenderId();
+                shopId = JdShopEnum.BOSIDENG.getShopId();
+            }
 
             // 兑吧应用
             DuibaAppEnum duibaApp = Optional
                     .ofNullable(DuibaAppEnum.getDuibaApp(autologinParam.getAppKey()))
                     .orElse(DuibaAppEnum.BOSIDENG_PROD);
 
-            TbShopAccessTokenDto accessToken = accessTokenUtils.getAccessTokenWithCache(jdShopEnum.getVenderId(), jdShopEnum.getShopId());
+            TbShopAccessTokenDto accessToken = accessTokenUtils.getAccessTokenWithCache(venderId, shopId);
             LOGGER.info("获取accessToken,结果={}", JSON.toJSONString(accessToken));
 
             JdAppEnum appByAppKey = JdAppEnum.getAppByAppKey(accessToken.getAppKey());