yujian
2019-12-19 626d711cb15896055c13fe344eb7fcc824589715
fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/FloatADServiceImpl.java
@@ -16,8 +16,9 @@
import com.yeshi.fanli.dao.mybatis.homemodule.FloatADMapper;
import com.yeshi.fanli.entity.bus.homemodule.FloatAD;
import com.yeshi.fanli.entity.bus.homemodule.FloatAD.FloatADTypeEnum;
import com.yeshi.fanli.entity.common.JumpDetailV2;
import com.yeshi.fanli.exception.FloatADException;
import com.yeshi.fanli.exception.homemodule.FloatADException;
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
import com.yeshi.fanli.service.inter.homemodule.FloatADService;
import com.yeshi.fanli.util.StringUtil;
@@ -52,6 +53,10 @@
         throw new FloatADException(1, "跳转参数非JSON格式");
      }
      
      FloatADTypeEnum typeEnum = record.getTypeEnum();
      if (typeEnum == null)
         throw new FloatADException(1, "类型不能为空");
      if (!StringUtil.isNullOrEmpty(jumpType)) {
         List<JumpDetailV2> listByType = jumpDetailV2Service.listByType(jumpType);
         if (listByType !=null && listByType.size() > 0) {
@@ -84,6 +89,12 @@
         picture = uploadPicture(file);
      }
      
      // 适用类型 : 0通用  1新人
      Integer type = record.getType();
      if (type == null) {
         record.setType(0);
      }
      Long id = record.getId();
      if (id == null) {
         int maxOrder = floatADMapper.getMaxOrderByPosition(position);
@@ -93,10 +104,6 @@
            record.setState(0);
         }
         
         Integer type = record.getType();
         if (type == null) {
            record.setType(0);
         }
         record.setOrder(maxOrder + 1);
         record.setCreateTime(new Date());
         record.setUpdateTime(new Date());
@@ -117,7 +124,6 @@
            record.setPicture(resultObj.getPicture());
         }
         
         record.setType(resultObj.getType());
         record.setOrder(resultObj.getOrder());
         record.setCreateTime(resultObj.getCreateTime());
         record.setUpdateTime(new Date());
@@ -220,6 +226,11 @@
      
      for (FloatAD floatAD : listQuery) {
         
         FloatADTypeEnum typeEnum = floatAD.getTypeEnum();
         if (typeEnum != null) {
            floatAD.setTypeName(typeEnum.getDesc());
         }
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm");
         Date startTime = floatAD.getStartTime();
         if (startTime == null) {
@@ -282,5 +293,15 @@
      return floatAD;
   }
   
   @Override
   public List<FloatAD> getValidCommonByPosition(String position) {
      return floatADMapper.getValidFloatAD(position, 1);
   }
   @Override
   public List<FloatAD> getValidByPosition(String position) {
      return floatADMapper.getValidFloatAD(position, null);
   }
}