Commit ea273739 authored by macro's avatar macro
Browse files

优惠券及收货地址接口修改

parent e46a6f1a
...@@ -55,7 +55,7 @@ public class UmsMemberCouponController { ...@@ -55,7 +55,7 @@ public class UmsMemberCouponController {
@RequestMapping(value = "/list/cart/{type}", method = RequestMethod.GET) @RequestMapping(value = "/list/cart/{type}", method = RequestMethod.GET)
@ResponseBody @ResponseBody
public CommonResult<List<SmsCouponHistoryDetail>> listCart(@PathVariable Integer type) { public CommonResult<List<SmsCouponHistoryDetail>> listCart(@PathVariable Integer type) {
List<CartPromotionItem> cartPromotionItemList = cartItemService.listPromotion(memberService.getCurrentMember().getId()); List<CartPromotionItem> cartPromotionItemList = cartItemService.listPromotion(memberService.getCurrentMember().getId(), null);
List<SmsCouponHistoryDetail> couponHistoryList = memberCouponService.listCart(cartPromotionItemList, type); List<SmsCouponHistoryDetail> couponHistoryList = memberCouponService.listCart(cartPromotionItemList, type);
return CommonResult.success(couponHistoryList); return CommonResult.success(couponHistoryList);
} }
......
...@@ -63,7 +63,7 @@ public class UmsMemberReceiveAddressController { ...@@ -63,7 +63,7 @@ public class UmsMemberReceiveAddressController {
return CommonResult.success(addressList); return CommonResult.success(addressList);
} }
@ApiOperation("显示所有收货地址") @ApiOperation("获取收货地址详情")
@RequestMapping(value = "/{id}", method = RequestMethod.GET) @RequestMapping(value = "/{id}", method = RequestMethod.GET)
@ResponseBody @ResponseBody
public CommonResult<UmsMemberReceiveAddress> getItem(@PathVariable Long id) { public CommonResult<UmsMemberReceiveAddress> getItem(@PathVariable Long id) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment