diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCarController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCarController.java index 2736dff75..2dcfbcf0c 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCarController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCarController.java @@ -6,6 +6,8 @@ import com.alibaba.fastjson.JSONObject; import com.simple.common.ErrorCode; import com.simple.common.Result; import com.simple.common.ResultData; +import com.simple.domain.dto.WxCounponDto; +import com.simple.domain.dto.WxCouponCarDto; import com.simple.domain.po.*; import com.simple.domain.vo.WxCouponCarVo; import com.simple.enums.EnumCarCmd; @@ -313,9 +315,13 @@ public class WxCarController extends BaseController try { WxCouponCarVo couponCarVo = wxCouponCarService.getByCoupon(coupon); if (couponCarVo != null) { - return new ResultData(couponCarVo); + WxCouponCarDto dto = new WxCouponCarDto(); + org.springframework.beans.BeanUtils.copyProperties(couponCarVo, dto); + WxMerchant merchant = wxMerchantService.getById(couponCarVo.getMerchantId()); + dto.setWxMerchant(merchant); + return new ResultData(dto); } else { - return new ResultData(ErrorCode.COUPON_IS_EMPTY.getCode(), "券不存在"); + return new ResultData(ErrorCode.COUPON_IS_EMPTY); } } catch (Exception e) { logger.error(e.getMessage()); diff --git a/mallinkService/src/main/java/com/simple/domain/dto/WxCouponCarDto.java b/mallinkService/src/main/java/com/simple/domain/dto/WxCouponCarDto.java new file mode 100644 index 000000000..895cb9f42 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/domain/dto/WxCouponCarDto.java @@ -0,0 +1,20 @@ +package com.simple.domain.dto; + +import com.simple.domain.po.WxMerchant; +import com.simple.domain.vo.WxCouponCarVo; + +import javax.persistence.Transient; + +public class WxCouponCarDto extends WxCouponCarVo { + private static final long serialVersionUID = -5721410270215370223L; + @Transient + private WxMerchant wxMerchant; + + public WxMerchant getWxMerchant() { + return wxMerchant; + } + + public void setWxMerchant(WxMerchant wxMerchant) { + this.wxMerchant = wxMerchant; + } +} diff --git a/mallinkService/src/main/java/com/simple/service/WxCouponCarService.java b/mallinkService/src/main/java/com/simple/service/WxCouponCarService.java index 03a0d64d9..406de3c2a 100644 --- a/mallinkService/src/main/java/com/simple/service/WxCouponCarService.java +++ b/mallinkService/src/main/java/com/simple/service/WxCouponCarService.java @@ -1,6 +1,5 @@ package com.simple.service; -import java.util.*; import com.github.pagehelper.PageInfo; import com.simple.domain.po.WxCoupon; import com.simple.domain.po.WxCouponCar; diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponCarServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponCarServiceImpl.java index fb9ee41ec..8f649b517 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponCarServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponCarServiceImpl.java @@ -1,6 +1,5 @@ package com.simple.service.impl; -import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.simple.domain.po.WxCoupon; @@ -10,7 +9,6 @@ import com.simple.mapper.WxCouponCarMapper; import com.simple.service.WxCouponCarService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.simple.common.IdWorker; @Service public class WxCouponCarServiceImpl implements WxCouponCarService {