诊断单据产品下载问题

src/main/java/com/glxp/api/service/thrsys/ThrOrdersDlService.java

@@ -99,7 +99,7 @@ public class ThrOrdersDlService {
                 ThrOrderEntity originEntity = thrOrderService.findByUnique(thrOrderEntity.getBillNo(), thrOrderEntity.getThirdSysFk());
                 if (originEntity != null) {
                     thrOrderService.deleteById(originEntity.getId() + "");
-                    thrOrderDetailService.deleteByOrderIdFk(originEntity.getId() + "");
+                    thrOrderDetailService.deleteByOrderIdFk(originEntity.getBillNo() + "");
                 }
                 thrOrderService.insertThrOrder(thrOrderEntity);
                 List<ThrOrderDetailEntity> thrOrderDetailEntities = new ArrayList<>();

src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java

@@ -224,6 +224,7 @@ public class ThrProductsServiceImpl extends ServiceImpl<ThrProductsDao, ThrProdu
         filterThrProductsRequest.setThirdSysFk(filterThrProductsRequest.getThirdSys());
         filterThrProductsRequest.setLimit(limit);
         log.error("开始下载-------");
+        int count = 0;
         while (true) {
             log.error("下载分页-------" + page);
             filterThrProductsRequest.setPage(page);
@@ -258,9 +259,17 @@ public class ThrProductsServiceImpl extends ServiceImpl<ThrProductsDao, ThrProdu
                 if (list.size() >= limit && !baseResponse.getData().getTotal().equals(-666)) {
                     page++;
                 } else {
+                    if (count == 0) {
+                        page++;
+                        count++;
+                    } else
                         break;
                 }
             } else {
+                if (count == 0) {
+                    page++;
+                    count++;
+                } else
                     return ResultVOUtils.error(500, "下载第三方系统产品信息异常");
             }
         }

src/main/resources/application-dev.yml

@@ -4,7 +4,7 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_zyy?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_pzh?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: 123456
     hikari:

src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml

@@ -345,7 +345,4 @@
             </if>
         </where>
     </select>
-
-
-
 </mapper>