diff --git a/agileboot-admin/src/main/java/com/agileboot/admin/controller/shop/ShopController.java b/agileboot-admin/src/main/java/com/agileboot/admin/controller/shop/ShopController.java index 0ecbd68..5fc6092 100644 --- a/agileboot-admin/src/main/java/com/agileboot/admin/controller/shop/ShopController.java +++ b/agileboot-admin/src/main/java/com/agileboot/admin/controller/shop/ShopController.java @@ -102,11 +102,18 @@ public class ShopController extends BaseController { @Operation(summary = "商店列表") @GetMapping - public ResponseDTO> list(SearchShopQuery query) { - PageDTO page = shopApplicationService.getShopList(query); + public ResponseDTO> page(SearchShopQuery query) { + PageDTO page = shopApplicationService.getShopPage(query); return ResponseDTO.ok(page); } + @Operation(summary = "商店列表") + @GetMapping("/list") + public ResponseDTO> list(SearchShopQuery query) { + List list = shopApplicationService.getShopList(query); + return ResponseDTO.ok(list); + } + @Operation(summary = "获取商店详情") @GetMapping("/{id}") public ResponseDTO getShopById(@PathVariable Long id) { diff --git a/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/QywxScheduleJob.java b/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/QywxScheduleJob.java index d2f0dc2..4c3e35c 100644 --- a/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/QywxScheduleJob.java +++ b/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/QywxScheduleJob.java @@ -121,6 +121,10 @@ public class QywxScheduleJob { String suiteAccessToken = templateApplicationService.getSuiteAccessToken(template.getSuiteId(), template.getSecret(), template.getSuiteTicket()); + if (StringUtils.isBlank(suiteAccessToken)) { + log.error("getSuiteAccessToken suiteAccessToken is null"); + return; + } UpdateTemplateCommand command = new UpdateTemplateCommand(); command.setId(template.getId()); command.setSuiteAccessToken(suiteAccessToken); diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/shop/ShopApplicationService.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/shop/ShopApplicationService.java index d911b9c..6a70c63 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/shop/ShopApplicationService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/shop/ShopApplicationService.java @@ -24,7 +24,7 @@ public class ShopApplicationService { private final ShopService shopService; private final ShopModelFactory shopModelFactory; - public PageDTO getShopList(SearchShopQuery query) { + public PageDTO getShopPage(SearchShopQuery query) { Page page = shopService.getShopList(query.toPage(), query.toQueryWrapper()); List dtoList = page.getRecords().stream() .map(ShopDTO::new) @@ -32,6 +32,13 @@ public class ShopApplicationService { return new PageDTO<>(dtoList, page.getTotal()); } + public List getShopList(SearchShopQuery query) { + List list = shopService.list(); + return list.stream() + .map(ShopDTO::new) + .collect(Collectors.toList()); + } + public ShopDTO getShopById(Long shopId) { ShopEntity shopEntity = shopService.getById(shopId); return new ShopDTO(shopEntity);