Skip to content

B
browser-backend
Commit 5daa3849 authored by xuxin's avatar xuxin
Browse files
Options

Merge remote-tracking branch 'origin/staging' into staging

parents 038dcf9a 033f0c2b
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
src/main/java/com/edgec/browserbackend/browser/controller/ShopController.java
View file @ 5daa3849
......@@ -148,9 +148,11 @@ public class ShopController {
@RequestMapping(value = "/list", method = RequestMethod.POST)
public ResultDto getShopList(Principal principal, @RequestBody ShopRequestDto shopRequestDto) {
logger.info("shop list params {}", JSONObject.toJSONString(shopRequestDto));
ResultDto resultDto = new ResultDto();
try {
ShopPageResultDto shopDtos = shopService.getShopList(principal.getName(), shopRequestDto.getGroup(), shopRequestDto.getPage(), shopRequestDto.getAmount(), shopRequestDto.getFilter());
ShopPageResultDto shopDtos = shopService.getShopList(principal.getName(), shopRequestDto.getGroup(),
shopRequestDto.getPage(), shopRequestDto.getAmount(), shopRequestDto.getFilter());
resultDto.setData(shopDtos);
resultDto.setStatus(0);
} catch (ClientRequestException e) {
......
Markdown is supported
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