diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/service/ShopMerchantService.java b/cash-common/cash-common-service/src/main/java/com/czg/order/service/ShopMerchantService.java index fa67d0c72..2474cd675 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/service/ShopMerchantService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/service/ShopMerchantService.java @@ -30,7 +30,7 @@ public interface ShopMerchantService extends IService { */ void upMerchant(@NotBlank String relatedLicenceNo, @NotNull NativeMerchantDTO nativeMerchantDTO); - ShopMerchant getById(Long shopId); + ShopMerchant getByShopId(Long shopId); ShopDirectMerchant getMainMerchant(Long shopId); diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java index b0b1f2023..62fa5d641 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java @@ -181,7 +181,7 @@ public class PayServiceImpl implements PayService { private ShopMerchant getMerchant(Long shopId) { try { - ShopMerchant shopMerchant = shopMerchantService.getById(shopId); + ShopMerchant shopMerchant = shopMerchantService.getByShopId(shopId); if (shopMerchant == null || StrUtil.isBlank(shopMerchant.getChannel())) { throw new CzgException("暂未开通支付!"); } diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopMerchantServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopMerchantServiceImpl.java index 83132d179..a62309b92 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopMerchantServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopMerchantServiceImpl.java @@ -109,9 +109,9 @@ public class ShopMerchantServiceImpl extends ServiceImpl