搜索，代码整合

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/controller/jd/JdOrderController.java

@@ -10,6 +10,7 @@ import com.fjhx.victoriatourist.entity.logistics.vo.LogisticsInfosVo;
 import com.fjhx.victoriatourist.entity.stock.dto.StockTransferDto;
 import com.fjhx.victoriatourist.service.jd.JdOrderService;
 import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -133,6 +134,8 @@ public class JdOrderController {
     @PostMapping("/tellBackOrer")
     public void tellBackOrer(@RequestBody JdOrderDto jdOrderDto){
         //TODO 参数校验
+        SecurityUtils.setTenantId("wdly");
         jdOrderService.tellBackOrer(jdOrderDto);
+        SecurityUtils.clearTenantId();
     }
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/jd/dto/JdOrderSelectDto.java

@@ -24,4 +24,9 @@ public class JdOrderSelectDto extends BaseSelectDto {
      */
     private Integer inStatus;
 
+    /**采购单id**/
+    private Long orderId;
+
+    /**京东商品编号**/
+    private Long wareId;
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/impl/JdApiServiceImpl.java

@@ -76,7 +76,8 @@ public class JdApiServiceImpl implements JdApiService {
     private static final String ACCESS_TOKEN = "access_token";
     private static final String REFRESH_TOKEN = "refresh_token";
 
-    private static final Integer SLEEP_TIMES = 10000;
+    private static final Integer SLEEP_TEN_SECOND = 10000;
+    private static final Integer SLEEP_ONE_MINUTE = 60000;
 
     @Autowired
     private JdOrderService jdOrderService;
@@ -228,16 +229,17 @@ public class JdApiServiceImpl implements JdApiService {
      */
     @Async
     public void startJdOrder(){
+        ThreadUtil.safeSleep(SLEEP_ONE_MINUTE);
         JdClient jdClient = jdClientFactory.getJdClient();
         while (true){
             JdInfoVo jdInfoVo = validJdInfo();
             if(ObjectUtil.isNull(jdInfoVo)){
-                ThreadUtil.safeSleep(SLEEP_TIMES);
+                ThreadUtil.safeSleep(SLEEP_TEN_SECOND);
                 continue;
             }
             getJdOrderList(jdClient, jdInfoVo);
             log.info("京东订单采集完成");
-            ThreadUtil.safeSleep(SLEEP_TIMES);
+            ThreadUtil.safeSleep(SLEEP_TEN_SECOND);
         }
     }
 
@@ -250,16 +252,17 @@ public class JdApiServiceImpl implements JdApiService {
      */
     @Async
     public void startJdBackOrder(){
+        ThreadUtil.safeSleep(SLEEP_ONE_MINUTE);
         JdClient jdClient = jdClientFactory.getJdClient();
         while (true){
             JdInfoVo jdInfoVo = validJdInfo();
             if(ObjectUtil.isNull(jdInfoVo)){
-                ThreadUtil.safeSleep(SLEEP_TIMES);
+                ThreadUtil.safeSleep(SLEEP_TEN_SECOND);
                 continue;
             }
             getJdBackOrder(jdClient, jdInfoVo);
             log.info("京东退货单采集完成");
-            ThreadUtil.safeSleep(SLEEP_TIMES);
+            ThreadUtil.safeSleep(SLEEP_TEN_SECOND);
         }
     }
 
@@ -296,16 +299,17 @@ public class JdApiServiceImpl implements JdApiService {
      */
     @Async
     public void refreshJdState(){
+        ThreadUtil.safeSleep(SLEEP_ONE_MINUTE);
         JdClient jdClient = jdClientFactory.getJdClient();
         while (true){
             JdInfoVo jdInfoVo = validJdInfo();
             if(ObjectUtil.isNull(jdInfoVo)){
-                ThreadUtil.safeSleep(SLEEP_TIMES);
+                ThreadUtil.safeSleep(SLEEP_TEN_SECOND);
                 continue;
             }
             handleRefreshDate(jdClient);
             log.info("刷新京东状态完成");
-            ThreadUtil.safeSleep(SLEEP_TIMES);
+            ThreadUtil.safeSleep(SLEEP_TEN_SECOND);
         }
     }
 
@@ -333,7 +337,6 @@ public class JdApiServiceImpl implements JdApiService {
                 for (JdOrder jdOrder : jdOrderList) {
                     Long id = collect.get(jdOrder.getOrderId()).getId();
                     jdOrder.setId(id);
-                    System.out.println(123);
                     DynamicDataSourceContextHolder.push(SourceConstant.VICTORIATOURIST);
                     jdOrderService.saveOrUpdate(jdOrder);
                 }
@@ -619,13 +622,13 @@ public class JdApiServiceImpl implements JdApiService {
             boolean online = jdInfoVo.getOnline() > 0 ? true : false;
             if(!online){
                 log.info("京东已经下线");
-                ThreadUtil.safeSleep(SLEEP_TIMES);
+                ThreadUtil.safeSleep(SLEEP_TEN_SECOND);
                 continue;
             }
             //开始校验是否符合条件
             if (ObjectUtil.isNull(jdInfoVo.getInitQueryDate())) {
                 log.error("请线配置京东初始化查询时间");
-                ThreadUtil.safeSleep(SLEEP_TIMES);
+                ThreadUtil.safeSleep(SLEEP_TEN_SECOND);
                 continue;
             }
             try {

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/impl/JdOrderServiceImpl.java

@@ -120,6 +120,9 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
         wrapper.eq("jo", JdOrder::getOutStatus, dto.getStatus());
         wrapper.orderByDesc("jo", JdOrder::getId);
 
+        wrapper.like(ObjectUtil.isNotNull(dto.getOrderId()),"jo.order_id",dto.getOrderId());
+        wrapper.like(ObjectUtil.isNotNull(dto.getWareId()),"jod.ware_id",dto.getWareId());
+
         if (ObjectUtil.isNotEmpty(dto.getKeyword())) {
             wrapper.keyword(dto.getKeyword(),
                     new SqlField("jo", JdOrderVo::getCode)

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/initializers/JdInitializer.java

@@ -24,7 +24,7 @@ public class JdInitializer {
         //收集京东采购单
 //        jdApiService.startJdOrder();
         //收集京东退货单
-        jdApiService.startJdBackOrder();
+//        jdApiService.startJdBackOrder();
         //刷新京东状态
 //        jdApiService.refreshJdState();
 

hx-victoriatourist/src/main/resources/mapper/jd/JdOrderMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fjhx.victoriatourist.mapper.jd.JdOrderMapper">
     <select id="getPage" resultType="com.fjhx.victoriatourist.entity.jd.vo.JdOrderVo">
-        select
+        select distinct
             jo.id,
             jo.code,
             jo.customer_id,
@@ -55,9 +55,8 @@
             jo.tc_flag,
             jo.tc_flag_name,
             jo.book_time
-
         from jd_order jo
-
+            LEFT JOIN jd_order_details jod ON jod.jd_order_id = jo.id
             <!--LEFT JOIN jd_order_details jod ON jod.jd_order_id = jo.id
             LEFT JOIN bytesailing_item.product_info pi ON jod.product_id = pi.id
             LEFT JOIN bytesailing_base.sys_dept de ON CAST(json_unquote(pi.victoriatourist_json -> '$.deptId') AS UNSIGNED) = de.dept_id-->