足迹、收藏订单兼容新需求

yujian

2020-05-23 28cf328a098334b51a3e9d2d56f983fb8c862211

 fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/GoodsController.java

@@ -32,10 +32,10 @@
import com.yeshi.fanli.dto.pdd.PDDGoodsResult;

import com.yeshi.fanli.dto.pdd.PDDPromotionUrl;

import com.yeshi.fanli.dto.pdd.PDDSearchFilter;

import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;

import com.yeshi.fanli.entity.bus.share.UserShareGoodsHistory;

import com.yeshi.fanli.entity.bus.user.ShamUser;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;

import com.yeshi.fanli.entity.goods.CollectionGoodsV2;

import com.yeshi.fanli.entity.jd.JDGoods;

import com.yeshi.fanli.entity.jd.JDGoodsClass;

@@ -51,6 +51,7 @@
import com.yeshi.fanli.service.inter.goods.ShareGoodsService;

import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;

import com.yeshi.fanli.service.inter.jd.JDGoodsClassService;

import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.user.QrCodeService;

import com.yeshi.fanli.service.inter.user.ShamUserService;

@@ -61,10 +62,8 @@
import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.JumpDetailUtil;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.ThreadUtil;

import com.yeshi.fanli.util.VersionUtil;

import com.yeshi.fanli.util.cache.JDGoodsCacheUtil;

import com.yeshi.fanli.util.cache.PinDuoDuoCacheUtil;

import com.yeshi.fanli.util.factory.CommonGoodsFactory;

@@ -81,6 +80,7 @@
import com.yeshi.fanli.vo.goods.RewardCouponVO;

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

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

import com.yeshi.fanli.vo.homemodule.BannerVO;



import net.sf.json.JSONObject;



@@ -99,6 +99,9 @@


   @Resource

   private HongBaoManageService hongBaoManageService;

	
   @Resource

   private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;



   @Resource

   private UserInfoExtraService userInfoExtraService;

@@ -196,13 +199,13 @@
         // 轮播图

         String platform = acceptData.getPlatform();

         int version = Integer.parseInt(acceptData.getVersion());

         List<SwiperPicture> picList = swiperPictureService.getByBannerCardAndVersion("index_top", platform,

         List<BannerVO> picList = swiperPictureService.getByBannerCardAndVersion("index_top", platform,

               version);

         if (picList == null) {

            picList = new ArrayList<>();

         }



         for (SwiperPicture swiper : picList) {

         for (BannerVO swiper : picList) {

            JSONObject params = null;

            if (StringUtil.isNullOrEmpty(swiper.getParams())) {

               params = JSONObject.fromObject(swiper.getParams());

@@ -232,7 +235,7 @@
         if (goodsList != null && goodsList.size() > 0) {

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

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

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

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

                  acceptData.getVersion());

            for (JDGoods goods : goodsList) {

               GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, paramsDTO);

@@ -263,7 +266,7 @@
    *            页面来源

    * @param out

    */

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

   @RequestMapping(value = "getGoodsDetial")

   public void getGoodsDetial(WXMPAcceptData acceptData, Long goodsId, Integer goodsType, String from, Long uid,

         PrintWriter out) {

      if (goodsType == null || goodsType < 2 || goodsType > 3) {

@@ -314,14 +317,20 @@
      // 保存缓存

      jdGoodsCacheUtil.saveGoodsInfo(jdGoods);



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

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

            acceptData.getVersion());

      paramsDTO.setMaxRewardRate(null);

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

               .setShareMoney("¥" + JDUtil.getGoodsFanLiMoney(jdGoods, hongBaoManageService.getShareRate(UserLevelEnum.superVIP)));

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

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

      }

		
      goodsDetail.getMoneyInfo()

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



      // 附加信息

      OtherInfo otherInfo = new OtherInfo();

@@ -343,13 +352,10 @@
                     hongBaoManageService.getFanLiRate());

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

               // 使用奖励券最高返

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

                  maxMoneyPlus = "（京东plus返¥"

                        + JDUtil.getGoodsFanLiMoneyPlus(jdGoods, hongBaoManageService.getVIPFanLiRate()) + "）";

               } else

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

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

                        + "）";



               maxMoneyPlus = "（京东plus返¥"

                     + JDUtil.getGoodsFanLiMoneyPlus(jdGoods, hongBaoManageService.getFanLiRate(UserLevelEnum.superVIP)) + "）";



            }

         }

      }

@@ -357,7 +363,10 @@
      // 奖励券返利

      RewardCouponVO rewardCoupon = new RewardCouponVO();

      rewardCoupon.setMaxMoneyPlus(maxMoneyPlus);

      rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("web"));



      rewardCoupon.setMaxMoney(goodsDetail.getMoneyInfo().getMaxMoney());

      rewardCoupon.setDesc("返");

      otherInfo.setRewardCoupon(rewardCoupon);

      goodsDetail.setOtherInfo(otherInfo);



      CouponInfoVO couponInfo = goodsDetail.getCouponInfo();

@@ -440,6 +449,10 @@
      shareInfoVO.setHelpLink(helpLink);

      extraVO.setShare(shareInfoVO);



      // 判断vip

      if (uid != null) {

         extraVO.setVip(userVIPInfoService.isVIP(uid));

      }

      JSONObject object = new JSONObject();

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

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

@@ -468,20 +481,37 @@
    * @param out

    */

   private void getDetialPDD(WXMPAcceptData acceptData, Long id, Long uid, String from, PrintWriter out) {

      PDDGoodsDetail pddGoods = PinDuoDuoApiUtil.getGoodsDetail(id);

      PDDGoodsDetail pddGoods =null; //PinDuoDuoApiUtil.getGoodsDetail(id);

      if (pddGoods == null) {

         out.print(JsonUtil.loadFalseResult(2, "商品不存在"));

         return;

      }



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

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

            acceptData.getVersion());

      paramsDTO.setMaxRewardRate(null);

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

               "¥" + PinDuoDuoUtil.getGoodsFanLiMoney(pddGoods, hongBaoManageService.getShareRate(UserLevelEnum.superVIP)));

      }



      if (goodsDetail.getCouponInfo() != null) {

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

         list.add(goodsDetail.getCouponInfo());

         goodsDetail.setCouponInfoList(list);

      }



      // 奖励券返利

      RewardCouponVO rewardCoupon = new RewardCouponVO();



      rewardCoupon.setMaxMoney(goodsDetail.getMoneyInfo().getMaxMoney());

      rewardCoupon.setDesc("返");



      OtherInfo otherInfo = new OtherInfo();

      otherInfo.setRewardCoupon(rewardCoupon);

      goodsDetail.setOtherInfo(otherInfo);



      CouponInfoVO couponInfo = goodsDetail.getCouponInfo();

      PDDPromotionUrl convertUrl = null;

@@ -563,6 +593,11 @@
      shareInfoVO.setHelpLink(helpLink);

      extraVO.setShare(shareInfoVO);



      // 判断vip

      if (uid != null) {

         extraVO.setVip(userVIPInfoService.isVIP(uid));

      }



      if (convertUrl != null) {

         extraVO.setCouponJumpLink(convertUrl.getUrl());

         extraVO.setNativeCouponJumpLink(PinDuoDuoUtil.getAndroidNativeURI(convertUrl.getUrl()));

@@ -611,7 +646,7 @@
               list = list.subList(0, 10);

            }



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

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

                  acceptData.getVersion());

            List<GoodsDetailVO> listDetailVO = new ArrayList<GoodsDetailVO>();



@@ -653,7 +688,7 @@
                        goodsList = goodsList.subList(0, 10);

                     }



                     ConfigParamsDTO paramsDTO = hongBaoManageService

                     ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService

                           .getShowComputeRate(acceptData.getPlatform(), acceptData.getVersion());

                     for (PDDGoodsDetail goods : goodsList) {

                        listDetailVO.add(GoodsDetailVOFactory.convertPDDGoods(goods, paramsDTO));

@@ -840,7 +875,7 @@
         out.print(JsonUtil.loadFalseResult(2, "商品已下架"));

         return;

      }

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

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

            acceptData.getVersion());

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



@@ -898,7 +933,7 @@
         out.print(JsonUtil.loadFalseResult(2, "商品已下架"));

         return;

      }

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

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

            acceptData.getVersion());

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