商品详情

yujian

2019-07-17 fe16122ad77ccd69c7f3c6dfff123c0c3aa3d35f

商品详情

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

@@ -70,7 +70,7 @@
import com.yeshi.fanli.vo.goods.GoodsDetailVO;

import com.yeshi.fanli.vo.goods.MoneyInfoVO;

import com.yeshi.fanli.vo.goods.OtherInfo;

import com.yeshi.fanli.vo.goods.ShareInfoVO;

import com.yeshi.fanli.vo.goods.ShareVO;

import com.yeshi.fanli.vo.msg.ClientTextStyleVO;

import com.yeshi.fanli.vo.tlj.ReduceHongBao;

import com.yeshi.fanli.vo.tlj.SpreadHongBao;

@@ -160,13 +160,13 @@
     */

    @RequestMapping(value = "getDetail", method = RequestMethod.POST)

    public void getDetail(AcceptData acceptData, Long id, Integer goodsType, Long uid, String from, PrintWriter out) {

        if (id == null || goodsType == null) {

            out.print(JsonUtil.loadFalseResult(1, "商品id和商品平台不能为空"));

        if (id == null) {

            out.print(JsonUtil.loadFalseResult(1, "商品id不能为空"));

            return;

        }



        // 淘宝商品

        if (Constant.SOURCE_TYPE_TAOBAO == goodsType) {

        if (goodsType == null || Constant.SOURCE_TYPE_TAOBAO == goodsType) {

            getTaoBaoGoodsDetial(acceptData, id, uid, from, out);

            return;

        }

@@ -347,10 +347,10 @@
        

        BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

        BigDecimal shareRate = hongBaoManageService.getShareRate();

        GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertTaoBao(tb, null, fanLiRate, shareRate);

        GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertTaoBao(goods, null, fanLiRate, shareRate);

        

        // 店铺信息

        TaoBaoShop shop = taoBaoShopService.getTaoBaoShop(goods.getAuctionId(), goods.getSellerId());

        TaoBaoShop shop = taoBaoShopService.getTaoBaoShop(id, goods.getSellerId());

        if (shop != null) {

            String shopLink = shop.getShopLink();

            if (StringUtil.isNullOrEmpty(shopLink)) {

@@ -537,7 +537,7 @@
        

        // 分享路径

        String shareUrl = String.format("%s?id=" + id, Constant.systemCommonConfig.getAppShareInfoUrl());

        ShareInfoVO shareInfoVO = new ShareInfoVO();

        ShareVO shareInfoVO = new ShareVO();

        shareInfoVO.setUrl(shareUrl);

        shareInfoVO.setHelpLink(helpLink);

        extraVO.setShare(shareInfoVO);

@@ -665,7 +665,7 @@
        // 分享路径

        String shareUrl = String.format("%s?id=" + jdGoods.getSkuId(),

                Constant.systemCommonConfig.getAppShareInfoUrl());

        ShareInfoVO shareInfoVO = new ShareInfoVO();

        ShareVO shareInfoVO = new ShareVO();

        shareInfoVO.setUrl(shareUrl);

        shareInfoVO.setHelpLink(helpLink);

        extraVO.setShare(shareInfoVO);

@@ -777,7 +777,7 @@
        }

        // 分享路径

        String shareUrl = String.format("%s?id=" + id, Constant.systemCommonConfig.getAppShareInfoUrl());

        ShareInfoVO shareInfoVO = new ShareInfoVO();

        ShareVO shareInfoVO = new ShareVO();

        shareInfoVO.setUrl(shareUrl);

        shareInfoVO.setHelpLink(helpLink);

        extraVO.setShare(shareInfoVO);


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

@@ -76,7 +76,6 @@
import net.sf.json.JSONArray;

import net.sf.json.JSONObject;





@Controller

@RequestMapping("api/v2/share")

public class ShareControllerV2 {

@@ -141,144 +140,20 @@
    @Resource

    private UserTaoLiJinRecordService userTaoLiJinRecordService;





    /**

     * 获取分享记录中的商品 分享信息

     * 获取淘宝的分享链接

     * 

     * @param acceptData

     * @param recordId

     * @param out

     */

    @RequestMapping(value = "getShareGoods")

    public void getShareGoods(AcceptData acceptData, Long recordId, PrintWriter out) {



        if (recordId == null) {

            out.print(JsonUtil.loadFalseResult("参数不正确"));

            return;

        }



        try {

            JSONArray array = new JSONArray();

            JSONObject data = new JSONObject();



            List<UserShareGoodsGroup> list = userShareGoodsGroupService.listByRecordId(recordId);

            if (list == null || list.size() == 0) {

                data.put("title", "分享商品");

                data.put("count", 0);

                data.put("result_list", array);

                out.print(JsonUtil.loadTrueResult(data));

                return;

            }



            // API网络接口验证是否在售

            List<TaoBaoGoodsBrief> listTaoKeGoods = null;

            List<Long> listGid = new ArrayList<Long>();

            for (UserShareGoodsGroup goodsGroup : list) {

                CommonGoods commonGoods = goodsGroup.getCommonGoods();

                if (commonGoods == null || commonGoods.getGoodsType() != Constant.SOURCE_TYPE_TAOBAO) {

                    continue;

                }

                listGid.add(commonGoods.getGoodsId());

            }

			
            if (listGid.size() > 0) {

                try {

                    listTaoKeGoods = TaoKeApiUtil.getBatchGoodsInfo(listGid);

                } catch (TaoKeApiException e) {

                    e.printStackTrace();

                } catch (TaobaoGoodsDownException e) {

                    e.printStackTrace();

                } catch (Exception e) {

                    e.printStackTrace();

                }

            }



            Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

                    .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();



            BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

            BigDecimal shareRate = hongBaoManageService.getShareRate();



            for (UserShareGoodsGroup goodsGroup : list) {

                CommonGoods commonGoods = goodsGroup.getCommonGoods();

                if (commonGoods == null) {

                    continue;

                }



                if (listTaoKeGoods != null && listTaoKeGoods.size() > 0

                        && commonGoods.getGoodsType() == Constant.SOURCE_TYPE_TAOBAO) {



                    int state = 1; // 默认停售

                    Long goodsId = commonGoods.getGoodsId();

                    for (TaoBaoGoodsBrief taoKeGoods : listTaoKeGoods) {

                        Long auctionId = taoKeGoods.getAuctionId();

                        if (goodsId == auctionId || goodsId.equals(auctionId)) {

                            state = 0; // 在售

                            break;

                        }

                    }

                    commonGoods.setState(state);

                }



                // 今日浏览记录处理

                Date date = new Date();

                Date browseTime = goodsGroup.getBrowseTime();

                if (!DateUtil.isSameDay(browseTime, date)) {

                    goodsGroup.setTodayBrowse(0); // 不是同一天浏览记录设置0

                }



                JSONObject dataObject = new JSONObject();

                dataObject.put("todayBrowse", goodsGroup.getTodayBrowse());

                dataObject.put("totalBrowse", goodsGroup.getTotalBrowse());

                dataObject.put("totalOrder", goodsGroup.getTotalOrder());

                dataObject.put("totalMoney", "¥" + goodsGroup.getTotalMoney());



                GoodsDetailVO detailVO = GoodsDetailVOFactory.convertCommonGoods(commonGoods, null, fanLiRate,

                        shareRate);

                detailVO.setId(commonGoods.getId());

                dataObject.put("goods", gson.toJson(detailVO));

                array.add(dataObject);

            }



            String title = "";

            UserShareGoodsRecord userShareGoodsRecord = userShareGoodsRecordService.selectByPrimaryKey(recordId);

            if (userShareGoodsRecord != null) {

                title = userShareGoodsRecord.getTitle();

            }



            data.put("title", title);

            data.put("count", list.size());

            data.put("result_list", array);

            out.print(JsonUtil.loadTrueResult(data));

        } catch (Exception e) {

            out.print(JsonUtil.loadFalseResult("加载失败"));

            e.printStackTrace();

        }

    }

	
	
	
    /**

     * 创建分享

     * @param acceptData

     * @param uid

     * @param auctionId

     * @param source

     * @param totalNum

     * @param goodsType

     * @param request

     * @param uid        -用户ID

     * @param            auctionId-商品ID

     * @param out

     */

    @RequestMapping(value = "createShareInfo")

    public void createShareInfo(AcceptData acceptData, Long uid, Long goodsId, String source, Integer totalNum,

            Integer goodsType, HttpServletRequest request, PrintWriter out) {



        if (uid == null || uid <= 0) {

            out.print(JsonUtil.loadFalseResult(1, "用户ID不能为空"));

            return;

        }

		
        if (goodsId == null || goodsId <= 0) {

            out.print(JsonUtil.loadFalseResult(2, "商品ID不能为空"));

            return;

        }



@@ -288,26 +163,54 @@
            return;

        }



        if (goodsType == null) {

            goodsType = Constant.SOURCE_TYPE_TAOBAO;

        if (goodsId == null || goodsId <= 0) {

            out.print(JsonUtil.loadFalseResult(2, "商品ID不能为空"));

            return;

        }

        

        if (goodsType == Constant.SOURCE_TYPE_JD) {

        // 淘宝

        if (goodsType == null || goodsType == Constant.SOURCE_TYPE_TAOBAO) {

            createTaoBaoShare(acceptData, uid, goodsId, totalNum, source, request, out);

            return;

        }



            // 京东 

        if (goodsType == Constant.SOURCE_TYPE_JD) {

            createJDShare(acceptData, uid, goodsId, source, out);

            return;

        } else if (goodsType == Constant.SOURCE_TYPE_PDD) {

        }



            // 拼多多 

        if (goodsType == Constant.SOURCE_TYPE_PDD) {

            createPDDShare(acceptData, uid, goodsId, source, out);

            return;

        }

    }

        



    /**

     * 创建淘宝分享信息

     * @param acceptData

     * @param uid

     * @param goodsId

     * @param totalNum

     * @param source

     * @param request

     * @param out

     */

    public void createTaoBaoShare(AcceptData acceptData, Long uid, Long goodsId, Integer totalNum, String source,

            HttpServletRequest request, PrintWriter out) {



        UserExtraTaoBaoInfo extraInfo = userExtraTaoBaoInfoService.getByUid(uid);

        String relationId = null;

        if (extraInfo != null && extraInfo.getRelationId() != null && extraInfo.getRelationValid() != null

                && extraInfo.getRelationValid() == true)

            relationId = extraInfo.getRelationId();



        if (StringUtil.isNullOrEmpty(relationId)) {

            out.print(JsonUtil.loadFalseResult(3, "淘宝未授权，请前往\"我的\"绑定淘宝账号"));

            return;

        }

        

        if (source != null && "taolijin".equals(source)) {

            createTaoLijin(uid, goodsId, totalNum, relationId, request, out);

@@ -329,13 +232,12 @@


            data.put("clickUrl", url);

            data.put("token", taoBaoLink.getTaoToken());

            data.put("rule", configService.get("share_rule_link_tb"));

            data.put("rule", configService.get("share_single_goods_rule"));

            data.put("pictUrl", TbImgUtil.getTBSizeImg(taoBaoLink.getGoods().getPictUrl(), 500));



            String shareText = "";

            // 无券

            String shopType = taoBaoLink.getGoods().getUserType() == 0 ? "淘宝价" : "天猫价";



            

            if (StringUtil.isNullOrEmpty(taoBaoLink.getGoods().getCouponInfo())) {

                String text = shareGoodsTextTemplateService.getCommonTemplate(uid);

@@ -378,7 +280,8 @@


            data.put("shareMoney", "¥" + shareMoney.toString());

            try {

                ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid, goodsId, Constant.SOURCE_TYPE_TAOBAO);

                ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid, goodsId,

                        Constant.SOURCE_TYPE_TAOBAO);

                data.put("shareId", shareRecord.getRedisKey());

            } catch (Exception e) {

                try {

@@ -416,7 +319,7 @@
            });

            return;

        } catch (ShareGoodsException e) {

            LogHelper.errorDetailInfo(e, "分享出错:uid:"+uid+"auctionId:"+goodsId, "");

            LogHelper.errorDetailInfo(e, "分享出错:uid:" + uid + " goodsId:" + goodsId, "");

            // 分享出错报警

            try {

                monitorService.addClientAPIMonitor(MonitorFactory.createClientAPI(request, e.getCode(), 0, "分享出错"));

@@ -425,11 +328,12 @@
            out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMessage()));

            businessEmergent110Service.shareTaoBaoGoodsError(StringUtil.Md5(goodsId + ""));

        }

    }

    

    }

    

    /**

     * 淘礼金创建分享

     * 
     * @param uid

     * @param auctionId

     * @param totalNum

@@ -437,7 +341,8 @@
     * @param request

     * @param out

     */

    public void createTaoLijin(Long uid, Long auctionId, int totalNum, String relationId, HttpServletRequest request, PrintWriter out) {

    public void createTaoLijin(Long uid, Long auctionId, int totalNum, String relationId, HttpServletRequest request,

            PrintWriter out) {

        try {

            TaoBaoLink taoBaoLink = shareGoodsService.getTaoLiJinLinkForShare(uid, auctionId, relationId);

            

@@ -478,7 +383,6 @@
            }

            data.put("clickUrl", url);

            

			
            // 创建淘口令

            if (!StringUtil.isNullOrEmpty(taoLiJinLink)) {// 通过立即推广方式获取淘口令成功

                String quanToken = TaoKeApiUtil.getTKToken(goods.getPictUrl(), goods.getTitle(), taoLiJinLink);

@@ -486,13 +390,16 @@
                    taoBaoLink.setTaoToken(quanToken);

                }

            } else if (!StringUtil.isNullOrEmpty(taoBaoLink.getClickUrl())) {

                String quanToken = TaoKeApiUtil.getTKToken(goods.getPictUrl(), goods.getTitle(), taoBaoLink.getClickUrl());

                String quanToken = TaoKeApiUtil.getTKToken(goods.getPictUrl(), goods.getTitle(),

                        taoBaoLink.getClickUrl());

                if (!StringUtil.isNullOrEmpty(quanToken)) {

                    taoBaoLink.setTaoToken(quanToken);

                }

            }

            data.put("token", taoBaoLink.getTaoToken());

            data.put("rule", configService.get("share_rule_link_tb"));



            data.put("rule",

                    "http://apph5.yeshitv.com/apppage/all_help_content.html?id=148&from=singlemessage&isappinstalled=0");

            data.put("pictUrl", TbImgUtil.getTBSizeImg(taoBaoLink.getGoods().getPictUrl(), 500));



            // 无券

@@ -541,7 +448,8 @@


            data.put("shareMoney", "¥" + shareMoney.toString());

            try {

                ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid, auctionId, Constant.SOURCE_TYPE_TAOBAO);

                ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid, auctionId,

                        Constant.SOURCE_TYPE_TAOBAO);

                data.put("shareId", shareRecord.getRedisKey());

            } catch (Exception e) {

                try {

@@ -590,10 +498,9 @@
        }

    }

    

	
	
    /**

     * 京东创建分享

     * 
     * @param acceptData

     * @param uid

     * @param goodsId

@@ -613,7 +520,6 @@
                out.print(JsonUtil.loadFalseResult(1, "该商品淘已下架"));

                return;

            }

			


            JSONObject data = new JSONObject();

            String url = String.format("http://%s%s?uid=%s&id=%s&appType=flq&goodsType=%s", configService.getH5Host(),

@@ -656,10 +562,9 @@
            }

            

            shareText = shareText.replace("{店铺类型}", shopType)

                    .replace("{月销量}", JDUtil.getSaleCount(jdGoods.getInOrderCount30Days()))

                    .replace("{领券短链}", shortLink).replace("{淘口令}", null);

                .replace("{月销量}", JDUtil.getSaleCount(jdGoods.getInOrderCount30Days())).replace("{领券短链}", shortLink)

                .replace("{淘口令}", null);

            data.put("shareText", shareText);

			
            

            String descText = shareText.replace(jdGoods.getSkuName(), "").trim();

            if (descText.startsWith("\\r\\n"))

@@ -679,7 +584,8 @@


            data.put("shareMoney", "¥" + shareMoney.toString());

            try {

                ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid, goodsId, Constant.SOURCE_TYPE_JD);

            ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid, goodsId,

                    Constant.SOURCE_TYPE_JD);

                data.put("shareId", shareRecord.getRedisKey());

            } catch (Exception e) {

                try {

@@ -717,9 +623,9 @@
            });

    }

    

	
    /**

     * 拼多多分享

     * 
     * @param acceptData

     * @param uid

     * @param goodsId

@@ -727,7 +633,6 @@
     * @param out

     */

    public void createPDDShare(AcceptData acceptData, Long uid, Long goodsId, String source, PrintWriter out) {

		
        PDDGoodsDetail goods = PinDuoDuoApiUtil.getGoodsDetail(goodsId);

        if (goods == null) {

            out.print(JsonUtil.loadFalseResult(1, "该商品已下架"));

@@ -767,14 +672,16 @@
                text = configService.get("goods_share_text_coupon");

            

            shareText = text.replace("{标题}", goods.getGoodsName())

                    .replace("{商品原价}", MoneyBigDecimalUtil.getWithNoZera(new BigDecimal(goods.getMinNormalPrice())) + "")

                    .replace("{优惠券面额}", MoneyBigDecimalUtil.getWithNoZera(new BigDecimal(goods.getCouponDiscount())) + "")

                    .replace("{商品原价}",

                            MoneyBigDecimalUtil.getWithNoZera(new BigDecimal(goods.getMinNormalPrice())) + "")

                    .replace("{优惠券面额}",

                            MoneyBigDecimalUtil.getWithNoZera(new BigDecimal(goods.getCouponDiscount())) + "")

                    .replace("{优惠券价}", PinDuoDuoUtil.getQuanPrice(goods) + "" );

        }

        

        shareText = shareText.replace("{店铺类型}", shopType)

                .replace("{月销量}", PinDuoDuoUtil.getSaleCount(goods.getSoldQuantity()))

                .replace("{领券短链}", shortLink).replace("{淘口令}", null);

                .replace("{月销量}", PinDuoDuoUtil.getSaleCount(goods.getSoldQuantity())).replace("{领券短链}", shortLink)

                .replace("{淘口令}", null);

        data.put("shareText", shareText);

        String descText = shareText.replace(goods.getGoodsName(), "").trim();

        if (descText.startsWith("\\r\\n"))

@@ -795,7 +702,8 @@


        data.put("shareMoney", "¥" + shareMoney.toString());

        try {

            ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid, goodsId, Constant.SOURCE_TYPE_JD);

            ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid, goodsId,

                    Constant.SOURCE_TYPE_JD);

            data.put("shareId", shareRecord.getRedisKey());

        } catch (Exception e) {

            try {

@@ -836,5 +744,113 @@
        });

}

    

    /**

     * 获取分享记录中的商品 分享信息

     * 
     * @param acceptData

     * @param recordId

     * @param out

     */

    @RequestMapping(value = "getShareGoods")

    public void getShareGoods(AcceptData acceptData, Long recordId, PrintWriter out) {



        if (recordId == null) {

            out.print(JsonUtil.loadFalseResult("参数不正确"));

            return;

        }



        JSONArray array = new JSONArray();

        JSONObject data = new JSONObject();



        List<UserShareGoodsGroup> list = userShareGoodsGroupService.listByRecordId(recordId);

        if (list == null || list.size() == 0) {

            data.put("title", "分享商品");

            data.put("count", 0);

            data.put("result_list", array);

            out.print(JsonUtil.loadTrueResult(data));

            return;

        }



        // API网络接口验证是否在售

        List<TaoBaoGoodsBrief> listTaoKeGoods = null;

        List<Long> listGid = new ArrayList<Long>();

        for (UserShareGoodsGroup goodsGroup : list) {

            CommonGoods commonGoods = goodsGroup.getCommonGoods();

            Integer goodsType = commonGoods.getGoodsType();

            if (commonGoods == null || goodsType == null || goodsType != Constant.SOURCE_TYPE_TAOBAO) {

                continue;

            }

            listGid.add(commonGoods.getGoodsId());

        }



        if (listGid.size() > 0) {

            try {

                listTaoKeGoods = TaoKeApiUtil.getBatchGoodsInfo(listGid);

            } catch (TaoKeApiException e) {

                e.printStackTrace();

            } catch (TaobaoGoodsDownException e) {

                e.printStackTrace();

            } catch (Exception e) {

                e.printStackTrace();

            }

        }



        BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

        BigDecimal shareRate = hongBaoManageService.getShareRate();

        Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

                .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();



        for (UserShareGoodsGroup goodsGroup : list) {

            CommonGoods commonGoods = goodsGroup.getCommonGoods();

            if (commonGoods == null) {

                continue;

            }



            // 验证淘宝商品是否在售

            Integer goodsType = commonGoods.getGoodsType();

            if (listTaoKeGoods != null && listTaoKeGoods.size() > 0 && goodsType != null

                    && goodsType == Constant.SOURCE_TYPE_TAOBAO) {

                int state = 1; // 默认停售

                Long goodsId = commonGoods.getGoodsId();

                for (TaoBaoGoodsBrief taoKeGoods : listTaoKeGoods) {

                    Long auctionId = taoKeGoods.getAuctionId();

                    if (goodsId == auctionId || goodsId.equals(auctionId)) {

                        state = 0; // 在售

                        break;

                    }

                }

                commonGoods.setState(state);

            }



            // 今日浏览记录处理

            Date date = new Date();

            Date browseTime = goodsGroup.getBrowseTime();

            if (!DateUtil.isSameDay(browseTime, date)) {

                goodsGroup.setTodayBrowse(0); // 不是同一天浏览记录设置0

            }



            JSONObject dataObject = new JSONObject();

            dataObject.put("todayBrowse", goodsGroup.getTodayBrowse());

            dataObject.put("totalBrowse", goodsGroup.getTotalBrowse());

            dataObject.put("totalOrder", goodsGroup.getTotalOrder());

            dataObject.put("totalMoney", "¥" + goodsGroup.getTotalMoney());



            GoodsDetailVO detailVO = GoodsDetailVOFactory.convertCommonGoods(commonGoods, null, fanLiRate, shareRate);

            detailVO.setId(commonGoods.getId());

            dataObject.put("goods", gson.toJson(detailVO));

            array.add(dataObject);

        }



        String title = "";

        UserShareGoodsRecord userShareGoodsRecord = userShareGoodsRecordService.selectByPrimaryKey(recordId);

        if (userShareGoodsRecord != null) {

            title = userShareGoodsRecord.getTitle();

        }



        data.put("title", title);

        data.put("count", list.size());

        data.put("result_list", array);

        out.print(JsonUtil.loadTrueResult(data));

    }



}


 fanli/src/main/java/com/yeshi/fanli/util/factory/goods/ShopInfoVOFactory.java

@@ -33,7 +33,7 @@
        shopInfoVO.setScoreLogistics(shop.getScoreLogistics());

        shopInfoVO.setScoreGoodsD(shop.getScoreGoodsD());

        shopInfoVO.setScoreSellerD(shop.getScoreSellerD());

        shopInfoVO.setScoreLogistics(shop.getScoreLogisticsD());

        shopInfoVO.setScoreLogisticsD(shop.getScoreLogisticsD());

        shopInfoVO.setGoodRatePercentage(shop.getGoodRatePercentage());

        

        Integer shopType = shop.getUserType();


 fanli/src/main/java/com/yeshi/fanli/vo/goods/GoodsDetailExtraVO.java

@@ -54,7 +54,7 @@


    // 分享信息

    @Expose

    private ShareInfoVO share;

    private ShareVO share;

    // 分享人

    @Expose

    private List<ShamUser> listShareUser;

@@ -150,11 +150,11 @@
        this.userTLJ = userTLJ;

    }



    public ShareInfoVO getShare() {

    public ShareVO getShare() {

        return share;

    }



    public void setShare(ShareInfoVO share) {

    public void setShare(ShareVO share) {

        this.share = share;

    }




 fanli/src/main/java/com/yeshi/fanli/vo/goods/ShareInfoVO.java

@@ -10,26 +10,19 @@
 */

public class ShareInfoVO {



    // 分享链接

    // 二维码链接、分享链接

    @Expose

    private String url;

    // 帮助链接

    private String clickUrl;

    // 淘口令

    @Expose

    private String helpLink;

    private String token;



    public String getUrl() {

        return url;

    }

    // 分享文字

    @Expose

    private String shareText;



    public void setUrl(String url) {

        this.url = url;

    }

    @Expose

    private String descText;



    public String getHelpLink() {

        return helpLink;

    }



    public void setHelpLink(String helpLink) {

        this.helpLink = helpLink;

    }

}


 fanli/src/main/java/com/yeshi/fanli/vo/goods/ShareVO.java

New file
@@ -0,0 +1,35 @@
package com.yeshi.fanli.vo.goods;



import com.google.gson.annotations.Expose;



/**

 * 详情分享信息

 * 
 * @author Administrator

 *

 */

public class ShareVO {



    // 分享链接

    @Expose

    private String url;

    // 帮助链接

    @Expose

    private String helpLink;



    public String getUrl() {

        return url;

    }



    public void setUrl(String url) {

        this.url = url;

    }



    public String getHelpLink() {

        return helpLink;

    }



    public void setHelpLink(String helpLink) {

        this.helpLink = helpLink;

    }

}


 fanli/src/main/java/com/yeshi/fanli/vo/goods/ShopInfoVO.java

@@ -40,14 +40,17 @@


    @Expose

    private BigDecimal goodRatePercentage;// 好评率

	
    @Expose

    private String shopLink; // 店铺链接

    

    @Expose

    private BigDecimal scoreGoodsD;// 与行业平均分的差值

    

    @Expose

    private BigDecimal scoreSellerD;

    

    @Expose

    private BigDecimal scoreLogisticsD;



    public String getId() {