冲突解决

yujian

2019-04-08 5c4ecf9e8b47efbbf5d21c9e109be0a60cb7e26d

 fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java

@@ -16,6 +16,7 @@
import org.springframework.stereotype.Controller;

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

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

import org.yeshi.utils.HttpUtil;

import org.yeshi.utils.IPUtil;

import org.yeshi.utils.JsonUtil;

import org.yeshi.utils.NumberUtil;

@@ -27,7 +28,6 @@
import com.google.gson.JsonPrimitive;

import com.google.gson.JsonSerializationContext;

import com.google.gson.JsonSerializer;

import com.yeshi.fanli.dao.mybatis.HongBaoManageMapper;

import com.yeshi.fanli.entity.accept.AcceptData;

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

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

@@ -38,7 +38,6 @@
import com.yeshi.fanli.entity.bus.recommend.RecommendBannerV2;

import com.yeshi.fanli.entity.bus.recommend.RecommendSpecial;

import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendBanner;

import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendBannerV2;

import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendSpecial;

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

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

@@ -75,7 +74,6 @@
import com.yeshi.fanli.service.inter.config.SystemConfigService;

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

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

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

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

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

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

@@ -86,6 +84,7 @@
import com.yeshi.fanli.service.inter.homemodule.SuperSpecialService;

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

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

import com.yeshi.fanli.service.inter.lable.QualityFlashSaleService;

import com.yeshi.fanli.service.inter.lable.QualityGoodsService;

import com.yeshi.fanli.service.inter.monitor.MonitorService;

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

@@ -101,11 +100,11 @@
import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TaoBaoConstant;

import com.yeshi.fanli.util.ThreadUtil;

import com.yeshi.fanli.util.TimeUtil;

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

import com.yeshi.fanli.util.taobao.TaoBaoCouponUtil;

import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;

import com.yeshi.fanli.util.taobao.TaoBaoUtil;

import com.yeshi.fanli.util.taobao.TaoKeApiUtil;

import com.yeshi.fanli.vo.user.UserSettingsVO;

@@ -117,8 +116,6 @@
@RequestMapping("api/v1/user")

public class RecommendController {



   @Resource

   private RecommendBannerService recommendService;



   @Resource

   private BusinessSystemService businessSystemService;

@@ -144,8 +141,6 @@
   @Resource

   private UserInfoService userInfoService;



   @Resource

   private TaoBaoOrderUtil taoBaoOrderUtil;



   @Resource

   private TaoBaoCouponService taoBaoCouponService;

@@ -158,9 +153,6 @@


   @Resource

   private CollectionGoodsV2Service collectionGoodsV2Service;



   @Resource

   private HongBaoManageMapper hongBaoManageMapper;



   @Resource

   private TaoBaoGoodsBriefService taoBaoGoodsBriefService;

@@ -221,6 +213,10 @@


   @Resource

   private UserInfoExtraService userInfoExtraService;

	
   @Resource

   private QualityFlashSaleService qualityFlashSaleService;

	


   @RequestMapping(value = "getHonestList")

   public void getHonestList(AcceptData acceptData, PrintWriter out) {

@@ -404,25 +400,28 @@
      if (!"1".equals(version) && "android".equalsIgnoreCase(acceptData.getPlatform())) {

         jumpDetail = jumpDetailService.getlastJumpDetailCache();

      }

      List<RecommendSpecial> recommendSpecialList = null;



      List<SuperRecommendSpecial> superRecommendSpecialList = superRecommendSpecialService

            .getSuperRecommendSpecialBySystemId(system.getId());

      if (superRecommendSpecialList != null && superRecommendSpecialList.size() > 0) {



      List<RecommendSpecial> recommendSpecialList = null;

      for (SuperRecommendSpecial superRecommendSpecial : superRecommendSpecialList) {

         if (recommendSpecialList == null) {

            recommendSpecialList = new ArrayList<RecommendSpecial>();

         recommendSpecialList = new ArrayList<RecommendSpecial>();



         for (SuperRecommendSpecial superRecommendSpecial : superRecommendSpecialList) {

            RecommendSpecial recommendSpecial = superRecommendSpecial.getRecommendSpecial();

            if (jumpDetail != null) {

               recommendSpecial.setJumpDetail(jumpDetail);

            }

            recommendSpecialList.add(recommendSpecial);

         }

         RecommendSpecial recommendSpecial = superRecommendSpecial.getRecommendSpecial();

         if (jumpDetail != null) {

            recommendSpecial.setJumpDetail(jumpDetail);

         }

         recommendSpecialList.add(recommendSpecial);

      }



      if (recommendSpecialList == null || recommendSpecialList.size() == 0) {

         out.print(JsonUtil.loadFalseResult(1, "暂无数据"));

         return;

      }



      JSONObject data = new JSONObject();

      data.put("count", recommendSpecialList.size());

      Gson gson = new Gson();

@@ -569,8 +568,8 @@
      // 获取淘客参数

      ClientTBPid clientTBPid = null;

      if (simpleGoods.getMaterialLibType() != null && simpleGoods.getMaterialLibType() == 1) {

         String pid = Constant.TAOBAO_SPECIAL_PID_DEFAULT;

         clientTBPid = new ClientTBPid(Constant.TAOBAO_AUTH_APPKEY, Constant.TAOBAO_AUTH_APPSECRET,

         String pid = TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT;

         clientTBPid = new ClientTBPid(TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET,

               pid.split("_")[2], pid.split("_")[3]);

      } else {

         if (acceptData.getPlatform().equalsIgnoreCase("android")) {

@@ -1307,7 +1306,7 @@
               for (TaoBaoGoodsBrief goods : result.getTaoBaoGoodsBriefs()) {

                  if (!StringUtil.isNullOrEmpty(goods.getCouponInfo()) && goods.getCouponAmount() != null

                        && goods.getCouponAmount().compareTo(new BigDecimal("5")) >= 0

                        && goods.getBiz30day() > 1000)

                        && goods.getBiz30day() > 1000 && !StringUtil.isNullOrEmpty(goods.getPictUrlWhite()))

                     goodsList.add(goods);

               }

               try {

@@ -1368,26 +1367,8 @@
      }



      // 首页Banner

      List<RecommendBannerV2> listBanner = null;



      List<SuperRecommendBannerV2> listRecommendBanner = superRecommendBannerV2Service

            .getSuperRecommendBannerV2sBySystem(system);



      if (listRecommendBanner != null && listRecommendBanner.size() > 0) {



         listBanner = new ArrayList<RecommendBannerV2>();



         for (SuperRecommendBannerV2 superRecommendBanner : listRecommendBanner) {

            RecommendBannerV2 recommendBanner = superRecommendBanner.getRecommendBanner();

            // 淘特价暂时修改

            if (system.getId() == 7) {

               recommendBanner.getJumpDetail().setActivity(recommendBanner.getJumpDetail().getActivity()

                     .replace("com.yeshi.ec.rebate.myapplication", "com.yeshi.ec.taospecial"));

            }



            listBanner.add(recommendBanner);

         }

      }

      List<RecommendBannerV2> listBanner = superRecommendBannerV2Service

            .getSuperRecommendBannerV2sBySystem(system.getId());



      JSONObject root = new JSONObject();

      root.put("banner", listBanner);

@@ -1585,6 +1566,173 @@


   }



	
   /**

    * 新版推荐专题管理(1.5.3)

    * 
    * @param acceptData

    * @param out

    */

   @RequestMapping(value = "getRecommendIndex")

   public void getRecommendIndex(AcceptData acceptData, Long uid, PrintWriter out) {



      try {

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

               acceptData.getPackages());

         if (system == null) {

            out.print(JsonUtil.loadFalseResult(1, "系统不存在"));

            return;

         }



         JSONObject root = specialService.getSpecialListCache("native_index", system.getId());



         // 顶部轮播图

         List<SwiperPicture> topPicList = getSwiperByCard("weex_index");

         if (topPicList == null) {

            topPicList = new ArrayList<SwiperPicture>();

         }

         root.put("topPicList", JsonUtil.getApiCommonGson().toJson(topPicList));

			
         // 邀请有奖图片

         List<SwiperPicture> invitePicList = null;

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

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

//            // 如果IOS当前版本处于审核状态就不返回

//         } else {

//            if (uid == null) {

//               invitePicList = getSwiperByCard("invitePrizes");	
//            } else {

//               try {

//                  UserSettingsVO vo = userCustomSettingsService.getMySettings(uid);

//                  if (vo == null || vo.getNoInvitationBonus() == null || vo.getNoInvitationBonus() == 0) {

//                     invitePicList = getSwiperByCard("invitePrizes");   // 没有关闭邀请

//                  }

//               } catch (UserCustomSettingsException e) {

//                  e.printStackTrace();

//               }

//            }

//         }

			
         invitePicList = getSwiperByCard("invitePrizes");

         if (invitePicList == null) {

            invitePicList = new ArrayList<SwiperPicture>();

         }

			
         root.put("invitePicList", JsonUtil.getApiCommonGson().toJson(invitePicList));

			
         // 底部网页链接

         String platform = acceptData.getPlatform();

         if ("ios".equalsIgnoreCase(platform)) {

            root.put("htmlLink", configService.get("index_html_link_ios"));

         } 
			
         out.print(JsonUtil.loadTrueResult(root));

      } catch (Exception e) {

         out.print(JsonUtil.loadFalseResult(1, "获取数据失败"));

         try {

            LogHelper.errorDetailInfo(e);

         } catch (Exception e1) {

            e1.printStackTrace();

         }	
      }

   }

	
   public List<SwiperPicture> getSwiperByCard(String card){

      List<SwiperPicture> swiperList = null;

      try {

         swiperList = swiperPictureService.getByBannerCard(card);

      } catch (Exception e) {

         try {

            LogHelper.errorDetailInfo(e);

         } catch (Exception e1) {

            e1.printStackTrace();

         }

         e.printStackTrace();

      }

      return swiperList;

   }

	
	
   /**

    * 限时秒杀 1.5.3

    * 
    * @param acceptData

    * @param out

    */

   @RequestMapping(value = "getSpikeGoods")

   public void getSpikeGoods(AcceptData acceptData, PrintWriter out) {

		
      // 下一次倒计时的时间

      int type = qualityFlashSaleService.getNowType() + 1;

      int hour = 0;

      switch(type) {

         case 1:

            hour = 0;

            break;

         case 2:

            hour = 9;

            break;

         case 3:

            hour = 12;

            break;

         case 4:

            hour = 14;

            break;

         case 5:

            hour = 16;

            break;

         case 6:

            hour = 20;

            break;

         case 7:

            hour = 22;

            break;

         default:

            break;

      }

		
      Calendar nextTime = Calendar.getInstance();

      nextTime.set(Calendar.HOUR_OF_DAY, hour);

      nextTime.set(Calendar.MINUTE, 0);

      nextTime.set(Calendar.SECOND, 0);

      nextTime.set(Calendar.MILLISECOND, 0);

		
      JSONObject root = new JSONObject();

      root.put("time", nextTime.getTimeInMillis());

		
		
      JSONArray array = new JSONArray();

      String cachekey = "spikeGoodsList" ;

      String cacheValue = redisManager.getCommonString(cachekey);

      if (!StringUtil.isNullOrEmpty(cacheValue)) {

         array = JSONArray.fromObject(cacheValue);

      } else {

         BigDecimal proportion = manageService.getFanLiRate();

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

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

			
         // 缓存中不存在

         List<QualityFactory> listGoods = qualityGoodsService.listFlashSaleRandGoods();

         if (listGoods == null) {

            listGoods = new ArrayList<QualityFactory>();

         }

         /* 遍历列表数据 */

         for (QualityFactory qualityFactory : listGoods) {

					
            TaoBaoGoodsBrief taoBaoGoodsBrief = qualityFactory.getTaoBaoGoodsBrief();

            if (taoBaoGoodsBrief == null) {

               continue;

            }

            array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null)));

         }

         // 缓存半个小时

         redisManager.cacheCommonString(cachekey, array.toString(), 60 * 30);

      }

      root.put("listgoods", array);

      out.print(JsonUtil.loadTrueResult(root));

   }

	
	
   /**

    * 商品基本详情 (1.4.0)

    * 

@@ -1628,21 +1776,11 @@
      // 获取淘客参数

      ClientTBPid clientTBPid = null;



      if (StringUtil.isNullOrEmpty(uid)) {

         // 用户未登录

         if (acceptData.getPlatform().equalsIgnoreCase("android")) {

            clientTBPid = tbPidService.getAndroidDefault();

         } else {

            clientTBPid = tbPidService.getIOSDefault();

         }



      // 用户未登录

      if (acceptData.getPlatform().equalsIgnoreCase("android")) {

         clientTBPid = tbPidService.getAndroidDefault();

      } else {

         // 用户已经登录

         if (acceptData.getPlatform().equalsIgnoreCase("android")) {

            clientTBPid = tbPidService.getAndroidDefault();

         } else {

            clientTBPid = tbPidService.getIOSDefault();

         }

         clientTBPid = tbPidService.getIOSDefault();

      }



      LogHelper.test("获取PID耗时：" + (java.lang.System.currentTimeMillis() - startTime));

@@ -1665,6 +1803,21 @@


               try {

                  goods = redisManager.getTaoBaoGoodsBrief(Long.parseLong(id));

                  if (goods.getTkRate() == null || new BigDecimal(0).compareTo(goods.getTkRate()) == 0) {

                     String appId = clientPid.split("_")[2];

                     TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(appId);

                     TaoKeAppInfo app = new TaoKeAppInfo();

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

                     app.setAppKey(config.getAppKey());

                     app.setAppSecret(config.getAppSecret());

                     app.setPid(clientPid);

                     TaoBaoGoodsBrief linkInfo = TaoKeApiUtil.specialConvertCoupon(goods.getAuctionId(), app);

                     if (linkInfo != null) {

                        goods.setAuctionUrl(linkInfo.getAuctionUrl());

                        goods.setCouponLink(linkInfo.getCouponLink());

                        goods.setTkRate(linkInfo.getTkRate());

                     }

                  }

               } catch (TaobaoGoodsDownException e) {

                  // 商品下架

                  ThreadUtil.run(new Runnable() {

@@ -1691,6 +1844,15 @@
                     // 测试使用

                     ticket.put("couponUrl", goods.getCouponLink());

                     data.put("ticket", ticket);

                  }



                  if (goods.getTkRate() == null || new BigDecimal(0).compareTo(goods.getTkRate()) == 0) {

                     TaoBaoGoodsBrief linkInfo = TaoKeApiUtil.specialConvertCoupon(goods.getAuctionId(), app);

                     if (linkInfo != null) {

                        goods.setAuctionUrl(linkInfo.getAuctionUrl());

                        goods.setCouponLink(linkInfo.getCouponLink());

                        goods.setTkRate(linkInfo.getTkRate());

                     }

                  }



               } catch (NumberFormatException e) {

@@ -1808,7 +1970,7 @@


         String token = "";

         if (!StringUtil.isNullOrEmpty(tb.getCouponLink())) {

             token = redisManager.getCommonTaoToken(tb.getAuctionId());

            token = redisManager.getCommonTaoToken(tb.getAuctionId());

            if (StringUtil.isNullOrEmpty(token)) {

               token = TaoKeApiUtil.getTKToken(tb.getPictUrl(), tb.getTitle(), tb.getCouponLink());

               redisManager.saveCommonTaoToken(tb.getAuctionId(), token);

@@ -1891,8 +2053,13 @@
      data.put("couponUsers", listCouponUser);

      data.put("detailWebUrl", "http://apph5.yeshitv.com/apppage/goods_img.html?id=" + id);

      // 商品链接

      data.put("h5Url", String.format("http://%s%s?id=%s&appType=flq", configService.getH5Host(),

            Constant.systemCommonConfig.getShareGoodsPagePath(), tb.getAuctionId() + ""));

      String h5Url = String.format("http://%s%s?id=%s&appType=flq", configService.getH5Host(),

            Constant.systemCommonConfig.getShareGoodsPagePath(), tb.getAuctionId() + "");

      try {

         data.put("h5Url", HttpUtil.getShortLink(h5Url));

      } catch (Exception e) {

         data.put("h5Url", h5Url);

      }



      // 取消分享活动

      // if (!StringUtil.isNullOrEmpty(uid)

@@ -2021,39 +2188,43 @@
      });



      List<TaoBaoGoodsBrief> listQuality = new ArrayList<TaoBaoGoodsBrief>();



      try {

         List<QualityFactory> listRecommend = qualityGoodsService.recommendByAuctionId(id);



         if (listRecommend != null && listRecommend.size() > 1) {

            for (QualityFactory quality : listRecommend) {



               TaoBaoGoodsBrief taoBaoGoodsBrief = quality.getTaoBaoGoodsBrief();

               if (taoBaoGoodsBrief == null) {

                  continue;

               }



               int biz30day = taoBaoGoodsBrief.getBiz30day();

               if (biz30day >= 10000) {

                  double sales = biz30day;

                  String salesCountMidea = String.format("%.1f", sales / 10000);

                  taoBaoGoodsBrief.setSalesCount(salesCountMidea + "万");

               } else {

                  taoBaoGoodsBrief.setSalesCount(biz30day + "");

               }



               // 改变图片尺寸

               String pictUrl = taoBaoGoodsBrief.getPictUrl();

               if (!StringUtil.isNullOrEmpty(pictUrl) && !pictUrl.contains("320x320")) {

                  taoBaoGoodsBrief.setPictUrl(TbImgUtil.getTBSize320Img(pictUrl));

               }



               listQuality.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null));

            }

         }

      } catch (Exception e2) {

         e2.printStackTrace();

      }

      // 删除推荐

      //

      // try {

      // List<QualityFactory> listRecommend =

      // qualityGoodsService.recommendByAuctionId(id);

      //

      // if (listRecommend != null && listRecommend.size() > 1) {

      // for (QualityFactory quality : listRecommend) {

      //

      // TaoBaoGoodsBrief taoBaoGoodsBrief = quality.getTaoBaoGoodsBrief();

      // if (taoBaoGoodsBrief == null) {

      // continue;

      // }

      //

      // int biz30day = taoBaoGoodsBrief.getBiz30day();

      // if (biz30day >= 10000) {

      // double sales = biz30day;

      // String salesCountMidea = String.format("%.1f", sales / 10000);

      // taoBaoGoodsBrief.setSalesCount(salesCountMidea + "万");

      // } else {

      // taoBaoGoodsBrief.setSalesCount(biz30day + "");

      // }

      //

      // // 改变图片尺寸

      // String pictUrl = taoBaoGoodsBrief.getPictUrl();

      // if (!StringUtil.isNullOrEmpty(pictUrl) &&

      // !pictUrl.contains("320x320")) {

      // taoBaoGoodsBrief.setPictUrl(TbImgUtil.getTBSize320Img(pictUrl));

      // }

      //

      // listQuality.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief,

      // proportion.toString(), null));

      // }

      // }

      // } catch (Exception e2) {

      // e2.printStackTrace();

      // }



      // 取偶数个数据

      if (listExtra.size() % 2 != 0) {

@@ -2065,8 +2236,8 @@
      }



      JSONObject data = new JSONObject();

      data.put("listGuess", JsonUtil.getApiCommonGson().toJson(listExtra));

      data.put("listQuality", JsonUtil.getApiCommonGson().toJson(listQuality));

      data.put("listQuality", JsonUtil.getApiCommonGson().toJson(listExtra));

      data.put("listGuess", JsonUtil.getApiCommonGson().toJson(listQuality));



      out.print(JsonUtil.loadTrueResult(data));

   }