|
|
@ -1,5 +1,34 @@
|
|
|
|
package com.ms.api.task;
|
|
|
|
package com.ms.api.task;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import java.io.IOException;
|
|
|
|
|
|
|
|
import java.io.InputStream;
|
|
|
|
|
|
|
|
import java.net.URL;
|
|
|
|
|
|
|
|
import java.text.SimpleDateFormat;
|
|
|
|
|
|
|
|
import java.time.LocalDate;
|
|
|
|
|
|
|
|
import java.time.LocalDateTime;
|
|
|
|
|
|
|
|
import java.time.format.DateTimeFormatter;
|
|
|
|
|
|
|
|
import java.util.ArrayList;
|
|
|
|
|
|
|
|
import java.util.Arrays;
|
|
|
|
|
|
|
|
import java.util.Collections;
|
|
|
|
|
|
|
|
import java.util.Date;
|
|
|
|
|
|
|
|
import java.util.HashMap;
|
|
|
|
|
|
|
|
import java.util.HashSet;
|
|
|
|
|
|
|
|
import java.util.LinkedHashMap;
|
|
|
|
|
|
|
|
import java.util.LinkedHashSet;
|
|
|
|
|
|
|
|
import java.util.List;
|
|
|
|
|
|
|
|
import java.util.Map;
|
|
|
|
|
|
|
|
import java.util.Objects;
|
|
|
|
|
|
|
|
import java.util.Random;
|
|
|
|
|
|
|
|
import java.util.Set;
|
|
|
|
|
|
|
|
import java.util.TreeMap;
|
|
|
|
|
|
|
|
import java.util.UUID;
|
|
|
|
|
|
|
|
import java.util.concurrent.Executor;
|
|
|
|
|
|
|
|
import java.util.concurrent.TimeUnit;
|
|
|
|
|
|
|
|
import java.util.regex.Matcher;
|
|
|
|
|
|
|
|
import java.util.regex.Pattern;
|
|
|
|
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
|
|
|
|
|
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
|
import cn.hutool.core.io.IoUtil;
|
|
|
|
import cn.hutool.core.io.IoUtil;
|
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
@ -21,16 +50,61 @@ import com.doudian.open.core.AccessToken;
|
|
|
|
import com.jinritemai.cloud.base.core.util.AuthThreadLocalUtil;
|
|
|
|
import com.jinritemai.cloud.base.core.util.AuthThreadLocalUtil;
|
|
|
|
import com.ms.api.biz.MoveService;
|
|
|
|
import com.ms.api.biz.MoveService;
|
|
|
|
import com.ms.api.biz.SaveBatchMoveTaskBizService;
|
|
|
|
import com.ms.api.biz.SaveBatchMoveTaskBizService;
|
|
|
|
import com.ms.api.bo.*;
|
|
|
|
import com.ms.api.bo.AttributeBO;
|
|
|
|
import com.ms.api.common.*;
|
|
|
|
import com.ms.api.bo.CateAttributeResultBO;
|
|
|
|
import com.ms.api.consts.*;
|
|
|
|
import com.ms.api.bo.CategoryBO;
|
|
|
|
|
|
|
|
import com.ms.api.bo.MoveProductPublishQueueBO;
|
|
|
|
|
|
|
|
import com.ms.api.bo.MoveShopSettingBO;
|
|
|
|
|
|
|
|
import com.ms.api.bo.RedisKeyBO;
|
|
|
|
|
|
|
|
import com.ms.api.bo.SkuDetailBO;
|
|
|
|
|
|
|
|
import com.ms.api.bo.SkuInfoBO;
|
|
|
|
|
|
|
|
import com.ms.api.common.ApiResult;
|
|
|
|
|
|
|
|
import com.ms.api.common.E;
|
|
|
|
|
|
|
|
import com.ms.api.common.Ret;
|
|
|
|
|
|
|
|
import com.ms.api.common.StrObjMap;
|
|
|
|
|
|
|
|
import com.ms.api.common.StrStrMap;
|
|
|
|
|
|
|
|
import com.ms.api.common.TaskBaseService;
|
|
|
|
|
|
|
|
import com.ms.api.consts.CommonConst;
|
|
|
|
|
|
|
|
import com.ms.api.consts.MaterialConst;
|
|
|
|
|
|
|
|
import com.ms.api.consts.MoveConst;
|
|
|
|
|
|
|
|
import com.ms.api.consts.RedisKeyConst;
|
|
|
|
|
|
|
|
import com.ms.api.consts.StatusConst;
|
|
|
|
import com.ms.api.paas.RedisService;
|
|
|
|
import com.ms.api.paas.RedisService;
|
|
|
|
import com.ms.api.paas.StorageService;
|
|
|
|
import com.ms.api.paas.StorageService;
|
|
|
|
import com.ms.api.service.*;
|
|
|
|
import com.ms.api.service.CategoryShopService;
|
|
|
|
import com.ms.api.tool.*;
|
|
|
|
import com.ms.api.service.MaterialBizAuditStatusLogService;
|
|
|
|
|
|
|
|
import com.ms.api.service.MaterialBizQueueService;
|
|
|
|
|
|
|
|
import com.ms.api.service.MaterialBizToMaterialService;
|
|
|
|
|
|
|
|
import com.ms.api.service.MoveCollectTaskDetailService;
|
|
|
|
|
|
|
|
import com.ms.api.service.MoveCollectTaskService;
|
|
|
|
|
|
|
|
import com.ms.api.service.MoveProductPublishBufferService;
|
|
|
|
|
|
|
|
import com.ms.api.service.MoveProductPublishQueueService;
|
|
|
|
|
|
|
|
import com.ms.api.service.MoveProductPublishToPicQueueService;
|
|
|
|
|
|
|
|
import com.ms.api.service.MoveShopConfigService;
|
|
|
|
|
|
|
|
import com.ms.api.service.MoveShopSettingService;
|
|
|
|
|
|
|
|
import com.ms.api.service.RsyncCategoryQueueService;
|
|
|
|
|
|
|
|
import com.ms.api.service.Shop1688DsAuthService;
|
|
|
|
|
|
|
|
import com.ms.api.service.ShopService;
|
|
|
|
|
|
|
|
import com.ms.api.tool.CommonTool;
|
|
|
|
|
|
|
|
import com.ms.api.tool.DsJsonRequestTemplate;
|
|
|
|
|
|
|
|
import com.ms.api.tool.ImageTool;
|
|
|
|
|
|
|
|
import com.ms.api.tool.MoveTool;
|
|
|
|
|
|
|
|
import com.ms.api.tool.SecurityTool;
|
|
|
|
|
|
|
|
import com.ms.api.tool.TailorImgTool;
|
|
|
|
import com.ms.api.util.DdRequestUtil;
|
|
|
|
import com.ms.api.util.DdRequestUtil;
|
|
|
|
import com.ms.api.util.MoveUtil;
|
|
|
|
import com.ms.api.util.MoveUtil;
|
|
|
|
import com.ms.dal.entity.*;
|
|
|
|
import com.ms.dal.entity.Category;
|
|
|
|
|
|
|
|
import com.ms.dal.entity.CategoryShop;
|
|
|
|
|
|
|
|
import com.ms.dal.entity.MaterialBizAuditStatusLog;
|
|
|
|
|
|
|
|
import com.ms.dal.entity.MaterialBizQueue;
|
|
|
|
|
|
|
|
import com.ms.dal.entity.MaterialBizToMaterial;
|
|
|
|
|
|
|
|
import com.ms.dal.entity.MoveCollectTaskDetail;
|
|
|
|
|
|
|
|
import com.ms.dal.entity.MoveProductPublishBuffer;
|
|
|
|
|
|
|
|
import com.ms.dal.entity.MoveProductPublishQueue;
|
|
|
|
|
|
|
|
import com.ms.dal.entity.MoveProductPublishToPicQueue;
|
|
|
|
|
|
|
|
import com.ms.dal.entity.RsyncCategoryQueue;
|
|
|
|
|
|
|
|
import com.ms.dal.entity.Shop;
|
|
|
|
|
|
|
|
import com.ms.dal.entity.Shop1688DsAuth;
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
@ -45,21 +119,6 @@ import org.springframework.transaction.PlatformTransactionManager;
|
|
|
|
import org.springframework.transaction.TransactionStatus;
|
|
|
|
import org.springframework.transaction.TransactionStatus;
|
|
|
|
import org.springframework.transaction.support.DefaultTransactionDefinition;
|
|
|
|
import org.springframework.transaction.support.DefaultTransactionDefinition;
|
|
|
|
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
|
|
|
|
import java.io.IOException;
|
|
|
|
|
|
|
|
import java.io.InputStream;
|
|
|
|
|
|
|
|
import java.net.URL;
|
|
|
|
|
|
|
|
import java.text.SimpleDateFormat;
|
|
|
|
|
|
|
|
import java.time.LocalDate;
|
|
|
|
|
|
|
|
import java.time.LocalDateTime;
|
|
|
|
|
|
|
|
import java.time.format.DateTimeFormatter;
|
|
|
|
|
|
|
|
import java.util.*;
|
|
|
|
|
|
|
|
import java.util.concurrent.Executor;
|
|
|
|
|
|
|
|
import java.util.concurrent.TimeUnit;
|
|
|
|
|
|
|
|
import java.util.regex.Matcher;
|
|
|
|
|
|
|
|
import java.util.regex.Pattern;
|
|
|
|
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 处理move_product_publish_queue中的数据
|
|
|
|
* 处理move_product_publish_queue中的数据
|
|
|
|
*/
|
|
|
|
*/
|
|
|
@ -1504,6 +1563,10 @@ public class ProcessProductPublishTaskService extends TaskBaseService {
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
// skuList = processSourcePostFeePrice(isFastMode, sourcePostFeePriceAddValue, skuList, cnaliDsDetailId, moveBaseData);
|
|
|
|
// skuList = processSourcePostFeePrice(isFastMode, sourcePostFeePriceAddValue, skuList, cnaliDsDetailId, moveBaseData);
|
|
|
|
|
|
|
|
for (Map.Entry<String, SkuDetailBO> entry : skuList.entrySet()) {
|
|
|
|
|
|
|
|
SkuDetailBO skuDetail = entry.getValue();
|
|
|
|
|
|
|
|
skuDetail.setPrice(skuDetail.getPrice() * 100);
|
|
|
|
|
|
|
|
}
|
|
|
|
return skuList;
|
|
|
|
return skuList;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|