From 0922bfdb56bc30125d6fc8e13c50cdda7cd9dc72 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 09 九月 2019 18:59:52 +0800
Subject: [PATCH] 提现自动绑定修改

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java
index beaa01e..8bd65cc 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java
@@ -23,11 +23,11 @@
 import com.yeshi.fanli.entity.common.JumpDetailV2;
 import com.yeshi.fanli.exception.homemodule.SpecialException;
 import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
+import com.yeshi.fanli.service.inter.config.AppVersionService;
 import com.yeshi.fanli.service.inter.config.ConfigService;
 import com.yeshi.fanli.service.inter.homemodule.SpecialCardService;
 import com.yeshi.fanli.service.inter.homemodule.SpecialPlaceService;
 import com.yeshi.fanli.service.inter.homemodule.SpecialService;
-import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.VersionUtil;
 
@@ -50,6 +50,9 @@
 
 	@Resource
 	private ConfigService configService;
+
+	@Resource
+	private AppVersionService appVersionService;
 
 	@Override
 	public Special selectByPrimaryKey(Long id) {
@@ -366,6 +369,12 @@
 	}
 
 	@Override
+	@Cacheable(value = "specialCache", key = "'listByVersion-'+#start+'-'+#count+'-'+#card+'-'+#platform+'-'+#versionCode")
+	public List<Special> listByVersion(long start, int count, String card, Integer platform, Integer versionCode) {
+		return specialMapper.listByVersion(start, count, card, platform, versionCode);
+	}
+
+	@Override
 	@Cacheable(value = "specialCache", key = "'listCacheSpecialToIndex'+#acceptData.platform+'-'+#acceptData.version+'-'+#sex")
 	public JSONObject listCacheSpecialToIndex(AcceptData acceptData, Integer sex) throws Exception {
 
@@ -373,7 +382,9 @@
 		JSONObject arcMap = new JSONObject();
 
 		String indexArc = "index_arc";
-		if (VersionUtil.greaterThan_1_6_0(acceptData.getPlatform(), acceptData.getVersion()))
+		if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion()))
+			indexArc = "index_arc_1.6.5";
+		else if (VersionUtil.greaterThan_1_6_0(acceptData.getPlatform(), acceptData.getVersion()))
 			indexArc = "index_arc_1.6.0";
 		else if (VersionUtil.greaterThan_1_5_70(acceptData.getPlatform(), acceptData.getVersion()))
 			indexArc = "index_arc_1.5.7";
@@ -409,8 +420,10 @@
 						params.put("url", configService.get("tlj_own_buy_nogoods"));
 						s.setParams(params.toString());
 					} else {
-						s.setJumpDetail(jumpDetailV2Service.getByTypeCache("tlj_own_buy"));
-						s.setParams(null);
+						// 鏌ヨ涓撻璇︽儏
+						Special special = specialMapper.selectByPrimaryKey(s.getId());
+						s.setJumpDetail(special.getJumpDetail());
+						s.setParams(special.getParams());
 					}
 				}
 			}

--
Gitblit v1.8.0