From f4b06d05fe1a4c59679794e660a893564a392e00 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Sun, 16 Dec 2018 11:16:01 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=82=A8=E5=80=BC=E5=8D=A1][=E6=96=B0?= =?UTF-8?q?=E5=A2=9E]:c=E7=AB=AF=E6=98=BE=E7=A4=BA=E5=8D=A1=E5=8C=85?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxCouponOrderController.java | 23 ++++++++++++++++ .../iformall/mapper/WxCouponOrderMapper.java | 3 +++ .../service/WxCouponOrderService.java | 10 +++++++ .../impl/WxCouponOrderServiceImpl.java | 5 ++++ .../resources/mapper/WxCouponOrderMapper.xml | 26 ++++++++++++++++++- 5 files changed, 66 insertions(+), 1 deletion(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index fed1403c3..f17777179 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -83,4 +83,27 @@ public class WxCouponOrderController extends BaseController { return new ResultData(res); } + + //// ------ 卡相关接口 + @ApiOperation("卡包分页列表接口") + @GetMapping("cardList") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), + }) + public ResultData cardList(@ModelAttribute WxCouponOrder wxCouponOrder, Integer pageNum, Integer pageSize) { + + if (pageNum == null || pageSize == null) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } + if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrderCVo(); + wxCouponOrder.setCUserId(getUser().getId()); + if (wxCouponOrder.getCouponOrderStatus() == null) + wxCouponOrder.setSortColumns(WxCouponOrder.Field.CreateDate_DESC); + else if (wxCouponOrder.getCouponOrderStatus() == EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()) + wxCouponOrder.setSortColumns(WxCouponOrder.Field.CreateDate_DESC); + else + wxCouponOrder.setSortColumns(WxCouponOrder.Field.UpdateDate_DESC); + return wxCouponOrderService.listCUserVoAsPage(wxCouponOrder, pageNum, pageSize); + } } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java index 6c1aa7824..92964d765 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java @@ -97,4 +97,7 @@ public interface WxCouponOrderMapper extends CommonMapper { void offExpiredCouponOrderByValidDate(); List findExpiredCouponOrderByValidDate(); + + //// 卡相关接口 + List findCardListOfCUser(WxCouponOrder wxCouponOrder); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java index 8012bdf28..48b67b731 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java @@ -162,4 +162,14 @@ public interface WxCouponOrderService { int queryPriceTotal(String tenantId, Date startTime, Date endTime); + ////// ------- 卡 + /** + * C用户查卡list + * + * @param record C端用户 + */ + + ResultData listCardVoAsPage(WxCouponOrder record, Integer pageIndex, Integer pageSize); + + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index 2799ca87a..f680e7690 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -588,4 +588,9 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { return wxCouponOrderMapper.queryPriceTotal(tenantId, startTime, endTime); } + @Override + public ResultData listCardVoAsPage(WxCouponOrder record, Integer pageIndex, Integer pageSize) { + return new ResultData(PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findCardListOfCUser(record))); + } + } diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 91ebf1e70..804941339 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -553,10 +553,34 @@ from wx_coupon_order co,wx_coupon c where 1=1 and co.coupon_id = c.id - and c.type != 5 + and co.coupon_type != 5 and co.coupon_type != 7 and co.c_user_id = #{cUserId} + + and co.owner_id = #{ownerId} + + + and co.tenant_id = #{tenantId} + + + AND co.coupon_order_status = #{couponOrderStatus} + + order by ${sortColumns} + + +