From b22b9bd4d63a1cc9b03ac9c5ff5c4fde416b37e2 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Fri, 16 Jan 2026 16:15:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E4=BB=B6=E6=9F=A5=E8=AF=A2=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/czg/controller/admin/EntryManagerController.java | 8 ++++---- .../src/main/java/com/czg/task/EntryManagerTask.java | 9 ++++----- cash-common/cash-common-service/pom.xml | 2 +- cash-common/cash-common-tools/pom.xml | 9 +++++---- .../service/order/service/ShopDirectMerchantService.java | 2 +- .../service/impl/ShopDirectMerchantServiceImpl.java | 3 +-- 6 files changed, 16 insertions(+), 17 deletions(-) diff --git a/cash-api/order-server/src/main/java/com/czg/controller/admin/EntryManagerController.java b/cash-api/order-server/src/main/java/com/czg/controller/admin/EntryManagerController.java index 39e97bb4c..4af902e70 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/admin/EntryManagerController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/admin/EntryManagerController.java @@ -87,8 +87,8 @@ public class EntryManagerController { * 获取进件信息 */ @GetMapping - public CzgResult getEntry(Long shopId, String licenceNo) { - return CzgResult.success(shopDirectMerchantService.getEntry(shopId, licenceNo)); + public CzgResult getEntry(Long shopId) { + return CzgResult.success(shopDirectMerchantService.getEntry(shopId)); } /** @@ -98,8 +98,8 @@ public class EntryManagerController { */ @GetMapping("queryEntry") @Debounce(value = "#shopId", interval = 1000 * 60 * 3) - public CzgResult queryEntry(Long shopId, String licenceNo) { - entryManagerTask.entryManager(shopId, licenceNo); + public CzgResult queryEntry(Long shopId) { + entryManagerTask.entryManager(shopId); return CzgResult.success(); } 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 3cfb7a9c4..86e61ea37 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 @@ -39,17 +39,16 @@ public class EntryManagerTask { public void run() { log.info("进件查询，定时任务执行"); long start = System.currentTimeMillis(); - entryManager(null, null); + entryManager(null); log.info("进件查询，定时任务执行完毕，耗时:{}ms", start - System.currentTimeMillis()); } /** * 查询状态为待处理、待签约、待审核的进件 */ - public void entryManager(Long shopId, String licenceNo) { + public void entryManager(Long shopId) { List list = shopDirectMerchantService.list(QueryWrapper.create() .eq(ShopDirectMerchant::getShopId, shopId) - .eq(ShopDirectMerchant::getLicenceNo, licenceNo) .in(ShopDirectMerchant::getWechatStatus, PayCst.EntryStatus.NEED_QUERY_LIST) .or(ShopDirectMerchant::getAlipayStatus).in(PayCst.EntryStatus.NEED_QUERY_LIST)); if (CollUtil.isEmpty(list)) { @@ -83,7 +82,7 @@ public class EntryManagerTask { ShopMerchantDTO shopMerchantDTO = new ShopMerchantDTO(); shopMerchantDTO.setShopId(shopId); shopMerchantDTO.setChannel(PayChannelCst.NATIVE); - shopMerchantDTO.setRelatedLicenceNo(licenceNo); + shopMerchantDTO.setRelatedLicenceNo(shopDirectMerchant.getLicenceNo()); NativeMerchantDTO nativeMerchantDTO = new NativeMerchantDTO(); nativeMerchantDTO.setWechatMerchantId(wechatMerchantId); nativeMerchantDTO.setAlipayMerchantId(alipayMerchantId); @@ -93,7 +92,7 @@ public class EntryManagerTask { } shopMerchantDTO.setNativeMerchantDTO(nativeMerchantDTO); shopMerchantService.editEntry(shopMerchantDTO, false); - shopMerchantService.upMerchant(licenceNo, nativeMerchantDTO); + shopMerchantService.upMerchant(shopDirectMerchant.getLicenceNo(), nativeMerchantDTO); } } } diff --git a/cash-common/cash-common-service/pom.xml b/cash-common/cash-common-service/pom.xml index 212020144..ce95f89fe 100644 --- a/cash-common/cash-common-service/pom.xml +++ b/cash-common/cash-common-service/pom.xml @@ -10,7 +10,7 @@ cash-common-service jar - global-service + common-service https://maven.apache.org diff --git a/cash-common/cash-common-tools/pom.xml b/cash-common/cash-common-tools/pom.xml index a4ceb0083..ccbce27f9 100644 --- a/cash-common/cash-common-tools/pom.xml +++ b/cash-common/cash-common-tools/pom.xml @@ -37,6 +37,11 @@ + + + com.aliyun + dysmsapi20170525 + com.google.zxing core @@ -45,10 +50,6 @@ cn.hutool hutool-all - - com.aliyun - dysmsapi20170525 - com.alibaba.fastjson2 fastjson2 diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/ShopDirectMerchantService.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/ShopDirectMerchantService.java index 07999fb2e..6a9bc72ed 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/ShopDirectMerchantService.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/ShopDirectMerchantService.java @@ -29,7 +29,7 @@ public interface ShopDirectMerchantService extends IService /** * 获取进件信息 */ - AggregateMerchantVO getEntry(Long shopId, String licenceNo); + AggregateMerchantVO getEntry(Long shopId); /** * 申请进件 diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopDirectMerchantServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopDirectMerchantServiceImpl.java index 1fe1b754d..fec79bec8 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopDirectMerchantServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopDirectMerchantServiceImpl.java @@ -64,9 +64,8 @@ public class ShopDirectMerchantServiceImpl extends ServiceImpl