| @@ -6,6 +6,8 @@ import com.alibaba.fastjson.JSONObject; | |||||
| import com.simple.common.ErrorCode; | import com.simple.common.ErrorCode; | ||||
| import com.simple.common.Result; | import com.simple.common.Result; | ||||
| import com.simple.common.ResultData; | 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.po.*; | ||||
| import com.simple.domain.vo.WxCouponCarVo; | import com.simple.domain.vo.WxCouponCarVo; | ||||
| import com.simple.enums.EnumCarCmd; | import com.simple.enums.EnumCarCmd; | ||||
| @@ -313,9 +315,13 @@ public class WxCarController extends BaseController | |||||
| try { | try { | ||||
| WxCouponCarVo couponCarVo = wxCouponCarService.getByCoupon(coupon); | WxCouponCarVo couponCarVo = wxCouponCarService.getByCoupon(coupon); | ||||
| if (couponCarVo != null) { | 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 { | } else { | ||||
| return new ResultData(ErrorCode.COUPON_IS_EMPTY.getCode(), "券不存在"); | |||||
| return new ResultData(ErrorCode.COUPON_IS_EMPTY); | |||||
| } | } | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| logger.error(e.getMessage()); | logger.error(e.getMessage()); | ||||
| @@ -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; | |||||
| } | |||||
| } | |||||
| @@ -1,6 +1,5 @@ | |||||
| package com.simple.service; | package com.simple.service; | ||||
| import java.util.*; | |||||
| import com.github.pagehelper.PageInfo; | import com.github.pagehelper.PageInfo; | ||||
| import com.simple.domain.po.WxCoupon; | import com.simple.domain.po.WxCoupon; | ||||
| import com.simple.domain.po.WxCouponCar; | import com.simple.domain.po.WxCouponCar; | ||||
| @@ -1,6 +1,5 @@ | |||||
| package com.simple.service.impl; | package com.simple.service.impl; | ||||
| import java.util.*; | |||||
| import com.github.pagehelper.PageHelper; | import com.github.pagehelper.PageHelper; | ||||
| import com.github.pagehelper.PageInfo; | import com.github.pagehelper.PageInfo; | ||||
| import com.simple.domain.po.WxCoupon; | import com.simple.domain.po.WxCoupon; | ||||
| @@ -10,7 +9,6 @@ import com.simple.mapper.WxCouponCarMapper; | |||||
| import com.simple.service.WxCouponCarService; | import com.simple.service.WxCouponCarService; | ||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| import org.springframework.stereotype.Service; | import org.springframework.stereotype.Service; | ||||
| import com.simple.common.IdWorker; | |||||
| @Service | @Service | ||||
| public class WxCouponCarServiceImpl implements WxCouponCarService { | public class WxCouponCarServiceImpl implements WxCouponCarService { | ||||