From 26f7accb815f55f18f8eedfca4324700a96884ec Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 26 八月 2020 18:23:49 +0800
Subject: [PATCH] 资金验证优化

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/FloatADServiceImpl.java |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 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 b414e8f..a85db09 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
@@ -117,7 +117,7 @@
 		
 		Long id = record.getId();
 		if (id == null) {
-			int maxOrder = floatADMapper.getMaxOrderByPosition(position);
+			int maxOrder = floatADMapper.getMaxOrderByPosition(position,record.getSystem());
 			record.setPicture(picture);
 			Integer state = record.getState();
 			if (state == null) {
@@ -200,7 +200,7 @@
 		String position = resultObj.getPosition();
 		
 		// 鑾峰彇浜ゆ崲瀵硅薄
-		FloatAD exchangeObject = floatADMapper.getByAdjoinOrder(position, order, moveType);
+		FloatAD exchangeObject = floatADMapper.getByAdjoinOrder(position, order, moveType,resultObj.getSystem());
 		if (exchangeObject == null) {
 			if (moveType == 1) {
 				throw new FloatADException(1, "鍦ㄧ浉鍚屼娇鐢ㄥ湴鏂逛腑浼樺厛绾у凡缁忔渶浣庝簡");
@@ -267,9 +267,9 @@
 	
 
 	@Override
-	public List<FloatAD> listQuery(long start, int count, String key, Integer state) throws FloatADException {
+	public List<FloatAD> listQuery(long start, int count, String key, Integer state,SystemEnum system) throws FloatADException {
 		
-		List<FloatAD> listQuery = floatADMapper.listQuery(start, count, key, state);
+		List<FloatAD> listQuery = floatADMapper.listQuery(start, count, key, state,system);
 		if (listQuery == null || listQuery.size() == 0) {
 			return listQuery;
 		}
@@ -319,14 +319,14 @@
 
 
 	@Override
-	public long countQuery(String key, Integer state) {
-		return floatADMapper.countQuery(key, state);
+	public long countQuery(String key, Integer state,SystemEnum system) {
+		return floatADMapper.countQuery(key, state,system);
 	}
 
 	@Cacheable(value = "configCache", key = "'getEffectiveFloatAD-'+#position+'-'+#type")
 	@Override
-	public FloatAD getEffectiveFloatAD(String position, Integer type) {
-		FloatAD floatAD = floatADMapper.getEffectiveFloatAD(position, type);
+	public FloatAD getEffectiveFloatAD(String position, Integer type,SystemEnum system) {
+		FloatAD floatAD = floatADMapper.getEffectiveFloatAD(position, type,system);
 		if (floatAD != null) {
 			JumpDetailV2 jumpDetail = floatAD.getJumpDetail();
 			
@@ -392,10 +392,10 @@
 		}
 	}
 	
-	@Cacheable(value = "configCache", key = "'getValidFloatADCache-'+#position+'-'+#type+'-'+#platform+'-'+#versionCode+'-'+system")
+	@Cacheable(value = "configCache", key = "'getValidFloatADCache-'+#position+'-'+#type+'-'+#platform+'-'+#versionCode+'-'+#system")
 	@Override
 	public List<FloatAD> getValidFloatADCache(String position, Integer type, String platform, Integer versionCode, SystemEnum system) {
-		List<FloatAD> list = floatADMapper.getValidFloatAD(position, type);
+		List<FloatAD> list = floatADMapper.getValidFloatAD(position, type,system);
 		// 杩囨护
 		filterFloatAD(list, platform, versionCode,system);
 		return list;

--
Gitblit v1.8.0