Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-27 d8359ddb48dab5cc797a9d552e11fde571f4920c

 fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java

@@ -2,6 +2,7 @@


import java.io.InputStream;

import java.util.ArrayList;

import java.util.Calendar;

import java.util.Date;

import java.util.List;

import java.util.UUID;

@@ -68,12 +69,12 @@
      if (name == null || name.trim().length() == 0) {

         throw new SpecialException(1, "专题名称不能为空");

      }

		


      Integer sex = record.getSex();

      if (sex == null) {

         throw new SpecialException(1, "性别不能为空");

      }

		


      String params = record.getParams();

      if (params == null || params.trim().length() == 0 || "null".equalsIgnoreCase(params)) {

         record.setParams(null);

@@ -81,8 +82,6 @@
         throw new SpecialException(1, "跳转参数非JSON格式");

      }



		
		
      if (!StringUtil.isNullOrEmpty(jumpType)) {

         List<JumpDetailV2> listByType = jumpDetailV2Service.listByType(jumpType);

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

@@ -118,15 +117,22 @@
         record.setIcon(icon);

         record.setPicture(picture);

         record.setSubPicture(subPicture);

			


         // 排序

         record.setOrderby(specialMapper.getDefaultMaxOrder(cardId) + 1);

         record.setOrderMan(specialMapper.getManMaxOrder(cardId) + 1);

         record.setOrderWoman(specialMapper.getWomanMaxOrder(cardId) + 1);

			


         record.setCreatetime(new Date());

         record.setUpdatetime(new Date());

         specialMapper.insert(record);



         Special s = new Special();

         s.setId(record.getId());

         s.setOrderby(Integer.parseInt(s.getId() + ""));

         s.setOrderMan(Integer.parseInt(s.getId() + ""));

         s.setOrderWoman(Integer.parseInt(s.getId() + ""));

         specialMapper.updateByPrimaryKeySelective(s);

      } else {

         // 修改

         Special resultObj = specialMapper.selectByPrimaryKey(id);

@@ -177,12 +183,12 @@
         } else {

            record.setIcon(resultObj.getIcon());

         }

			


         record.setOrderby(resultObj.getOrderby());

         record.setOrderMan(resultObj.getOrderMan());

         record.setOrderWoman(resultObj.getOrderWoman());

         record.setCreatetime(resultObj.getCreatetime());

			


         record.setUpdatetime(new Date());

         specialMapper.updateByPrimaryKey(record);

      }

@@ -244,32 +250,32 @@
         if (exchangeObject == null) {

            throw new SpecialException(1, "没有找到可交换的位置");

         }

			


         resultObj.setOrderby(exchangeObject.getOrderby());

         exchangeObject.setOrderby(orderby);

      } else if (Special.SEX_MAN == sex ) {

      } else if (Special.SEX_MAN == sex) {

         Integer orderMan = resultObj.getOrderMan();

         exchangeObject = specialMapper.getOrderByCardID(cardId, moveType, orderMan, sex);

         if (exchangeObject == null) {

            throw new SpecialException(1, "没有找到可交换的位置");

         }

			


         resultObj.setOrderMan(exchangeObject.getOrderMan());

         exchangeObject.setOrderMan(orderMan);

      } else if (Special.SEX_WOMAN == sex ) {

      } else if (Special.SEX_WOMAN == sex) {

         Integer orderWoman = resultObj.getOrderWoman();

         exchangeObject = specialMapper.getOrderByCardID(cardId, moveType, orderWoman, sex);

			


         if (exchangeObject == null) {

            throw new SpecialException(1, "没有找到可交换的位置");

         }

			


         resultObj.setOrderWoman(exchangeObject.getOrderWoman());

         exchangeObject.setOrderWoman(orderWoman);

      } else {

         throw new SpecialException(1, "sex参数不正确");

      }

		


      specialMapper.updateByPrimaryKey(resultObj);

      specialMapper.updateByPrimaryKey(exchangeObject);

   }

@@ -365,7 +371,16 @@


      // 首页-5圆形2排区域

      JSONObject arcMap = new JSONObject();

      List<Special> listArc = specialMapper.listByPlaceKey("index_arc", sex);



      String indexArc = "index_arc";

      if (VersionUtil.greaterThan_1_6_0(acceptData.getPlatform(), acceptData.getVersion()))

         indexArc = "index_arc_1.6.0";

      else if (VersionUtil.greaterThan_1_5_70(acceptData.getPlatform(), acceptData.getVersion()))

         indexArc = "index_arc_1.5.7";

      else if (VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion()))

         indexArc = "index_arc_1.5.6";



      List<Special> listArc = specialMapper.listByPlaceKey(indexArc, sex);

      if (listArc == null) {

         listArc = new ArrayList<Special>();

      } else if (listArc.size() > 0) {

@@ -376,8 +391,10 @@
         }

      }



      int hour = Calendar.getInstance().get(Calendar.HOUR_OF_DAY);



      // 处理9.9包邮

      if (listArc != null && VersionUtil.greaterThan_1_5_50(acceptData.getPlatform(), acceptData.getVersion())&&!Constant.IS_TEST)

      if (listArc != null && VersionUtil.greaterThan_1_5_50(acceptData.getPlatform(), acceptData.getVersion()))

         for (Special s : listArc) {

            if (s.getName().contains("9.9")) {// 9块9

               s.setJumpDetail(jumpDetailV2Service.getByTypeCache("common_template"));

@@ -385,6 +402,16 @@
               params.put("key", CommonContentTypeEnum._9k9.name());

               params.put("title", CommonContentTypeEnum._9k9.getDesc());

               s.setParams(params.toString());

            } else if (s.getName().contains("自购立减")) {

               if (hour < 6) {// 0-6点之间不进入自购立减的页面

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

                  JSONObject params = new JSONObject();

                  params.put("url", configService.get("tlj_own_buy_nogoods"));

                  s.setParams(params.toString());

               } else {

                  s.setJumpDetail(jumpDetailV2Service.getByTypeCache("tlj_own_buy"));

                  s.setParams(null);

               }

            }

         }



@@ -417,8 +444,12 @@
      activityMap.put("list", JsonUtil.getApiCommonGson().toJson(listActivity));



      // 首页-方形专题（品牌券、母婴...）

      String indexBlock = "index_block";

      if (VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion()))

         indexBlock = "index_block_1.5.6";



      JSONObject blockJsonMap = new JSONObject();

      List<Special> listBlock = specialMapper.listByPlaceKey("index_block", sex);

      List<Special> listBlock = specialMapper.listByPlaceKey(indexBlock, sex);

      if (listBlock == null) {

         listBlock = new ArrayList<Special>();

      } else if (listBlock.size() > 0) {

@@ -429,7 +460,6 @@
         }

      }



		
      // 品牌券

      // >=1.5.40后的版本可以用

      if (("android".equalsIgnoreCase(acceptData.getPlatform()) && Integer.parseInt(acceptData.getVersion()) > 39)