diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCouponChannelController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCouponChannelController.java index 5dda26037..e5eb5dc2d 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxCouponChannelController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCouponChannelController.java @@ -38,18 +38,9 @@ public class WxCouponChannelController extends BaseController if (null == wxCouponChannel) wxCouponChannel = new WxCouponChannel(); wxCouponChannel.setTenantId(getTenantId()); wxCouponChannel.setStatus(0); + wxCouponChannel.setSortColumns(WxCouponChannel.Field.EndTime_ASC); final PageInfo page = wxCouponChannelService.listPageCAPI(wxCouponChannel, pageNum, pageSize); return new ResultData(page); } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxCouponChannelService.getById(id)); - } - - - } diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCouponOrderController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCouponOrderController.java index b2aa9231c..3f0aa43a9 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxCouponOrderController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCouponOrderController.java @@ -62,14 +62,21 @@ public class WxCouponOrderController extends BaseController { @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), - @ApiImplicitParam(name = "couponOrderStatus", value="券状态状态:0,待使用 1,已核销 2,已过期 3,已作废", dataType="int", paramType = "query",required=false) }) - public ResultData list(Integer couponOrderStatus, Integer pageNum, Integer pageSize) { + public ResultData list(@ModelAttribute WxCouponOrder wxCouponOrder, Integer pageNum, Integer pageSize) { if(pageNum == null || pageSize == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } - return wxCouponOrderService.listCUserVoAsPage(getUser().getId(), couponOrderStatus, pageNum, pageSize); + if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrder(); + wxCouponOrder.setCUserId(getUser().getId()); + if (wxCouponOrder.getCouponOrderStatus() == null) + wxCouponOrder.setSortColumns(WxCouponOrder.Field.CreateDate_DESC); + else if (wxCouponOrder.getCouponOrderStatus() == 0) + wxCouponOrder.setSortColumns(WxCouponOrder.Field.CreateDate_DESC); + else + wxCouponOrder.setSortColumns(WxCouponOrder.Field.UpdateDate_DESC); + return wxCouponOrderService.listCUserVoAsPage(wxCouponOrder, pageNum, pageSize); } @ApiOperation(value = "卡券详情接口") diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxOrderController.java b/mallinkCApi/src/main/java/com/simple/controller/WxOrderController.java index 223806dd2..3235b5246 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxOrderController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxOrderController.java @@ -204,6 +204,7 @@ public class WxOrderController extends BaseController { // c端用户应该只能看到自己的订单 if (wxOrder == null) wxOrder = new WxOrder(); wxOrder.setCUserId(getUser().getId()); + wxOrder.setSortColumns(WxOrder.Field.CreateDate_DESC); final PageInfo page = wxOrderService.listCUserVoAsPage(wxOrder, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkService/src/main/java/com/simple/mapper/WxCouponOrderMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxCouponOrderMapper.java index 1a8c48d93..94491d665 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxCouponOrderMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxCouponOrderMapper.java @@ -18,8 +18,8 @@ public interface WxCouponOrderMapper extends CommonMapper { List findListOfUnverifiedByDateForBUser(Map dateMap); List findListOfVerifiedByDateForBUser(Map dateMap); - List findListOfCUser(Map paramMap); - WxCouponOrderCVo selectDetailOfCUser(Map paramMap); + WxCouponOrderCVo selectDetailOfUser(Map paramMap); + List findListOfCUser(WxCouponOrder wxCouponOrder); List findListOfAdmin(WxCouponOrder wxCouponOrder); } diff --git a/mallinkService/src/main/java/com/simple/service/WxCouponOrderService.java b/mallinkService/src/main/java/com/simple/service/WxCouponOrderService.java index 6e49becda..2c6bde9e3 100644 --- a/mallinkService/src/main/java/com/simple/service/WxCouponOrderService.java +++ b/mallinkService/src/main/java/com/simple/service/WxCouponOrderService.java @@ -80,7 +80,7 @@ public interface WxCouponOrderService { * @param bUserId C端用户 */ - ResultData listCUserVoAsPage(Long cUserId, Integer pageIndex, Integer pageSize, Integer status); + ResultData listCUserVoAsPage(WxCouponOrder record, Integer pageIndex, Integer pageSize); /** * C用户查券详情 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 258231995..5b5a8a715 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java @@ -152,21 +152,9 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } @Override - public ResultData listCUserVoAsPage(Long cUserId, Integer status, Integer pageIndex, Integer pageSize) { + public ResultData listCUserVoAsPage(WxCouponOrder record, Integer pageIndex, Integer pageSize) { - WxCUser wxCuser = wxCUserMapper.selectByPrimaryKey(cUserId); - if(wxCuser == null){ - logger.error("用户不存在:"+ cUserId); - throw new MallinkException(ErrorCode.USER_IS_EMPTY); - } - - Map paramMap = new HashMap(); - paramMap.put("cUserId", cUserId); - paramMap.put("tenantId", wxCuser.getTenantId()); - if (status != null) - paramMap.put("status", status); - - return new ResultData(PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfCUser(paramMap))); + return new ResultData(PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfCUser(record))); } @Override @@ -182,7 +170,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { paramMap.put("tenantId", wxCuser.getTenantId()); paramMap.put("couponOrderId", couponOrderId); - WxCouponOrderCVo wxCouponOrderCVo = wxCouponOrderMapper.selectDetailOfCUser(paramMap); + WxCouponOrderCVo wxCouponOrderCVo = wxCouponOrderMapper.selectDetailOfUser(paramMap); if (wxCouponOrderCVo == null) return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); return new ResultData(wxCouponOrderCVo); @@ -206,7 +194,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { paramMap.put("merchantId", wxMerchant.getId()); paramMap.put("tenantId", wxMerchant.getTenantId()); paramMap.put("couponOrderId", couponOrderId); - WxCouponOrderCVo wxCouponOrderCVo = wxCouponOrderMapper.selectDetailOfCUser(paramMap); + WxCouponOrderCVo wxCouponOrderCVo = wxCouponOrderMapper.selectDetailOfUser(paramMap); if (wxCouponOrderCVo == null) return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); return new ResultData(wxCouponOrderCVo); diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 89aae7b91..1d396e8ee 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -329,28 +329,25 @@ - select from wx_coupon_order c,wx_coupon co,wx_merchant m where 1=1 + and c.coupon_id = co.id + and co.merchant_id = m.id and c.c_user_id = #{cUserId} - - and co.merchant_id = #{merchantId} - and c.tenant_id = #{tenantId} - and c.coupon_id = co.id - and co.merchant_id = m.id - - AND c.coupon_order_status = #{status} + + AND c.coupon_order_status = #{couponOrderStatus} - order by c.create_date desc + order by ${sortColumns} - select from wx_coupon_order c,wx_coupon co,wx_merchant m left join wx_merchant_shop ms on ms.merchant_id = m.id diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index 4979e9db3..9c69380ba 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -120,6 +120,8 @@ where order_status = '0' AND create_date > #{startDate,jdbcType=TIMESTAMP} + + AND create_date < #{endDate,jdbcType=TIMESTAMP}