Browse Source

/、bug

release_toaliyun_real
xhxu 4 years ago
parent
commit
9545b3dab0
2 changed files with 12 additions and 6 deletions
  1. +8
    -4
      mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java
  2. +4
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java

+ 8
- 4
mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java View File

@@ -89,8 +89,10 @@ public class WxCouponChannelController extends BaseController {
logger.info("WxCouponChannelController.chache.get:{} page:{}",key,page);
if (null == page ) {
page = wxCouponChannelService.newListPageVo(wxCouponChannel, pageNum, pageSize);
filterTimed(wxCouponChannel, page);
RedisCacheUtils.cache(redisTemplate, key, page, 100);
if(page.getList() != null && page.getList().size() > 0){
filterTimed(wxCouponChannel, page);
RedisCacheUtils.cache(redisTemplate, key, page, 100);
}
}
return new ResultData(page);
}
@@ -171,8 +173,10 @@ public class WxCouponChannelController extends BaseController {
logger.info("WxCouponChannelController.chache.get:{} page:{}",key,page);
if (null == page ) {
page = wxCouponChannelService.newListPageVo(wxCouponChannel, pageNum, pageSize);
filterTimed(wxCouponChannel, page);
RedisCacheUtils.cache(redisTemplate, key, page, 100);
if(page.getList() != null && page.getList().size() > 0){
filterTimed(wxCouponChannel, page);
RedisCacheUtils.cache(redisTemplate, key, page, 100);
}
}

if(wxCouponChannel.getMerchantId() != null){


+ 4
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java View File

@@ -233,8 +233,10 @@ public class WxGameServiceImpl implements WxGameService {
List<WxCouponChannelVo> voList = wxCouponChannelService.newfindListVo(couponChannelQ);

Map<Long, WxCouponChannelVo> wxCouponChannelsMap = new HashMap<Long, WxCouponChannelVo>();
for(WxCouponChannelVo wxCouponChannelVo: voList) {
wxCouponChannelsMap.put(wxCouponChannelVo.getCouponId(), wxCouponChannelVo);
if(voList != null && voList.size() > 0){
for(WxCouponChannelVo wxCouponChannelVo: voList) {
wxCouponChannelsMap.put(wxCouponChannelVo.getCouponId(), wxCouponChannelVo);
}
}

// get game's coupon


Loading…
Cancel
Save