From 3ce9e928e082ff8abf697dba560cbfbb412e89f8 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 11 十一月 2019 15:45:02 +0800
Subject: [PATCH] 商城后台编辑
---
fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/FloatADServiceImpl.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 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 9587fef..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
@@ -8,16 +8,16 @@
import java.util.UUID;
import javax.annotation.Resource;
-import javax.transaction.Transactional;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import org.yeshi.utils.tencentcloud.COSManager;
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;
@@ -82,6 +82,12 @@
String picture = null;
if (file != null) {
picture = uploadPicture(file);
+ }
+
+ // 閫傜敤绫诲瀷 锛� 0閫氱敤 1鏂颁汉
+ Integer type = record.getType();
+ if (type == null) {
+ record.setType(0);
}
Long id = record.getId();
@@ -258,8 +264,8 @@
}
@Override
- public FloatAD getEffectiveFloatAD(String position) {
- FloatAD floatAD = floatADMapper.getEffectiveFloatAD(position);
+ public FloatAD getEffectiveFloatAD(String position, Integer type) {
+ FloatAD floatAD = floatADMapper.getEffectiveFloatAD(position, type);
if (floatAD != null) {
JumpDetailV2 jumpDetail = floatAD.getJumpDetail();
@@ -277,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