Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
wwwanlingxiao
mall
Commits
ea273739
Commit
ea273739
authored
May 23, 2020
by
macro
Browse files
优惠券及收货地址接口修改
parent
e46a6f1a
Changes
2
Hide whitespace changes
Inline
Side-by-side
mall-portal/src/main/java/com/macro/mall/portal/controller/UmsMemberCouponController.java
View file @
ea273739
...
@@ -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
);
}
}
...
...
mall-portal/src/main/java/com/macro/mall/portal/controller/UmsMemberReceiveAddressController.java
View file @
ea273739
...
@@ -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
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment