分享bug修改

admin

2020-03-15 84c7c35ed23d72b590ad63196cb5add6fcce277b

分享bug修改

 fanli/src/main/java/com/yeshi/fanli/controller/TestController.java

@@ -462,4 +462,9 @@
        data.put("waiters", jedisPool.getNumWaiters());

        out.print(data.toString());

    }

	
	
	
	
	
}


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

@@ -561,15 +561,14 @@
                                taoBaoLink.getGoods(), shareInfo.getToken()));
            }

            if (VersionUtil.greaterThan_2_0_7(platform, version)) {
                shareInfo.setWxErCode(
                        getERCodeContentNew(configService.get(ConfigKeyEnum.quickShareTBCommentText.getKey()),
            // if (VersionUtil.greaterThan_2_0_7(platform, version)) {
            // shareInfo.setWxErCode(
            // getERCodeContentNew(configService.get(ConfigKeyEnum.quickShareTBCommentText.getKey()),
            // taoBaoLink.getGoods(), shareInfo.getToken()));
            // } else {
            shareInfo.setWxErCode(getERCodeContentNew(configService.get(ConfigKeyEnum.taobaoShareQrcodeText.getKey()),
                                taoBaoLink.getGoods(), shareInfo.getToken()));
            } else {
                shareInfo.setWxErCode(
                        getERCodeContentNew(configService.get(ConfigKeyEnum.taobaoShareQrcodeText.getKey()),
                                taoBaoLink.getGoods(), shareInfo.getToken()));
            }
            // }

            // 提示图文内容
            String imgs = configService.getByVersion(ConfigKeyEnum.goodsShareNotifyImgs.getKey(), platform,
@@ -611,7 +610,11 @@
                if (!coupon) {
                    recommendText = recommendText.replace("推荐理由:[推荐语]", "");
                } else {
                    if (!StringUtil.isNullOrEmpty(goods.getDescription())) {
                    recommendText = recommendText.replace("[推荐语]", goods.getDescription());
                    } else {
                        recommendText = recommendText.replace("推荐理由:[推荐语]", "");
                    }
                }

                String sales = TaoBaoUtil.getSaleCount(taoBaoLink.getGoods().getBiz30day());
@@ -1531,7 +1534,7 @@

        String template = configService.get(ConfigKeyEnum.quickShareGoodsText.getKey());
        template = template.replace("[商品标题]", goodsDetail.getTitle()).replace("[销量]", goodsDetail.getSalesCount());
        if (StringUtil.isNullOrEmpty(goodsDetail.getDescription())) {
        if (!StringUtil.isNullOrEmpty(goodsDetail.getDescription())) {
            template = template.replace("[推荐语]", goodsDetail.getDescription());
        } else {
            template = template.replace("推荐语:[推荐语]", "");

 pom.xml

@@ -15,6 +15,7 @@
        <org.hibernate.version>4.1.2</org.hibernate.version>

        <org.springframework-version>4.3.0.RELEASE</org.springframework-version>

        <mybatis.version>3.4.1</mybatis.version>

        <spring.mongodb.version>1.9.8.RELEASE</spring.mongodb.version>

    </properties>

    <profiles>

        <profile>

@@ -470,19 +471,19 @@
        <dependency>

            <groupId>org.springframework.data</groupId>

            <artifactId>spring-data-mongodb</artifactId>

            <version>1.7.1.RELEASE</version>

            <version>${spring.mongodb.version}</version>

        </dependency>



        <dependency>

            <groupId>org.springframework.data</groupId>

            <artifactId>spring-data-mongodb-cross-store</artifactId>

            <version>1.7.1.RELEASE</version>

            <version>${spring.mongodb.version}</version>

        </dependency>



        <dependency>

            <groupId>org.springframework.data</groupId>

            <artifactId>spring-data-mongodb-log4j</artifactId>

            <version>1.7.1.RELEASE</version>

            <version>1.10.17.RELEASE</version>

        </dependency>



        <!-- https://mvnrepository.com/artifact/com.googlecode.json-simple/json-simple -->