Просмотр исходного кода

Merge branch 'release_toaliyun_real_2022_02' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_2022_02

release_toaliyun_real
winter 4 лет назад
Родитель
Сommit
164cf17f2f
4 измененных файлов: 6 добавлений и 9 удалений
  1. +0
    -5
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java
  2. +4
    -2
      mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java
  3. +2
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java
  4. +0
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java

+ 0
- 5
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java Просмотреть файл

@@ -5,18 +5,13 @@ import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.app.WxAppinfoController;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.dto.WxCouponChannelDto;
import com.iformall.domain.po.*;
import com.iformall.domain.vo.WxCouponChannelVo;
import com.iformall.enums.EnumCouponSourceType;
import com.iformall.domain.po.base.BaseEntity;
import com.iformall.mapper.WxCouponChannelMapper;
import com.iformall.service.QrCodeService;
import com.iformall.service.WxCouponChannelService;
import com.iformall.service.WxCouponService;
import com.iformall.service.WxFlowService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;


+ 4
- 2
mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java Просмотреть файл

@@ -71,8 +71,9 @@ public class WxCouponChannelController extends BaseController {
}
wxCouponChannel.setShowBeginTime(new Date());

String key = EnumCacheKey.C_INDEX_PAGE_LIST.getMessage() + wxCouponChannel.getTenantId() + "_" + pageNum + ":";
String key = EnumCacheKey.C_INDEX_PAGE_LIST.getMessage() + wxCouponChannel.getTenantId() + "_" + wxCouponChannel.getBusiness() + "_" + pageNum + ":";
PageInfo<WxCouponChannelVo> page = RedisCacheUtils.getCacheObject(redisTemplate, key, PageInfo.class);
logger.info("WxCouponChannelController.chache.get:{} page:{}",key,page);
if (null == page ) {
page = wxCouponChannelService.newListPageVo(wxCouponChannel, pageNum, pageSize);
filterTimed(wxCouponChannel, page);
@@ -106,7 +107,7 @@ public class WxCouponChannelController extends BaseController {
// return new ResultData(map);
// }

@RedisCache(expireTime = 100)
@RedisCache()
@ApiOperation("商户活动列表信息")
@PostMapping("listByMerchant")
@ApiImplicitParams({
@@ -153,6 +154,7 @@ public class WxCouponChannelController extends BaseController {
}
key = EnumCacheKey.MERCHANT_COUPON_PAGE_LIST.getMessage() + key + "_" + pageNum + ":";
PageInfo<WxCouponChannelVo> page = RedisCacheUtils.getCacheObject(redisTemplate, key, PageInfo.class);
logger.info("WxCouponChannelController.chache.get:{} page:{}",key,page);
if (null == page ) {
page = wxCouponChannelService.newListPageVo(wxCouponChannel, pageNum, pageSize);
filterTimed(wxCouponChannel, page);


+ 2
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java Просмотреть файл

@@ -46,6 +46,7 @@ public class WxTopicController extends BaseController {

String key = EnumCacheKey.TOPIC_ONE.getMessage() + wxTopic.getTenantId() + ":";
WxTopic show = RedisCacheUtils.getCacheObject(redisTemplate, key, WxTopic.class);
logger.info("WxCouponChannelController.chache.get:{} show:{}",key,show);
if (null == show ) {
show = wxTopicService.show(wxTopic);
RedisCacheUtils.cache(redisTemplate, key, show, 100);
@@ -63,6 +64,7 @@ public class WxTopicController extends BaseController {

String key = EnumCacheKey.TOPIC_LIST.getMessage() + wxTopic.getTenantId() + ":";
List<WxTopic> topicList = RedisCacheUtils.getCacheObject(redisTemplate, key, List.class);
logger.info("WxTopicController.chache.get:{} topicList:{}",key,topicList);
if (null == topicList ) {
topicList = wxTopicService.showList(wxTopic);
RedisCacheUtils.cache(redisTemplate, key, topicList, 100);


+ 0
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java Просмотреть файл

@@ -26,8 +26,6 @@ import com.iformall.service.excel.WxCardDataExporter;
import com.iformall.service.excel.WxCouponDataExporter;
import com.iformall.service.excel.WxPressDataExporter;

import cn.afterturn.easypoi.handler.inter.IExcelExportServer;

import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;


Загрузка…
Отмена
Сохранить