2.0.7相关服务端功能添加

admin

2020-02-23 b59fef5c00b15fdfdfa9d4be26e5bf6b41c75458

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

@@ -374,6 +374,7 @@


      ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),

            acceptData.getVersion());

      paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());



      GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO);

      if (goodsDetail != null && goodsDetail.getMoneyInfo() != null && userVIPInfoService.isVIP(uid)) {

@@ -381,6 +382,7 @@
         goodsDetail.getMoneyInfo().setShareMoney(

               "¥" + TaoBaoUtil.getGoodsHongBaoMoney(goods, hongBaoManageService.getVIPShareRate()));

         goodsDetail.getMoneyInfo().setRateInfo(goodsDetail.getMoneyInfo().getMaxRateInfo());

         goodsDetail.getMoneyInfo().setCompositionInfo(goodsDetail.getMoneyInfo().getMaxCompositionInfo());

      }

      goodsDetail.getMoneyInfo()

            .setRateInfoHelpUrl(configService.get(ConfigKeyEnum.goodsDetailFanliRateHelpUrl.getKey()));

@@ -605,8 +607,9 @@
    * @param from

    * @param out

    */

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

   @RequestMapping(value = "getDetailJD")

   public void getDetialJD(AcceptData acceptData, Long id, Long uid, String from, PrintWriter out) {

//      uid=2255993L;

      // 系统验证

      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),

            acceptData.getPackages());

@@ -637,12 +640,14 @@


      ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),

            acceptData.getVersion());

      paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());

      GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertJDGoods(jdGoods, paramsDTO);

      if (goodsDetail != null && goodsDetail.getMoneyInfo() != null && userVIPInfoService.isVIP(uid)) {

         goodsDetail.getMoneyInfo().setFanliMoney(goodsDetail.getMoneyInfo().getMaxMoney());

         goodsDetail.getMoneyInfo()

               .setShareMoney("¥" + JDUtil.getGoodsFanLiMoney(jdGoods, hongBaoManageService.getVIPShareRate()));

         goodsDetail.getMoneyInfo().setRateInfo(goodsDetail.getMoneyInfo().getMaxRateInfo());

         goodsDetail.getMoneyInfo().setCompositionInfo(goodsDetail.getMoneyInfo().getMaxCompositionInfo());

      }

      goodsDetail.getMoneyInfo()

            .setRateInfoHelpUrl(configService.get(ConfigKeyEnum.goodsDetailFanliRateHelpUrl.getKey()));

@@ -697,12 +702,12 @@
         rewardCoupon.setDesc("用返利奖励券最高返");

      }

      rewardCoupon.setParams(params1.toString());

		


      otherInfo.setRewardCoupon(rewardCoupon);

      if ("ios".equalsIgnoreCase(acceptData.getPlatform())

            && configService.iosOnLining(Integer.parseInt(acceptData.getVersion())))

         otherInfo.setRewardCoupon(null);

		


      goodsDetail.setOtherInfo(otherInfo);



      CouponInfoVO couponInfo = goodsDetail.getCouponInfo();

@@ -800,11 +805,12 @@
      out.print(JsonUtil.loadTrueResult(object.toString()));



      final JDGoods goods = jdGoods;

      final Long fuid=uid;

      ThreadUtil.run(new Runnable() {

         public void run() {

            // 添加浏览记录

            try {

               scanHistoryV2Service.addJDScanHistory(uid, acceptData.getDevice(), goods);

               scanHistoryV2Service.addJDScanHistory(fuid, acceptData.getDevice(), goods);

            } catch (Exception e) {

               e.printStackTrace();

            }

@@ -839,12 +845,15 @@


      ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),

            acceptData.getVersion());

      paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());



      GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertPDDGoods(pddGoods, paramsDTO);

      if (goodsDetail != null && goodsDetail.getMoneyInfo() != null && userVIPInfoService.isVIP(uid)) {

         goodsDetail.getMoneyInfo().setFanliMoney(goodsDetail.getMoneyInfo().getMaxMoney());

         goodsDetail.getMoneyInfo().setShareMoney(

               "¥" + PinDuoDuoUtil.getGoodsFanLiMoney(pddGoods, hongBaoManageService.getVIPShareRate()));

         goodsDetail.getMoneyInfo().setRateInfo(goodsDetail.getMoneyInfo().getMaxRateInfo());

         goodsDetail.getMoneyInfo().setCompositionInfo(goodsDetail.getMoneyInfo().getMaxCompositionInfo());

      }

      goodsDetail.getMoneyInfo()

            .setRateInfoHelpUrl(configService.get(ConfigKeyEnum.goodsDetailFanliRateHelpUrl.getKey()));