Merge branch 'master' of https://codeup.aliyun.com/64d9c5feeceb191898f636d7/honor-dd-light-ds-java

# Conflicts:
#	ms-biz/src/main/java/com/ms/api/common/SPIBaseService.java

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

@@ -12,6 +12,9 @@ import com.doudian.open.api.material_batchUploadImageSync.MaterialBatchUploadIma
 import com.doudian.open.api.material_batchUploadImageSync.data.SuccessMapItem;
 import com.doudian.open.api.material_batchUploadImageSync.param.MaterialBatchUploadImageSyncParam;
 import com.doudian.open.api.material_batchUploadImageSync.param.MaterialsItem;
+import com.doudian.open.api.material_createFolder.MaterialCreateFolderRequest;
+import com.doudian.open.api.material_createFolder.MaterialCreateFolderResponse;
+import com.doudian.open.api.material_createFolder.param.MaterialCreateFolderParam;
 import com.doudian.open.api.material_getFolderInfo.MaterialGetFolderInfoRequest;
 import com.doudian.open.api.material_getFolderInfo.MaterialGetFolderInfoResponse;
 import com.doudian.open.api.material_getFolderInfo.data.ChildFolderItem;
@@ -184,7 +187,7 @@ public class MoveService {
         productDetailBase.put("categoryLeafId", queueMsg.getCid());
 
         // 源商品链接
-        productDetailBase.put("substituteGoodsUrl", String.format("http://detail.1688.com/offer/%s.html",queueMsg.getSourceItemId()));
+        productDetailBase.put("substituteGoodsUrl", String.format("http://detail.1688.com/offer/%s.html", queueMsg.getSourceItemId()));
 
         // 尺寸模版
         if (StrUtil.isNotBlank(queueMsg.getCid())) {
@@ -356,8 +359,8 @@ public class MoveService {
             allowOptions.put(value, value);
         }
         return allOptions.entrySet().stream()
-            .filter(entry -> allowOptions.containsKey(entry.getKey()))
-            .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+                .filter(entry -> allowOptions.containsKey(entry.getKey()))
+                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
     }
 
     public String buildProductName(String title, String shopId) {
@@ -1231,6 +1234,22 @@ public class MoveService {
 
         if (StringUtils.isNotBlank(folderId)) {
             return folderId;
+        } else {
+            // 创建素材文件夹
+            for (int i = 0; i < 3; i++) {
+                MaterialCreateFolderRequest request = new MaterialCreateFolderRequest();
+                MaterialCreateFolderParam param = request.getParam();
+                param.setName(MaterialConst.moveDefaultFolderName);
+                param.setType(0);
+                MaterialCreateFolderResponse response = request.execute();
+                Ret checkRet = CommonTool.checkDdApiRetStatus(response);
+                if (CommonTool.isFailRet(checkRet)) {
+                    log.error("创建素材文件夹失败" + checkRet);
+                }else{
+                    folderId = response.getData().getFolderId();
+                    return folderId;
+                }
+            }
         }
 
         return "0";
@@ -1469,7 +1488,7 @@ public class MoveService {
                     }
                 }
             } catch (Exception e) {
-                log.error("unlock process publish to pic exception : " + queueIdStr,e);
+                log.error("unlock process publish to pic exception : " + queueIdStr, e);
             }
         }
         return queueList.size();

ms-biz/src/main/java/com/ms/api/common/SPIBaseService.java

@@ -12,9 +12,6 @@ import com.ms.dal.entity.Shop1688DsAuth;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import java.util.Date;
-import java.util.Objects;
-
 /**
  * SPI基础类
  */