From 8d2e6470c8dbe36d331b30b0bc820c7f92ee090d Mon Sep 17 00:00:00 2001 From: ljl Date: Thu, 9 Nov 2023 14:47:44 +0800 Subject: [PATCH] yh --- .../java/com/ms/biz/service/impl/ShopServiceImpl.java | 3 +++ .../java/com/ms/biz/spi/callback/BatchPayService.java | 2 +- ms-dal/src/main/resources/application.properties | 8 ++++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ms-biz/src/main/java/com/ms/biz/service/impl/ShopServiceImpl.java b/ms-biz/src/main/java/com/ms/biz/service/impl/ShopServiceImpl.java index 2cda6d6..0a05a10 100644 --- a/ms-biz/src/main/java/com/ms/biz/service/impl/ShopServiceImpl.java +++ b/ms-biz/src/main/java/com/ms/biz/service/impl/ShopServiceImpl.java @@ -94,6 +94,9 @@ public class ShopServiceImpl implements ShopService { @Override public ShopBO getShopInfo(Long shopId) { Shop shop = getDetailById(shopId); + if (shop == null) { + throw new RuntimeException("店铺不存在"); + } ShopBO shopBO = CommonTool.modelMapper(shop, ShopBO.class); shopBO.setShopAccessToken(getShopAccessTokenByShop(shop)); return shopBO; diff --git a/ms-biz/src/main/java/com/ms/biz/spi/callback/BatchPayService.java b/ms-biz/src/main/java/com/ms/biz/spi/callback/BatchPayService.java index dac292b..dad54e6 100644 --- a/ms-biz/src/main/java/com/ms/biz/spi/callback/BatchPayService.java +++ b/ms-biz/src/main/java/com/ms/biz/spi/callback/BatchPayService.java @@ -15,7 +15,7 @@ import lombok.extern.slf4j.Slf4j; @ExtensionService("batchPay") @Slf4j @AllArgsConstructor -public class BatchPayService extends SPIBaseService implements ExtensionServiceHandler { +public class BatchPayService extends SPIBaseService implements ExtensionServiceHandler { private DistributionOrderService distributionOrderService; @Override diff --git a/ms-dal/src/main/resources/application.properties b/ms-dal/src/main/resources/application.properties index 4604c98..c4b6be6 100644 --- a/ms-dal/src/main/resources/application.properties +++ b/ms-dal/src/main/resources/application.properties @@ -22,12 +22,12 @@ mybatis.mapper-locations=classpath*:mapper/*.xml mybatis.configuration.log-impl=org.apache.ibatis.logging.slf4j.Slf4jImpl mybatis.configuration.map-underscore-to-camel-case=true -#cloud.app.key=7290512081592305208 -#cloud.app.secret=d21bf43e-c671-4fa5-b35a-762a9c775129 +cloud.app.key=7290512081592305208 +cloud.app.secret=d21bf43e-c671-4fa5-b35a-762a9c775129 # boe -cloud.app.key=7296606199200499244 -cloud.app.secret=0063975e-7755-4d51-8255-ad163604456f +#cloud.app.key=7296606199200499244 +#cloud.app.secret=0063975e-7755-4d51-8255-ad163604456f #spring.redis.host=r-2zext1mz5bw1hsochrpd.redis.rds.aliyuncs.com #spring.redis.port=6379