diff --git a/cash-api/order-server/src/main/java/com/czg/task/EntryManagerTask.java b/cash-api/order-server/src/main/java/com/czg/task/EntryManagerTask.java index 9fe763cfc..3cfb7a9c4 100644 --- a/cash-api/order-server/src/main/java/com/czg/task/EntryManagerTask.java +++ b/cash-api/order-server/src/main/java/com/czg/task/EntryManagerTask.java @@ -93,6 +93,7 @@ public class EntryManagerTask { } shopMerchantDTO.setNativeMerchantDTO(nativeMerchantDTO); shopMerchantService.editEntry(shopMerchantDTO, false); + shopMerchantService.upMerchant(licenceNo, nativeMerchantDTO); } } } 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 dda294cdd..b5e7b12e5 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 @@ -3,7 +3,10 @@ package com.czg.order.service; import com.czg.order.dto.ShopMerchantDTO; import com.czg.order.entity.ShopDirectMerchant; import com.czg.order.entity.ShopMerchant; +import com.czg.pay.NativeMerchantDTO; import com.mybatisflex.core.service.IService; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import java.io.Serializable; @@ -22,6 +25,13 @@ public interface ShopMerchantService extends IService { */ Boolean editEntry(ShopMerchantDTO shopMerchantParam, boolean isUp); + + /** + * 已绑定的支付 + * 更新商户支付参数 + */ + void upMerchant(@NotBlank String relatedLicenceNo, @NotNull NativeMerchantDTO nativeMerchantDTO); + @Override ShopMerchant getById(Serializable id); 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 7a3ea941c..4ef914aec 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 @@ -16,6 +16,8 @@ import com.czg.service.order.service.ShopDirectMerchantService; import com.czg.utils.AssertUtil; import com.mybatisflex.spring.service.impl.ServiceImpl; import jakarta.annotation.Resource; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.CacheEvict; @@ -103,18 +105,19 @@ public class ShopMerchantServiceImpl extends ServiceImpl