From e265881fa0d83b8767cadf7b1c83c71b80b5bb6d Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 17 十二月 2019 10:39:24 +0800
Subject: [PATCH] 隐藏好店
---
fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java | 161 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 153 insertions(+), 8 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 35ac513..6d7151c 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
@@ -1,7 +1,9 @@
package com.yeshi.fanli.service.impl.homemodule;
import java.io.InputStream;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.UUID;
@@ -17,12 +19,18 @@
import com.yeshi.fanli.dao.mybatis.homemodule.SpecialMapper;
import com.yeshi.fanli.dto.common.CommonContentTypeEnum;
+import com.yeshi.fanli.entity.AppVersionInfo;
import com.yeshi.fanli.entity.accept.AcceptData;
+import com.yeshi.fanli.entity.bus.homemodule.AdActivityVersionControl;
+import com.yeshi.fanli.entity.bus.homemodule.AdActivityVersionControl.AdActivityType;
import com.yeshi.fanli.entity.bus.homemodule.Special;
import com.yeshi.fanli.entity.common.JumpDetailV2;
+import com.yeshi.fanli.exception.homemodule.HomeNavbarException;
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.AdActivityVersionControlService;
import com.yeshi.fanli.service.inter.homemodule.SpecialCardService;
import com.yeshi.fanli.service.inter.homemodule.SpecialPlaceService;
import com.yeshi.fanli.service.inter.homemodule.SpecialService;
@@ -49,6 +57,12 @@
@Resource
private ConfigService configService;
+
+ @Resource
+ private AppVersionService appVersionService;
+
+ @Resource
+ private AdActivityVersionControlService adActivityVersionControlService;
@Override
public Special selectByPrimaryKey(Long id) {
@@ -81,12 +95,20 @@
throw new SpecialException(1, "璺宠浆鍙傛暟闈濲SON鏍煎紡");
}
+ String startTime_str = record.getStartTime_str();
+ if (record.isTimeTask() && (startTime_str == null || startTime_str.length() == 0)) {
+ throw new SpecialException(1, "鎺у埗鏃堕棿涓嶈兘涓虹┖");
+ }
+
if (!StringUtil.isNullOrEmpty(jumpType)) {
List<JumpDetailV2> listByType = jumpDetailV2Service.listByType(jumpType);
if (listByType != null && listByType.size() > 0) {
record.setJumpDetail(listByType.get(0));
}
}
+
+ // 鏃堕棿杞崲
+ conversionTime(record);
Long state = record.getState();
if (state == null) {
@@ -190,6 +212,38 @@
record.setUpdatetime(new Date());
specialMapper.updateByPrimaryKey(record);
+ }
+ }
+
+ /**
+ * web娈垫椂闂磋浆鎹�
+ *
+ * @param record
+ */
+ public void conversionTime(Special record) throws SpecialException, Exception {
+ // 鏄惁鏃堕棿鎺у埗
+ if (!record.isTimeTask()) {
+ record.setStartTime(null);
+ record.setEndTime(null);
+ } else {
+ String startTime_str = record.getStartTime_str();
+ String endTime_str = record.getEndTime_str();
+
+ if ((startTime_str == null || startTime_str.trim().length() == 0)
+ && (endTime_str == null || endTime_str.trim().length() == 0)) {
+ throw new HomeNavbarException(1, "璇疯緭鍏ユ帶鍒舵椂闂�");
+ } else {
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ if (startTime_str != null && startTime_str.trim().length() > 0) {
+ startTime_str = startTime_str.replaceAll("T", " ");
+ record.setStartTime(format.parse(startTime_str));
+ }
+
+ if (endTime_str != null && endTime_str.trim().length() > 0) {
+ endTime_str = endTime_str.replaceAll("T", " ");
+ record.setEndTime(format.parse(endTime_str));
+ }
+ }
}
}
@@ -325,6 +379,31 @@
// 璺宠浆閾炬帴
for (Special special : list) {
+
+ Date startTime = special.getStartTime();
+ Date endTime = special.getEndTime();
+
+ if (startTime == null && endTime == null) {
+ special.setTimeTask(false);
+ special.setStartTime_str("");
+ special.setEndTime_str("");
+ } else {
+ special.setTimeTask(true);
+
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm");
+ if (startTime == null) {
+ special.setStartTime_str("");
+ } else {
+ special.setStartTime_str(sdf.format(startTime));
+ }
+
+ if (endTime == null) {
+ special.setEndTime_str("");
+ } else {
+ special.setEndTime_str(sdf.format(endTime));
+ }
+ }
+
String params = special.getParams();
if (StringUtil.isNullOrEmpty(params)) {
special.setParams("");
@@ -365,6 +444,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 {
@@ -372,14 +457,19 @@
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";
else if (VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion()))
indexArc = "index_arc_1.5.6";
- List<Special> listArc = specialMapper.listByPlaceKey(indexArc, sex);
+ int platformCode = Constant.getPlatformCode(acceptData.getPlatform());
+ int version = Integer.parseInt(acceptData.getVersion());
+
+ List<Special> listArc = specialMapper.listByPlaceKey(indexArc, sex, platformCode, version);
if (listArc == null) {
listArc = new ArrayList<Special>();
} else if (listArc.size() > 0) {
@@ -390,9 +480,10 @@
}
}
+ int hour = Calendar.getInstance().get(Calendar.HOUR_OF_DAY);
+
// 澶勭悊9.9鍖呴偖
- if (listArc != null && VersionUtil.greaterThan_1_5_50(acceptData.getPlatform(), acceptData.getVersion())
- && !Constant.IS_TEST)
+ if (listArc != null && VersionUtil.greaterThan_1_5_50(acceptData.getPlatform(), acceptData.getVersion()))
for (Special s : listArc) {
if (s.getName().contains("9.9")) {// 9鍧�9
s.setJumpDetail(jumpDetailV2Service.getByTypeCache("common_template"));
@@ -400,6 +491,18 @@
params.put("key", CommonContentTypeEnum._9k9.name());
params.put("title", CommonContentTypeEnum._9k9.getDesc());
s.setParams(params.toString());
+ } else if (s.getName().contains("鑷喘绔嬪噺")) {
+ if (hour < 6) {// 0-6鐐逛箣闂翠笉杩涘叆鑷喘绔嬪噺鐨勯〉闈�
+ s.setJumpDetail(jumpDetailV2Service.getByTypeCache("web"));
+ JSONObject params = new JSONObject();
+ params.put("url", configService.get("tlj_own_buy_nogoods"));
+ s.setParams(params.toString());
+ } else {
+ // 鏌ヨ涓撻璇︽儏
+ Special special = specialMapper.selectByPrimaryKey(s.getId());
+ s.setJumpDetail(special.getJumpDetail());
+ s.setParams(special.getParams());
+ }
}
}
@@ -414,7 +517,7 @@
&& configService.iosOnLining(Integer.parseInt(acceptData.getVersion()))) {
// 濡傛灉IOS褰撳墠鐗堟湰澶勪簬瀹℃牳鐘舵�佸氨涓嶈繑鍥�
} else {
- listActivity = specialMapper.listByPlaceKey("index_activity", null);
+ listActivity = specialMapper.listByPlaceKey("index_activity", null, platformCode, version);
}
if (listActivity == null) {
@@ -437,7 +540,7 @@
indexBlock = "index_block_1.5.6";
JSONObject blockJsonMap = new JSONObject();
- List<Special> listBlock = specialMapper.listByPlaceKey(indexBlock, sex);
+ List<Special> listBlock = specialMapper.listByPlaceKey(indexBlock, sex, platformCode, version);
if (listBlock == null) {
listBlock = new ArrayList<Special>();
} else if (listBlock.size() > 0) {
@@ -471,8 +574,26 @@
}
@Override
- public List<Special> listByPlaceKey(String placeKey) {
- return specialMapper.listByPlaceKey(placeKey, null);
+ public List<Special> listByPlaceKey(String placeKey, Integer platform, Integer versionCode) {
+ return specialMapper.listByPlaceKey(placeKey, null, platform, versionCode);
+ }
+
+ @Override
+ public List<Special> listByPlaceKeyList(long start, int count, List<String> list, Integer platform,
+ Integer versionCode) {
+ return specialMapper.listByPlaceKeyList(start, count, list, null, platform, versionCode);
+ }
+
+ @Override
+ public long countByPlaceKeyList(List<String> list, Integer platform, Integer versionCode) {
+ return specialMapper.countByPlaceKeyList(list, null, platform, versionCode);
+ }
+
+ @Override
+ @Cacheable(value = "specialCache", key = "'listByPlaceKeyHasLabel'+#start+'-'+#platform+'-'+#versionCode+'-'+#list")
+ public List<Special> listByPlaceKeyHasLabel(long start, int count, List<String> list, Integer platform,
+ Integer versionCode) {
+ return specialMapper.listByPlaceKeyHasLabel(start, count, list, null, platform, versionCode);
}
/**
@@ -492,4 +613,28 @@
}
}
}
+
+ @Transactional(rollbackFor = Exception.class)
+ @Override
+ public void setVersions(Long specialId, List<Long> versions) throws Exception {
+ Special special = selectByPrimaryKey(specialId);
+ if (special == null) {
+ throw new Exception("涓撻涓嶅瓨鍦�");
+ }
+ List<AdActivityVersionControl> versionList = adActivityVersionControlService
+ .listByTypeAndSourceId(AdActivityType.special, special.getId());
+ if (versionList != null) {
+ for (AdActivityVersionControl control : versionList)
+ adActivityVersionControlService.deleteByPrimaryKey(control.getId());
+ }
+ // 娣诲姞鏄犲皠
+ for (Long versionId : versions) {
+ AdActivityVersionControl control = new AdActivityVersionControl();
+ control.setCreateTime(new Date());
+ control.setSourceId(special.getId());
+ control.setType(AdActivityType.special);
+ control.setVersion(new AppVersionInfo(versionId));
+ adActivityVersionControlService.addVersionControl(control);
+ }
+ }
}
--
Gitblit v1.8.0