admin
2020-05-19 744594ef1a2f530fc3e86ea9dc48b62247f79420
fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/RecommendController.java
@@ -19,8 +19,6 @@
import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
import com.yeshi.fanli.dto.pdd.PDDGoodsResult;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.homemodule.Special;
import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;
import com.yeshi.fanli.entity.common.JumpDetailV2;
import com.yeshi.fanli.entity.jd.JDGoods;
import com.yeshi.fanli.entity.system.ConfigKeyEnum;
@@ -50,6 +48,8 @@
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
import com.yeshi.fanli.vo.goods.GoodsDetailVO;
import com.yeshi.fanli.vo.homemodule.BannerVO;
import com.yeshi.fanli.vo.homemodule.SpecialVO;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -129,50 +129,49 @@
         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) {
            JSONObject params = null;
            if (StringUtil.isNullOrEmpty(swiper.getParams())) {
               params = JSONObject.fromObject(swiper.getParams());
            }
         for (BannerVO swiper : picList) {
//            JSONObject params = null;
//            if (StringUtil.isNullOrEmpty(swiper.getParams())) {
//               params = JSONObject.fromObject(swiper.getParams());
//            }
            swiper.setJumpDetail(JumpDetailUtil.getWXMPJumDetail(swiper.getJumpDetail()));
         }
         // 圆形专题
         List<Special> specials = specialService.listByVersion(0, 10, "index_arc_1.6.5", platform, version);
         List<SpecialVO> specials = specialService.listByVersion(0, 10, "index_arc_1.6.5", platform, version);
         if (specials == null)
            specials = new ArrayList<>();
         for (Special special : specials) {
         for (SpecialVO special : specials) {
            JumpDetailV2 jumpDetail = special.getJumpDetail();
            if (special.isJumpLogin() && jumpDetail != null) {
               jumpDetail.setNeedLogin(true);
            }
            
            JSONObject params = null;
            if (StringUtil.isNullOrEmpty(special.getParams())) {
               params = JSONObject.fromObject(special.getParams());
            }
//            JSONObject params = null;
//            if (StringUtil.isNullOrEmpty(special.getParams())) {
//               params = JSONObject.fromObject(special.getParams());
//            }
            special.setJumpDetail(JumpDetailUtil.getWXMPJumDetail(jumpDetail));
         }
         // 活动
         List<SwiperPicture> activitys = swiperPictureService.getByBannerCardAndVersion("index_invite", platform,
         List<BannerVO> activitys = swiperPictureService.getByBannerCardAndVersion("index_invite", platform,
               version);
         if (activitys == null)
            activitys = new ArrayList<>();
         for (SwiperPicture swiper : activitys) {
            JSONObject params = null;
            if (StringUtil.isNullOrEmpty(swiper.getParams())) {
               params = JSONObject.fromObject(swiper.getParams());
            }
         for (BannerVO swiper : activitys) {
//            JSONObject params = null;
//            if (StringUtil.isNullOrEmpty(swiper.getParams())) {
//               params = JSONObject.fromObject(swiper.getParams());
//            }
            swiper.setJumpDetail(JumpDetailUtil.getWXMPJumDetail(swiper.getJumpDetail()));
         }