From c37e84a5bc4629475da4a38415a231f121d39c61 Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期四, 07 十一月 2019 12:28:57 +0800 Subject: [PATCH] 品牌 --- fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/FloatADServiceImpl.java | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/FloatADServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/FloatADServiceImpl.java index e2fe975..57d7711 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/FloatADServiceImpl.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/FloatADServiceImpl.java @@ -17,7 +17,7 @@ import com.yeshi.fanli.dao.mybatis.homemodule.FloatADMapper; import com.yeshi.fanli.entity.bus.homemodule.FloatAD; 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; @@ -84,6 +84,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 +99,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 +119,6 @@ record.setPicture(resultObj.getPicture()); } - record.setType(resultObj.getType()); record.setOrder(resultObj.getOrder()); record.setCreateTime(resultObj.getCreateTime()); record.setUpdateTime(new Date()); @@ -282,5 +283,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); + } } -- Gitblit v1.8.0