From 3824cbcaec6e6c67418d5280a53e9c2fedeef6f9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 11 七月 2019 16:34:13 +0800
Subject: [PATCH] 订单bug，分享爆款自购修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/FloatADServiceImpl.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 8ed9d59..4f2dcf2 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,9 +8,9 @@
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;
@@ -48,6 +48,8 @@
String params = record.getParams();
if (params == null || params.trim().length() == 0 || "null".equalsIgnoreCase(params) ) {
record.setParams(null);
+ } else if (!StringUtil.isJson(params)) {
+ throw new FloatADException(1, "璺宠浆鍙傛暟闈濲SON鏍煎紡");
}
if (!StringUtil.isNullOrEmpty(jumpType)) {
@@ -80,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();
@@ -256,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();
--
Gitblit v1.8.0