From 6ad682cd62699fc3bf6d2aae9b8accd67f65dad9 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Mon, 3 Sep 2018 15:17:16 +0800 Subject: [PATCH] =?UTF-8?q?[CouponOrder=E5=81=9C=E8=BD=A6=E5=88=B8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2][=E6=96=B0=E5=A2=9E]:=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E5=81=9C=E8=BD=A6=E5=88=B8=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/simple/controller/WxCouponOrderController.java | 4 ++-- .../main/java/com/simple/service/WxCouponOrderService.java | 7 ++++--- .../com/simple/service/impl/WxCouponOrderServiceImpl.java | 2 +- .../src/main/resources/mapper/WxCouponOrderMapper.xml | 5 ++++- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCouponOrderController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCouponOrderController.java index d8f52d3e1..28dd66ae3 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxCouponOrderController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCouponOrderController.java @@ -65,12 +65,12 @@ public class WxCouponOrderController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), }) - public ResultData list(@ModelAttribute WxCouponOrder wxCouponOrder, Integer pageNum, Integer pageSize) { + public ResultData list(@ModelAttribute WxCouponOrderCVo wxCouponOrder, Integer pageNum, Integer pageSize) { if(pageNum == null || pageSize == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } - if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrder(); + if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrderCVo(); wxCouponOrder.setCUserId(getUser().getId()); if (wxCouponOrder.getCouponOrderStatus() == null) wxCouponOrder.setSortColumns(WxCouponOrder.Field.CreateDate_DESC); diff --git a/mallinkService/src/main/java/com/simple/service/WxCouponOrderService.java b/mallinkService/src/main/java/com/simple/service/WxCouponOrderService.java index cdc803472..64d5e077a 100644 --- a/mallinkService/src/main/java/com/simple/service/WxCouponOrderService.java +++ b/mallinkService/src/main/java/com/simple/service/WxCouponOrderService.java @@ -11,6 +11,7 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import com.simple.domain.vo.WxCouponOrderCVo; import org.apache.ibatis.annotations.Param; public interface WxCouponOrderService { @@ -81,15 +82,15 @@ public interface WxCouponOrderService { /** * C用户查券list * - * @param bUserId C端用户 + * @param record C端用户 */ - ResultData listCUserVoAsPage(WxCouponOrder record, Integer pageIndex, Integer pageSize); + ResultData listCUserVoAsPage(WxCouponOrderCVo record, Integer pageIndex, Integer pageSize); /** * C用户查券详情 * - * @param bUserId C端用户 + * @param cUserId C端用户 */ ResultData detailCUserVo(Long cUserId, String couponOrderId); diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java index 96749cf8d..59ad3d7f0 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java @@ -161,7 +161,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } @Override - public ResultData listCUserVoAsPage(WxCouponOrder record, Integer pageIndex, Integer pageSize) { + public ResultData listCUserVoAsPage(WxCouponOrderCVo record, Integer pageIndex, Integer pageSize) { return new ResultData(PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfCUser(record))); } diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 693f2a5b8..336fcb41c 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -328,7 +328,7 @@ - select from wx_coupon_order c,wx_coupon co,wx_merchant m where 1=1 @@ -340,6 +340,9 @@ and c.tenant_id = #{tenantId} + + and co.type = #{type} + AND c.coupon_order_status = #{couponOrderStatus}