diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxUserCouponController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxUserCouponController.java index 6017a46aa..cffbc4bf1 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxUserCouponController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxUserCouponController.java @@ -2,7 +2,7 @@ package com.simple.controller; import com.simple.common.Result; import com.simple.common.ResultData; -import com.simple.domain.dto.WxUserCoupon; +import com.simple.domain.dto.WxUserCouponDto; import com.simple.service.WxUserCouponService; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -25,7 +25,7 @@ public class WxUserCouponController { @ApiOperation("查询用户卡券接口") @PostMapping("findByStatus") - public ResultData findByStatus(@RequestBody WxUserCoupon wxUserCoupon) { + public ResultData findByStatus(@RequestBody WxUserCouponDto wxUserCoupon) { //根据用户id,用户卡券状态查找 if(wxUserCoupon==null||wxUserCoupon.getcUserId()==null||wxUserCoupon.getCouponStatus()==null){ return new ResultData(Result.ERROR,"查询失败"); diff --git a/mallinkService/src/main/java/com/simple/domain/dto/WxUserCoupon.java b/mallinkService/src/main/java/com/simple/domain/dto/WxUserCouponDto.java similarity index 93% rename from mallinkService/src/main/java/com/simple/domain/dto/WxUserCoupon.java rename to mallinkService/src/main/java/com/simple/domain/dto/WxUserCouponDto.java index c0996856d..64e8394fb 100644 --- a/mallinkService/src/main/java/com/simple/domain/dto/WxUserCoupon.java +++ b/mallinkService/src/main/java/com/simple/domain/dto/WxUserCouponDto.java @@ -7,7 +7,7 @@ import java.util.Date; * Created by syf on 2018/8/10. * 用户卡券 */ -public class WxUserCoupon implements Serializable { +public class WxUserCouponDto implements Serializable { private static final long serialVersionUID = 1L; private Integer couponStatus; @@ -17,7 +17,7 @@ public class WxUserCoupon implements Serializable { private String couponTitle; private Date validDate; - public WxUserCoupon(){ + public WxUserCouponDto(){ } public Integer getCouponStatus() { diff --git a/mallinkService/src/main/java/com/simple/service/WxUserCouponService.java b/mallinkService/src/main/java/com/simple/service/WxUserCouponService.java index 5226b7895..d9394967e 100644 --- a/mallinkService/src/main/java/com/simple/service/WxUserCouponService.java +++ b/mallinkService/src/main/java/com/simple/service/WxUserCouponService.java @@ -2,7 +2,7 @@ package com.simple.service; -import com.simple.domain.dto.WxUserCoupon; +import com.simple.domain.dto.WxUserCouponDto; import java.util.List; @@ -10,6 +10,6 @@ import java.util.List; * Created by syf on 2018/8/10. */ public interface WxUserCouponService { - List findList(Long userId, int status); + List findList(Long userId, int status); } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxUserCouponServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxUserCouponServiceImpl.java index 2b21dcc03..ff8c1172e 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxUserCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxUserCouponServiceImpl.java @@ -1,5 +1,5 @@ package com.simple.service.impl; -import com.simple.domain.dto.WxUserCoupon; +import com.simple.domain.dto.WxUserCouponDto; import com.simple.domain.po.WxCoupon; import com.simple.domain.po.WxOrder; import com.simple.mapper.WxCouponMapper; @@ -31,9 +31,9 @@ public class WxUserCouponServiceImpl implements WxUserCouponService { * @return */ @Override - public List findList(Long userId, int status) { + public List findList(Long userId, int status) { //TODO 待测试优化 - List wxUserCoupons = new ArrayList<>(); + List wxUserCoupons = new ArrayList<>(); //查询订单表 WxOrder wxOrder = new WxOrder(); wxOrder.setCUserId(userId); @@ -52,8 +52,8 @@ public class WxUserCouponServiceImpl implements WxUserCouponService { } return wxUserCoupons; } - public WxUserCoupon getWxUserCoupon(WxOrder wxOrder,String title){ - WxUserCoupon wxUserCoupon = new WxUserCoupon(); + public WxUserCouponDto getWxUserCoupon(WxOrder wxOrder, String title){ + WxUserCouponDto wxUserCoupon = new WxUserCouponDto(); wxUserCoupon.setOrderId(wxOrder.getId()); wxUserCoupon.setcUserId(wxOrder.getCUserId()); wxUserCoupon.setCouponId(wxOrder.getCouponId());