Browse Source

修改conpon/detailbug

release_toaliyun_real
xiaohanzi 6 years ago
parent
commit
dd649ce64c
3 changed files with 23 additions and 0 deletions
  1. +14
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java
  2. +3
    -0
      mallinkService/src/main/java/com/iformall/service/WxMerchantService.java
  3. +6
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java

+ 14
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java View File

@@ -2,6 +2,9 @@ package com.iformall.controller;

import java.lang.reflect.InvocationTargetException;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;

import org.apache.commons.beanutils.BeanUtils;
@@ -21,10 +24,12 @@ import com.iformall.common.ResultData;
import com.iformall.domain.po.WxCoupon;
import com.iformall.domain.po.WxCouponChannel;
import com.iformall.domain.vo.WxCouponCVo;
import com.iformall.domain.vo.WxMerchantVo;
import com.iformall.enums.EnumCouponChannelActivityStatus;
import com.iformall.enums.EnumCouponChannelType;
import com.iformall.service.WxCouponChannelService;
import com.iformall.service.WxCouponService;
import com.iformall.service.WxMerchantService;
import com.iformall.utils.Constant;

import io.swagger.annotations.Api;
@@ -42,6 +47,8 @@ public class WxCouponController extends BaseController {
private WxCouponChannelService wxCouponChannelService;
@Autowired
private WxCouponService couponService;
@Autowired
private WxMerchantService merchantService;

@Autowired
@Qualifier("couponDetailRedisTemplate")
@@ -138,6 +145,13 @@ public class WxCouponController extends BaseController {
couponCVo.setCouponId(cc.getCouponId());
couponCVo.setRemainInventory(c.getRemainInventory());
couponCVo.setStatus(c.getStatus());
Map param = new HashMap();
param.put("productId", cc.getCouponId());
List<WxMerchantVo> chantlist = merchantService.findMerchantVoList(param);
if (null != chantlist && chantlist.size()>0) {
couponCVo.setMerchantVoList(chantlist);
}
return couponCVo;
}



+ 3
- 0
mallinkService/src/main/java/com/iformall/service/WxMerchantService.java View File

@@ -16,6 +16,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;

/**
@@ -139,5 +140,7 @@ public interface WxMerchantService {
Optional<WxMerchant> findByName(String name);

PageInfo<WxMerchant> listVoAsPage(WxMerchant wxMerchant, Integer pageNum, Integer pageSize);
List<WxMerchantVo> findMerchantVoList(Map paramMap);

}

+ 6
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java View File

@@ -789,4 +789,10 @@ public class WxMerchantServiceImpl implements WxMerchantService {
public PageInfo<WxMerchantTradeDetailVo> userTradeDetailList(WxMerchant record, Integer pageIndex, Integer pageSize) {
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantMapper.userTradeDetailList(record));
}


@Override
public List<WxMerchantVo> findMerchantVoList(Map paramMap) {
return wxCouponMerchantMapper.findMerchantVoList(paramMap);
}
}

Loading…
Cancel
Save