搬家调试

ms-biz/src/main/java/com/ms/api/TestRedisService.java

@@ -35,11 +35,11 @@ public class TestRedisService extends SPIBaseService implements ExtensionService
             initHandle(req);
             ItemDTO itemDTO = req.getData();
             if(itemDTO.getTitle().equals("initProcess")){
-                for (long i = 85; i < 150; i++) {
+                for (long i = 0; i < 50; i++) {
                     redisService.pop(RedisKeyConst.MOVE_PRODUCT_PUBLISH_QUEUE);
                 }
 
-                for (long i = 115; i < 180; i++) {
+                for (long i = 149; i < 200; i++) {
                     MoveProductPublishQueue data = moveProductPublishQueueService.selectByPrimaryKey(i);
                     if(data != null && data.getLocked() == 0){
                         redisService.push(RedisKeyConst.MOVE_PRODUCT_PUBLISH_QUEUE, String.valueOf(data.getMoveCollectTaskDetailId()));

ms-biz/src/main/java/com/ms/api/biz/SaveBatchMoveTaskBizService.java

@@ -1,5 +1,6 @@
 package com.ms.api.biz;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
 import com.ms.api.bo.MoveConditionBO;
 import com.ms.api.bo.MovePriceBO;
@@ -137,33 +138,33 @@ public class SaveBatchMoveTaskBizService extends BizBaseService {
         MoveConditionBO condition = new MoveConditionBO();
         MovePriceBO priceBO = new MovePriceBO();
         condition.setMovePriceBO(priceBO);
-        if (!Objects.isNull(setting.getDeliveryDelayDay())) {
+        if (ObjectUtil.isNotEmpty(setting.getDeliveryDelayDay())) {
             condition.setDeliveryDelayDay(setting.getDeliveryDelayDay());
         }
 
-        if (!StringUtils.isEmpty(setting.getAliPriceType())) {
+        if (ObjectUtil.isNotEmpty(setting.getAliPriceType())) {
             priceBO.setAliPriceType(setting.getAliPriceType());
         }
 
         condition.setNoConsignPriceType(setting.getNoConsignPriceType());
 
-        if (setting.getPriceTail() >= 0) {
+        if (ObjectUtil.isNotEmpty(setting.getPriceTail())) {
             priceBO.setPriceTail(setting.getPriceTail());
         }
 
-        if (setting.getMoveOnsaleType() > 0) {
+        if (ObjectUtil.isNotEmpty(setting.getMoveOnsaleType())) {
             condition.setMoveOnsaleTyp(setting.getMoveOnsaleType());
         }
 
-        if (!Objects.isNull(setting.getFreightTemplateId()) && setting.getFreightTemplateId() > 0) {
+        if (ObjectUtil.isNotEmpty(setting.getFreightTemplateId())) {
             condition.setFreightTemplateId(setting.getFreightTemplateId());
         }
 
-        if (setting.getReduceType() > 0) {
+        if (ObjectUtil.isNotEmpty(setting.getReduceType())) {
             condition.setReduceType(setting.getReduceType());
         }
 
-        if (setting.getSupply7dayReturn() > 0) {
+        if (ObjectUtil.isNotEmpty(setting.getSupply7dayReturn())) {
             condition.setSupply7dayReturn(setting.getSupply7dayReturn());
         }
 

ms-biz/src/main/java/com/ms/api/task/CheckMaterialBizWaitTaskService.java

@@ -86,17 +86,14 @@ public class CheckMaterialBizWaitTaskService extends TaskBaseService {
             List<Long> waitQueueIds = materialBizToMaterialService.getMaterialBizToMaterialStatus(queueIds);
             log.info("waitQueueIds: " + waitQueueIds);
             queueIds.forEach((queueId) -> {
-                if (!waitQueueIds.contains(queueId)) {
-                    MaterialBizQueue materialBizQueue = new MaterialBizQueue();
-                    materialBizQueue.setMaterialBizQueueId((long)queueId);
+                MaterialBizQueue materialBizQueue = materialBizQueueService.selectByPrimaryKey((long)queueId);
+                if (!waitQueueIds.contains(queueId.longValue())) {
                     materialBizQueue.setStatus(StatusConst.processing);
                     materialBizQueue.setGmtModified(new Date());
                     materialBizQueueService.updateByPrimaryKeySelective(materialBizQueue);
                     return;
                 }
 
-                MaterialBizQueue materialBizQueue = new MaterialBizQueue();
-                materialBizQueue.setMaterialBizQueueId((long)queueId);
                 materialBizQueue.setGmtExec(Date.from(new Date().toInstant().plusSeconds(30)));
                 materialBizQueue.setTryTimes(materialBizQueue.getTryTimes() + 1);
                 materialBizQueue.setGmtModified(new Date());

ms-biz/src/main/java/com/ms/api/task/ProcessProductPublishTaskService.java

@@ -615,7 +615,7 @@ public class ProcessProductPublishTaskService extends TaskBaseService {
         mData.put("productDetailBase", productDetailBase);
         mData.put("moveBaseData", moveBaseData);
         mRet.setData(mData);
-
+        log.info("基础数据:" + JSON.toJSONString(mData));
         return mRet;
     }