Merge remote-tracking branch 'origin/master' into jd_v2

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/constants/RunParamConstant.java

@@ -17,6 +17,8 @@ public class RunParamConstant {
     public static final Integer SLEEP_TEN_SECOND = 10000;
     public static final Integer SLEEP_ONE_MINUTE = 60000;
 
+    public static final Integer SLEEP_FIVE_MINUTE = 300000;
+
     /**刷新token地址**/
     public static final String JD_REFRESH_URL = "https://open-oauth.jd.com/oauth2/refresh_token?app_key=%s&app_secret=%s&grant_type=refresh_token&refresh_token=%s";
     /**通过code获取token地址**/

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

@@ -213,12 +213,12 @@ public class JdApiServiceImpl implements JdApiService {
         while (true){
             JdInfoVo jdInfoVo = validJdInfo();
             if(ObjectUtil.isNull(jdInfoVo)){
-                ThreadUtil.safeSleep(RunParamConstant.SLEEP_TEN_SECOND);
+                ThreadUtil.safeSleep(RunParamConstant.SLEEP_ONE_MINUTE);
                 continue;
             }
             getJdOrderList(jdClient, jdInfoVo);
             log.info("京东订单采集完成");
-            ThreadUtil.safeSleep(RunParamConstant.SLEEP_TEN_SECOND);
+            ThreadUtil.safeSleep(RunParamConstant.SLEEP_ONE_MINUTE);
         }
     }
 
@@ -236,12 +236,12 @@ public class JdApiServiceImpl implements JdApiService {
         while (true){
             JdInfoVo jdInfoVo = validJdInfo();
             if(ObjectUtil.isNull(jdInfoVo)){
-                ThreadUtil.safeSleep(RunParamConstant.SLEEP_TEN_SECOND);
+                ThreadUtil.safeSleep(RunParamConstant.SLEEP_ONE_MINUTE);
                 continue;
             }
             getJdBackOrder(jdClient, jdInfoVo);
             log.info("京东退货单采集完成");
-            ThreadUtil.safeSleep(RunParamConstant.SLEEP_TEN_SECOND);
+            ThreadUtil.safeSleep(RunParamConstant.SLEEP_ONE_MINUTE);
         }
     }
 
@@ -258,12 +258,12 @@ public class JdApiServiceImpl implements JdApiService {
         while (true){
             JdInfoVo jdInfoVo = validJdInfo();
             if(ObjectUtil.isNull(jdInfoVo)){
-                ThreadUtil.safeSleep(RunParamConstant.SLEEP_TEN_SECOND);
+                ThreadUtil.safeSleep(RunParamConstant.SLEEP_FIVE_MINUTE);
                 continue;
             }
             handleRefreshDate(jdClient);
             log.info("刷新京东状态完成");
-            ThreadUtil.safeSleep(RunParamConstant.SLEEP_TEN_SECOND);
+            ThreadUtil.safeSleep(RunParamConstant.SLEEP_FIVE_MINUTE);
         }
     }
 

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/logistics/impl/LogisticsInfosServiceImpl.java

@@ -80,7 +80,7 @@ public class LogisticsInfosServiceImpl extends ServiceImpl<LogisticsInfosMapper,
         wrapper.eq("li", LogisticsInfos::getStatus, dto.getStatus());
         if (ObjectUtil.isNotEmpty(dto.getKeyword())) {
             //判断是否是 采购到货 采购退货 来源
-            boolean flag = !Objects.equals(dto.getBusinessType(), 1) || !Objects.equals(dto.getBusinessType(), 5);
+            boolean flag = !Objects.equals(dto.getBusinessType(), 1) && !Objects.equals(dto.getBusinessType(), 5);
 
             List<String> companyCodes = companyInfoService.listObject(CompanyInfo::getCode, q -> q.like(CompanyInfo::getName, dto.getKeyword()));
             wrapper.and(q -> q.like("li", LogisticsInfos::getCode, dto.getKeyword())

hx-wms/src/main/java/com/fjhx/wms/service/stock/StockService.java

@@ -73,6 +73,8 @@ public interface StockService extends BaseService<Stock> {
      */
     void qualifiedToDefective(Stock stock);
 
+    void ModifyInventory(int type, List<Stock> list, Long warehouseId);
+
     /**
      * 次品转良品
      */

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockServiceImpl.java

@@ -649,6 +649,11 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
         return stockJournalDetailsList;
     }
 
+    @Override
+    public synchronized void ModifyInventory(int type, List<Stock> list, Long warehouseId) {
+        ModifyInventory(0L, type, list, warehouseId);
+    }
+
     /**
      * 次品转良品
      */