小黄条

yujian

2019-12-10 c8041ec0544bf122e6819e6bf698997ccbf30aaf

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

@@ -498,6 +498,12 @@
         otherInfo.setReduceHongBao(newUserHongBao);

         goodsDetail.setOtherInfo(otherInfo);

         

         // 专属标签

         List<ClientTextStyleVO> labels = new ArrayList<ClientTextStyleVO>();

         labels.add(new ClientTextStyleVO("新人专属", "#FE0014"));

         labels.add(new ClientTextStyleVO("实付0元", "#FF9600"));

         goodsDetail.setLabels(labels);

			
      } else {// 普通购买

         OtherInfo otherInfo = new OtherInfo();

         RewardCouponVO rewardCoupon = new RewardCouponVO();

@@ -614,14 +620,14 @@
               jdGoods.setCommissionPlus(threeClass.getSelfComm());

               // plus返利

               BigDecimal fanliMoneyPlus = JDUtil.getGoodsFanLiMoneyPlus(jdGoods, fanLiRate);

               otherInfo.setFanliMoneyPlus("京东plus会员返¥" + fanliMoneyPlus);

               otherInfo.setFanliMoneyPlus("京东plus返¥" + fanliMoneyPlus);

               // 使用奖励券最高返

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

                  maxMoneyPlus = "（京东plus返¥"

                        + fanliMoneyPlus.add(MoneyBigDecimalUtil.mul(fanliMoneyPlus, Constant.MAX_REWARD_RATE))

                        + "）";

               } else

                  maxMoneyPlus = "（京东plus会员最高返¥"

                  maxMoneyPlus = "（京东plus最高返¥"

                        + fanliMoneyPlus.add(MoneyBigDecimalUtil.mul(fanliMoneyPlus, Constant.MAX_REWARD_RATE))

                        + "）";

            }

@@ -1334,14 +1340,14 @@
      if (jdGoodsList.size() > 0) {

         List<JDGoods> goodsList = JDApiUtil.getGoodsDetail(jdGoodsList);

         for (JDGoods goods : goodsList) {

            tempGoodsList.put(goods.getSkuId() + "-" + Constant.SOURCE_TYPE_TAOBAO,

            tempGoodsList.put(goods.getSkuId() + "-" + Constant.SOURCE_TYPE_JD,

                  GoodsDetailVOFactory.convertJDGoods(goods, params));

         }

      }

      if (pddGoodsList.size() > 0) {

         List<PDDGoodsDetail> goodsList = PinDuoDuoApiUtil.listGoodsDetail(pddGoodsList);

         for (PDDGoodsDetail goods : goodsList) {

            tempGoodsList.put(goods.getGoodsId() + "-" + Constant.SOURCE_TYPE_TAOBAO,

            tempGoodsList.put(goods.getGoodsId() + "-" + Constant.SOURCE_TYPE_PDD,

                  GoodsDetailVOFactory.convertPDDGoods(goods, params));

         }

      }