淘礼金修改

yujian

2019-07-17 f2b3d4e95e6c86518890f11219db94392fee13fe

淘礼金修改

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

@@ -451,11 +451,11 @@


            SpreadHongBao spreadHongBao = new SpreadHongBao();

            if (isNewUser) {

                spreadHongBao.setMoney("¥1");

                spreadHongBao.setMoney("1");

            } else {

                moneyType = 2;

                fanliValid = false;

                spreadHongBao.setMoney("¥" + spreadMoney.toString());

                spreadHongBao.setMoney(spreadMoney.toString());

                

                ClientTextStyleVO textStyleVO1 = new ClientTextStyleVO();

                textStyleVO1.setContent("分享");

@@ -512,7 +512,7 @@
            ReduceHongBao reduceHongBao = new ReduceHongBao();

            reduceHongBao.setLeft(buyGoods.getLeftHongBaoCount());

            reduceHongBao.setMoney(tljHongBao);

            reduceHongBao.setName("付款立减 ¥" + tljHongBao);

            reduceHongBao.setName("付款立减 ");

            reduceHongBao.setTip("当日领取，当日内使用，过期失效");

            reduceHongBao.setTotal(buyGoods.getTotalHongBaoCount());

            


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

@@ -391,7 +391,7 @@
                        ReduceHongBao reduceHongBao = new ReduceHongBao();

                        reduceHongBao.setLeft(goods.getLeftHongBaoCount());

                        reduceHongBao.setMoney(hongBao);

                        reduceHongBao.setName("付款立减 " + hongBao);

                        reduceHongBao.setName("付款立减 ");

                        reduceHongBao.setTip("");

                        reduceHongBao.setTotal(goods.getTotalHongBaoCount());

                        


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

@@ -185,8 +185,8 @@
            return;

        }



        // 拼多多商品 TODO

        if (goodsType.intValue() == Constant.SOURCE_TYPE_PDD) {

            // 拼多多商品 TODO

            searchPDDGoods(kw, page, filter, order, startprice, endprice, out);

            return;

        }


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

@@ -802,7 +802,6 @@
            // 去掉标签

            detailVO.setLabels(null);

            

			


            MoneyInfoVO moneyInfo = detailVO.getMoneyInfo();

            moneyInfo.setMoneyType(2);

@@ -811,8 +810,8 @@
            String hongBao = spreadMoney.toString();

            ReduceHongBao vo = new ReduceHongBao();

            vo.setLeft(hotGoods.getLeftHongBaoCount());

            vo.setMoney(hongBao);

            vo.setName("付款立减  ¥" + hongBao);

            vo.setMoney(" ¥" + hongBao);

            vo.setName("付款立减 ");

            vo.setTip("");

            vo.setTotal(hotGoods.getTotalHongBaoCount());

            


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

@@ -154,7 +154,7 @@
        goodsInfo.setPicUrl(goods.getPictUrl());



        Integer shopType = goods.getUserType();

        if (shopType != null && shopType == 2) {

        if (shopType != null && shopType == 1) {

            goodsInfo.setShopType(11); // 天猫

        } else {

            goodsInfo.setShopType(10); // 淘宝

@@ -250,7 +250,7 @@
        }



        Integer shopType = goods.getUserType();

        if (shopType != null && shopType == 2) {

        if (shopType != null && shopType == 1) {

            goodsInfo.setShopType(11); // 天猫

        } else {

            goodsInfo.setShopType(10); // 淘宝