From fe879975a3e8a0a1aa280fb839e02d159bfbcff8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 27 八月 2019 18:04:38 +0800
Subject: [PATCH] 金币任务多次获取bug修改

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/FloatADServiceImpl.java |   12 +++++++++---
 1 files changed, 9 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 9587fef..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;
 
@@ -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();
 			

--
Gitblit v1.8.0