czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

支付参数3

Browse Source
This commit is contained in:
wangw
2026-01-15 14:04:36 +08:00
parent 5541ed5da4
commit 071e7f5c82
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cash-common/cash-common-service/src/main/java/com/czg/order/service/ShopMerchantService.java
View File

@@ -30,7 +30,7 @@ public interface ShopMerchantService extends IService<ShopMerchant> {
*/ */
void upMerchant(@NotBlank String relatedLicenceNo, @NotNull NativeMerchantDTO nativeMerchantDTO); void upMerchant(@NotBlank String relatedLicenceNo, @NotNull NativeMerchantDTO nativeMerchantDTO);
ShopMerchant getById(Long shopId); ShopMerchant getByShopId(Long shopId);
ShopDirectMerchant getMainMerchant(Long shopId); ShopDirectMerchant getMainMerchant(Long shopId);

2
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java
View File

@@ -181,7 +181,7 @@ public class PayServiceImpl implements PayService {
private ShopMerchant getMerchant(Long shopId) { private ShopMerchant getMerchant(Long shopId) {
try { try {
ShopMerchant shopMerchant = shopMerchantService.getById(shopId); ShopMerchant shopMerchant = shopMerchantService.getByShopId(shopId);
if (shopMerchant == null || StrUtil.isBlank(shopMerchant.getChannel())) { if (shopMerchant == null || StrUtil.isBlank(shopMerchant.getChannel())) {
throw new CzgException("暂未开通支付!"); throw new CzgException("暂未开通支付!");
} }

4
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopMerchantServiceImpl.java
View File

@@ -109,9 +109,9 @@ public class ShopMerchantServiceImpl extends ServiceImpl<ShopMerchantMapper, Sho
update(upShopMerchant, query().eq(ShopMerchant::getRelatedLicenceNo, relatedLicenceNo)); update(upShopMerchant, query().eq(ShopMerchant::getRelatedLicenceNo, relatedLicenceNo));
} }
@Cacheable(key = "#id") @Cacheable(key = "#shopId")
@Override @Override
public ShopMerchant getById(Long shopId) { public ShopMerchant getByShopId(Long shopId) {
ShopMerchant shopMerchant = getOne(query().eq(ShopMerchant::getShopId, shopId)); ShopMerchant shopMerchant = getOne(query().eq(ShopMerchant::getShopId, shopId));
AssertUtil.isNull(shopMerchant, "暂未开通支付."); AssertUtil.isNull(shopMerchant, "暂未开通支付.");
return shopMerchant; return shopMerchant;