diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java index 57a86d2..741f809 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java @@ -62,8 +62,10 @@ public class OrderController { @GetMapping("/mineCoupons") private Result mineCoupons(@RequestHeader String token,@RequestParam("userId") String userId,@RequestParam("status") String status, @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, - @RequestParam(value = "size", required = false, defaultValue = "1") Integer size) throws IOException { - return orderService.mineCoupons(userId,status,page,size); + @RequestParam(value = "size", required = false, defaultValue = "1") Integer size, + @RequestParam("orderId") String orderId + ) throws IOException { + return orderService.mineCoupons(userId,orderId,status,page,size); } @GetMapping("/findCoupons") private Result findCoupons(@RequestHeader String token,String type, diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbUserCouponsMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbUserCouponsMapper.java index 9f5c926..192a2e3 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbUserCouponsMapper.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbUserCouponsMapper.java @@ -23,7 +23,7 @@ public interface TbUserCouponsMapper { int updateByPrimaryKey(TbUserCoupons record); - List selectByUserId(@Param("userId") String userId,@Param("status") String status); + List selectByUserId(@Param("userId") String userId,@Param("status") String status,@Param("amount") BigDecimal amount); TbUserCoupons selectByOrderId(@Param("orderId") Integer orderId); diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java index bad942b..5da256c 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java @@ -74,6 +74,10 @@ public class OrderService { private TbYhqParamsMapper yhqParamsMapper; @Autowired private TbShopUserMapper shopUserMapper; + + + @Autowired + private TbOrderInfoMapper tbOrderInfoMapper; /** * 创建订单 * @@ -307,9 +311,16 @@ public class OrderService { } - public Result mineCoupons(String userId, String status, Integer page, Integer size) { + public Result mineCoupons(String userId, String orderId,String status, Integer page, Integer size) { + BigDecimal amount=null; + if(ObjectUtil.isNotNull(orderId)&&ObjectUtil.isNotEmpty(orderId)){ + TbOrderInfo orderInfo= tbOrderInfoMapper.selectByPrimaryKey(Integer.valueOf(orderId)); + amount=orderInfo.getOriginAmount(); + } + + PageHelper.startPage(page, size); - List list = userCouponsMapper.selectByUserId(userId,status); + List list = userCouponsMapper.selectByUserId(userId,status,amount); PageInfo pageInfo = new PageInfo(list); return Result.success(CodeEnum.SUCCESS, pageInfo); } diff --git a/src/main/resources/mapper/TbUserCouponsMapper.xml b/src/main/resources/mapper/TbUserCouponsMapper.xml index 02c9600..b746d3c 100644 --- a/src/main/resources/mapper/TbUserCouponsMapper.xml +++ b/src/main/resources/mapper/TbUserCouponsMapper.xml @@ -26,6 +26,12 @@ and status = #{status} + + + and coupons_amount <= #{amount} + + +