消息修改

admin

2020-04-10 d960fdbfe07a65cb80ccb764bfb15ce78ebfd84a

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

@@ -1,6 +1,7 @@
package com.yeshi.fanli.controller.client.v2;



import java.io.PrintWriter;

import java.lang.reflect.InvocationTargetException;

import java.math.BigDecimal;

import java.util.ArrayList;

import java.util.HashMap;

@@ -9,6 +10,7 @@


import javax.annotation.Resource;



import org.apache.commons.beanutils.PropertyUtils;

import org.json.simple.JSONArray;

import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;

@@ -50,6 +52,7 @@
import com.yeshi.fanli.service.inter.config.BusinessSystemService;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.config.SystemClientParamsService;

import com.yeshi.fanli.service.inter.dynamic.GoodsEvaluateService;

import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;

import com.yeshi.fanli.service.inter.goods.ScanHistoryV2Service;

import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;

@@ -72,6 +75,7 @@
import com.yeshi.fanli.service.inter.user.integral.IntegralGetService;

import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;

import com.yeshi.fanli.service.inter.user.vip.UserVipConfigService;

import com.yeshi.fanli.util.BeanUtil;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.RedisManager;

@@ -195,10 +199,12 @@


   @Resource

   private UserVIPInfoService userVIPInfoService;

	


   @Resource

   private UserVipConfigService userVipConfigService;

	


   @Resource

   private GoodsEvaluateService goodsEvaluateService;



   /**

    * 淘宝商品详情

@@ -262,6 +268,7 @@
               app.setPid(TaoBaoConstant.TAOBAO_COMMON_PID);

               app.setAdzoneId(TaoBaoConstant.TAOBAO_COMMON_PID.split("_")[3]);

               goods = TaoKeApiUtil.searchGoodsDetail(id, app);



               final TaoBaoGoodsBrief finalGoods = goods;

               if (goods != null) {

                  ThreadUtil.run(new Runnable() {

@@ -275,6 +282,7 @@
         } catch (TaobaoGoodsDownException e) {

            // 商品下架

            ThreadUtil.run(new Runnable() {



               public void run() {

                  taoBaoGoodsUpdateService.offlineTaoBaoGoods(id);

               }

@@ -368,13 +376,18 @@


      // 大淘客商品过滤

      try {

         goods = daTaoKeGoodsDetailV2Service.filterTaoBaoGoods(goods);

         goods = daTaoKeGoodsDetailV2Service.filterTaoBaoGoods(goods, acceptData.getPlatform(),

               acceptData.getVersion());



         // goods = daTaoKeGoodsDetailV2Service.filterTaoBaoGoods(goods);



      } catch (Exception e) {

         LogHelper.errorDetailInfo(e);

      }



      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)) {

@@ -382,8 +395,10 @@
         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()));

      goodsDetail.getMoneyInfo()

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



      if (TaoBaoUtil.isYUShou(goods)) {

         if (!StringUtil.isNullOrEmpty(goods.getPresaleDiscountFeeText())) {

@@ -416,7 +431,7 @@
      }



      extraVO.setTbPidInfo(clientTBPid);

      extraVO.setDetailUrl("http://apph5.yeshitv.com/apppage/goods_img.html?id=" + id);

      extraVO.setDetailUrl("http://apph5.banliapp.com/apppage/goods_img.html?id=" + id);



      // 分享赚人提示

      MoneyInfoVO moneyInfo = goodsDetail.getMoneyInfo();

@@ -552,7 +567,12 @@
         } else

            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);

      }

      extraVO.setFanliValid(fanliValid);

@@ -573,6 +593,27 @@
      shareInfoVO.setHelpLink(helpLink);

      extraVO.setShare(shareInfoVO);



      if (goodsDetail.isHasCoupon()) {

         // 设置couponList

         List<CouponInfoVO> couponInfoList = new ArrayList<>();

         couponInfoList.add(goodsDetail.getCouponInfo());

         if (Constant.IS_TEST) {

            CouponInfoVO coupon = new CouponInfoVO();

            try {

               PropertyUtils.copyProperties(coupon, goodsDetail.getCouponInfo());

            } catch (IllegalAccessException e) {

               e.printStackTrace();

            } catch (InvocationTargetException e) {

               e.printStackTrace();

            } catch (NoSuchMethodException e) {

               e.printStackTrace();

            }

            coupon.setShopCoupon(true);

            coupon.setLink("https://uland.taobao.com/quan/detail?sellerId=725677994&activityId=d03aa6d23a5a4040afb3942e7ea9a007");

            couponInfoList.add(coupon);

         }

         goodsDetail.setCouponInfoList(couponInfoList);

      }

      JSONObject object = new JSONObject();

      object.put("extra", JsonUtil.getApiCommonGson().toJson(extraVO));

      object.put("goods", JsonUtil.getApiCommonGson().toJson(goodsDetail));

@@ -600,8 +641,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());

@@ -632,14 +674,17 @@


      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()));

      goodsDetail.getMoneyInfo()

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



      // 附加信息

      OtherInfo otherInfo = new OtherInfo();

@@ -691,7 +736,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();

@@ -789,11 +839,18 @@
      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();

            }



            try {

               goodsEvaluateService.updateJDGoods(goods);

            } catch (Exception e) {

               e.printStackTrace();

            }

@@ -828,14 +885,18 @@


      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()));

      goodsDetail.getMoneyInfo()

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



      // 附加信息

      OtherInfo otherInfo = new OtherInfo();

@@ -856,6 +917,9 @@
         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();

@@ -883,7 +947,7 @@
      }



      // 图文详情

      extraVO.setDetailUrl("http://apph5.yeshitv.com/apppage/goods_img_pdd.html?id=" + id);

      extraVO.setDetailUrl("http://apph5.banliapp.com/apppage/goods_img_pdd.html?id=" + id);



      String salesTip = pddGoods.getSalesTip();

      if (!StringUtil.isNullOrEmpty(salesTip)) {

@@ -965,6 +1029,12 @@
            // 添加浏览记录

            try {

               scanHistoryV2Service.addPDDScanHistory(uid, acceptData.getDevice(), pddGoods);

            } catch (Exception e) {

               e.printStackTrace();

            }



            try {

               goodsEvaluateService.updatePDDGoods(pddGoods);

            } catch (Exception e) {

               e.printStackTrace();

            }

@@ -1180,6 +1250,10 @@
         }

         jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, JDApiUtil.POSITION_FANLI + "",

               uid + "");

         if (jumpLink == null) {

            jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, null, JDApiUtil.POSITION_FANLI + "",

                  uid + "");

         }

      } else {

         jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, JDApiUtil.POSITION_FANLI + "",

               uid + "");