冲突解决

yujian

2019-04-08 5c4ecf9e8b47efbbf5d21c9e109be0a60cb7e26d

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

@@ -28,11 +28,11 @@
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;

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

import com.yeshi.fanli.entity.bus.lable.QualityFactory;

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

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

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

@@ -74,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;

@@ -85,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;

@@ -100,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;

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

public class RecommendController {



   @Resource

   private RecommendBannerService recommendService;



   @Resource

   private BusinessSystemService businessSystemService;

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

   private UserInfoService userInfoService;



   @Resource

   private TaoBaoOrderUtil taoBaoOrderUtil;



   @Resource

   private TaoBaoCouponService taoBaoCouponService;

@@ -157,9 +153,6 @@


   @Resource

   private CollectionGoodsV2Service collectionGoodsV2Service;



   @Resource

   private HongBaoManageMapper hongBaoManageMapper;



   @Resource

   private TaoBaoGoodsBriefService taoBaoGoodsBriefService;

@@ -220,6 +213,10 @@


   @Resource

   private UserInfoExtraService userInfoExtraService;

	
   @Resource

   private QualityFlashSaleService qualityFlashSaleService;

	


   @RequestMapping(value = "getHonestList")

   public void getHonestList(AcceptData acceptData, PrintWriter out) {

@@ -571,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")) {

@@ -1569,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)

    *