github/mall
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
macro 2020-05-23 16:35:08 +08:00
parent e46a6f1aeb
commit ea2737396e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mall-portal/src/main/java/com/macro/mall/portal/controller/UmsMemberCouponController.java
View File

@ -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);
} }

2
mall-portal/src/main/java/com/macro/mall/portal/controller/UmsMemberReceiveAddressController.java
View File

@ -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) {