diff --git a/mall-portal/src/main/java/com/macro/mall/portal/controller/UmsMemberCouponController.java b/mall-portal/src/main/java/com/macro/mall/portal/controller/UmsMemberCouponController.java index c76c5d5..3a395a3 100644 --- a/mall-portal/src/main/java/com/macro/mall/portal/controller/UmsMemberCouponController.java +++ b/mall-portal/src/main/java/com/macro/mall/portal/controller/UmsMemberCouponController.java @@ -55,7 +55,7 @@ public class UmsMemberCouponController { @RequestMapping(value = "/list/cart/{type}", method = RequestMethod.GET) @ResponseBody public CommonResult> listCart(@PathVariable Integer type) { - List cartPromotionItemList = cartItemService.listPromotion(memberService.getCurrentMember().getId()); + List cartPromotionItemList = cartItemService.listPromotion(memberService.getCurrentMember().getId(), null); List couponHistoryList = memberCouponService.listCart(cartPromotionItemList, type); return CommonResult.success(couponHistoryList); } diff --git a/mall-portal/src/main/java/com/macro/mall/portal/controller/UmsMemberReceiveAddressController.java b/mall-portal/src/main/java/com/macro/mall/portal/controller/UmsMemberReceiveAddressController.java index 76cfb33..27470be 100644 --- a/mall-portal/src/main/java/com/macro/mall/portal/controller/UmsMemberReceiveAddressController.java +++ b/mall-portal/src/main/java/com/macro/mall/portal/controller/UmsMemberReceiveAddressController.java @@ -63,7 +63,7 @@ public class UmsMemberReceiveAddressController { return CommonResult.success(addressList); } - @ApiOperation("显示所有收货地址") + @ApiOperation("获取收货地址详情") @RequestMapping(value = "/{id}", method = RequestMethod.GET) @ResponseBody public CommonResult getItem(@PathVariable Long id) {