进件查询问题

cash-api/order-server/src/main/java/com/czg/controller/admin/EntryManagerController.java

@@ -87,8 +87,8 @@ public class EntryManagerController {
      * 获取进件信息
      */
     @GetMapping
-    public CzgResult<AggregateMerchantVO> getEntry(Long shopId, String licenceNo) {
+    public CzgResult<AggregateMerchantVO> getEntry(Long shopId) {
-        return CzgResult.success(shopDirectMerchantService.getEntry(shopId, licenceNo));
+        return CzgResult.success(shopDirectMerchantService.getEntry(shopId));
     }
 
     /**
@@ -98,8 +98,8 @@ public class EntryManagerController {
      */
     @GetMapping("queryEntry")
     @Debounce(value = "#shopId", interval = 1000 * 60 * 3)
-    public CzgResult<Boolean> queryEntry(Long shopId, String licenceNo) {
+    public CzgResult<Boolean> queryEntry(Long shopId) {
-        entryManagerTask.entryManager(shopId, licenceNo);
+        entryManagerTask.entryManager(shopId);
         return CzgResult.success();
     }
 

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<ShopDirectMerchant> 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);
             }
         }
     }

cash-common/cash-common-service/pom.xml

@@ -10,7 +10,7 @@
     <artifactId>cash-common-service</artifactId>
     <packaging>jar</packaging>
 
-    <name>global-service</name>
+    <name>common-service</name>
     <url>https://maven.apache.org</url>
 
 

cash-common/cash-common-tools/pom.xml

@@ -37,6 +37,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <!-- 短信 -->
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>dysmsapi20170525</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.google.zxing</groupId>
             <artifactId>core</artifactId>
@@ -45,10 +50,6 @@
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.aliyun</groupId>
-            <artifactId>dysmsapi20170525</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.alibaba.fastjson2</groupId>
             <artifactId>fastjson2</artifactId>

cash-service/order-service/src/main/java/com/czg/service/order/service/ShopDirectMerchantService.java

@@ -29,7 +29,7 @@ public interface ShopDirectMerchantService extends IService<ShopDirectMerchant>
     /**
      * 获取进件信息
      */
-    AggregateMerchantVO getEntry(Long shopId, String licenceNo);
+    AggregateMerchantVO getEntry(Long shopId);
 
     /**
      * 申请进件

cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopDirectMerchantServiceImpl.java

@@ -64,9 +64,8 @@ public class ShopDirectMerchantServiceImpl extends ServiceImpl<ShopDirectMerchan
     }
 
     @Override
-    public AggregateMerchantVO getEntry(Long shopId, String licenceNo) {
+    public AggregateMerchantVO getEntry(Long shopId) {
         ShopDirectMerchant merchant = getOne(query()
-                .eq(ShopDirectMerchant::getLicenceNo, licenceNo)
                 .eq(ShopDirectMerchant::getShopId, shopId));
         if (merchant == null) {
             return null;