Merge remote-tracking branch 'origin/master'

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

@@ -680,8 +680,9 @@ public class ProcessProductPublishTaskService extends TaskBaseService {
         if (!Objects.isNull(imagePaths) && !imagePaths.isEmpty()) {
             defaultColorImg = imagePaths.get(0);
         }
-        JSONObject skus = buildFastModeAddSkuMinPriceSku(queueMsg.getIsFastMode(), moveBaseData.getJSONObject("skus"), queueMsg.getCondition(), defaultColorImg);
-        moveBaseData.put("skus", skus);
+        // // TODO: 2023/9/17 暂时不走极速模式
+//        JSONObject skus = buildFastModeAddSkuMinPriceSku(queueMsg.getIsFastMode(), moveBaseData.getJSONObject("skus"), queueMsg.getCondition(), defaultColorImg);
+//        moveBaseData.put("skus", skus);
 
         Ret processSkuAliasRet = replaceAndDeleteSkuName(moveBaseData, (JSONObject) JSONObject.toJSON(condition));
         if (CommonTool.isFailRet(processSkuAliasRet)) {
@@ -1961,9 +1962,9 @@ public class ProcessProductPublishTaskService extends TaskBaseService {
 
         Object[] processedResult = processAddSkuMinPrice(priceCondition, minPrice, colorMap, sizeMap, skuMap, defaultColorImg);
 
-        skuMap = (JSONObject) processedResult[0];
-        colorMap = (JSONObject) processedResult[1];
-        sizeMap = (JSONObject) processedResult[2];
+        colorMap = (JSONObject) processedResult[0];
+        sizeMap= (JSONObject) processedResult[1];
+        skuMap = (JSONObject) processedResult[2];
 
         skus.put("skuMap", skuMap);
         skus.put("colorMap", colorMap);
@@ -2054,8 +2055,8 @@ public class ProcessProductPublishTaskService extends TaskBaseService {
 //                addSkuMinPriceColorImg = defaultColorImg;
 //            }
 //            propInfo.put("imgUrls", new JSONArray().add(addSkuMinPriceColorImg));
+//            saleProp.put(skuMinPriceStr, propInfo);
         }
-        saleProp.put(skuMinPriceStr, propInfo);
         return saleProp;
     }