商品详情开启云发单增加版本区分

admin

2020-06-29 6c18ee356015bc0e1fd991d7c73bae38129f0fa2

商品详情开启云发单增加版本区分

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java

@@ -436,7 +436,7 @@
            

            // 云发单链接

            if (VersionUtil.greaterThan_2_1_2(acceptData.getPlatform(), acceptData.getVersion())) {

                boolean cloudOpen = configService.isRobotCloudOpen(ConfigKeyEnum.robotCloudOpen.getKey());

                boolean cloudOpen = configService.isRobotCloudOpen(ConfigKeyEnum.robotCloudOpen.getKey(),acceptData.getPlatform(), acceptData.getVersion());

                if (!cloudOpen && uid != null) {

                    List<String> testUsers = configService.getTestUsers();

                    if (testUsers != null && testUsers.contains(uid+"")) {


 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java

@@ -643,7 +643,7 @@
            } else if (list.size() > 0) { // 活动图片不允许跳转
                
                // 云发单是否开启
                boolean cloudOpen = configService.isRobotCloudOpen(ConfigKeyEnum.robotCloudOpenCircle.getKey());
                boolean cloudOpen = configService.isRobotCloudOpen(ConfigKeyEnum.robotCloudOpenCircle.getKey(),acceptData.getPlatform(), acceptData.getVersion());
                if (!cloudOpen && uid != null) {
                    List<String> testUsers = configService.getTestUsers();
                    if (testUsers != null && testUsers.contains(uid+"")) {

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java

@@ -1387,7 +1387,7 @@
     */

    private void getCloudInfo(AcceptData acceptData,Long uid, GoodsDetailVO goodsDetail, GoodsDetailExtraVO extraVO) {

        // 云发单是否开启

        boolean cloudOpen = configService.isRobotCloudOpen(ConfigKeyEnum.robotCloudOpenGoodsDetail.getKey());

        boolean cloudOpen = configService.isRobotCloudOpen(ConfigKeyEnum.robotCloudOpenGoodsDetail.getKey(),acceptData.getPlatform(),acceptData.getVersion());

        if (!cloudOpen && uid != null) {

            List<String> testUsers = configService.getTestUsers();

            if (testUsers != null && testUsers.contains(uid+"")) {


 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java

@@ -411,14 +411,14 @@
        data.put("left", gson.toJson(left));



        // 去网页

        String rightValue = configService.getByVersion(ConfigKeyEnum.clipboardRecommendGoodsMakeMore.name(),

        String rightValue = configService.getByVersion(ConfigKeyEnum.clipboardRecommendGoodsMakeMore.getKey(),

                acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));



        if (StringUtil.isNullOrEmpty(rightValue)) {

            data.remove("left");

        } else {

            params = new JSONObject();

            params.put("url", "http://www.baidu.com");

            params.put("url", rightValue);



            RecommendJumpInfoVO right = new RecommendJumpInfoVO("有更高返利？", jumpDetailV2Service.getByTypeCache("web",

                    Constant.getPlatformCode(acceptData.getPlatform()), Integer.parseInt(acceptData.getVersion())),


 fanli/src/main/java/com/yeshi/fanli/service/impl/config/ConfigServiceImpl.java

@@ -193,10 +193,10 @@
    }



    

    @Cacheable(value = "config", key = "'isRobotCloudOpen'+'-'+#key")

    @Cacheable(value = "config", key = "'isRobotCloudOpen'+'-'+#key+'-'+#platform+'-'+#version")

    @Override

    public boolean isRobotCloudOpen(String key) {

        String value = get(key);

    public boolean isRobotCloudOpen(String key,String platform,String version) {

        String value = getByVersion(key, platform,Integer.parseInt(version));

        if (StringUtil.isNullOrEmpty(value))

            return false;

        if ("1".equalsIgnoreCase(value.trim())) {

@@ -205,7 +205,6 @@
            return false;

        }

    }





    

    @Cacheable(value = "config", key = "'getTestUsers'")

@@ -221,8 +220,6 @@
        }

        return null;

    }

	
	
    

    

    


 fanli/src/main/java/com/yeshi/fanli/service/inter/config/ConfigService.java

@@ -125,7 +125,7 @@
     * @param uid

     * @return

     */

    public boolean isRobotCloudOpen(String key);

    public boolean isRobotCloudOpen(String key,String platform,String version);



    /**

     * 测试用户信息