elf
/
honor-dd-light-ds-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并问题

Browse Source
20230922-ljl-fixBug
daixiaogang 1 year ago
parent 47a413f043
commit d2984d73d6
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File

12
ms-biz/src/main/java/com/ms/api/biz/MoveService.java
Unescape Escape View File

@ -844,8 +844,8 @@ public class MoveService {
public JSONArray buildSpecPrice(JSONObject productDetailBase, public JSONArray buildSpecPrice(JSONObject productDetailBase,
MoveShopSettingBO condition, MoveShopSettingBO condition,
StrObjMap colorSpecArrCalc, List<String> colorSpecArrCalc,
StrObjMap sizeSpecArrCalc, List<String> sizeSpecArrCalc,
MoveProductPublishQueueBO queueMsg, MoveProductPublishQueueBO queueMsg,
StrObjMap skuPresellChildSkuDetail, Boolean filterBanWord, List<String> foundBanWordList) { StrObjMap skuPresellChildSkuDetail, Boolean filterBanWord, List<String> foundBanWordList) {
JSONObject skuList = productDetailBase.getJSONObject("skuList"); JSONObject skuList = productDetailBase.getJSONObject("skuList");
@ -910,21 +910,21 @@ public class MoveService {
// return $this->appendSkuPresellChildSkuDetail($skuPresellChildSkuDetail, $specPrices, $deliveryDelayDay); // return $this->appendSkuPresellChildSkuDetail($skuPresellChildSkuDetail, $specPrices, $deliveryDelayDay);
} }
private StrObjMap getSaleAttrName(String skuKey, StrObjMap colorSpecArrCalc, StrObjMap sizeSpecArrCalc, Boolean filterBanWord, List<String> foundBanWordList) { private StrObjMap getSaleAttrName(String skuKey, List<String> colorSpecArrCalc, List<String> sizeSpecArrCalc, Boolean filterBanWord, List<String> foundBanWordList) {
String[] arr = skuKey.split(MoveConst.skuKeyInterval); String[] arr = skuKey.split(MoveConst.skuKeyInterval);
String colorName = arr.length >= 1 ? arr[0] : ""; String colorName = arr.length >= 1 ? arr[0] : "";
String sizeName = arr.length >= 2 ? arr[1] : ""; String sizeName = arr.length >= 2 ? arr[1] : "";
String newColorName = replaceIllegalChars(colorName, filterBanWord, foundBanWordList); String newColorName = replaceIllegalChars(colorName, filterBanWord, foundBanWordList);
String newSizeName = replaceIllegalChars(sizeName, filterBanWord, foundBanWordList); String newSizeName = replaceIllegalChars(sizeName, filterBanWord, foundBanWordList);
Boolean needSkip = false; Boolean needSkip = false;
if (colorName.length() > 0 && ObjectUtil.isNotEmpty(colorSpecArrCalc) && (newColorName.length() == 0 || !colorSpecArrCalc.containsKey(newColorName))) { if (colorName.length() > 0 && ObjectUtil.isNotEmpty(colorSpecArrCalc) && (newColorName.length() == 0 || !colorSpecArrCalc.contains(newColorName))) {
needSkip = true; needSkip = true;
} else if (sizeName.length() > 0 && ObjectUtil.isNotEmpty(sizeSpecArrCalc) && (newSizeName.length() == 0 || !sizeSpecArrCalc.containsKey(newSizeName))) { } else if (sizeName.length() > 0 && ObjectUtil.isNotEmpty(sizeSpecArrCalc) && (newSizeName.length() == 0 || !sizeSpecArrCalc.contains(newSizeName))) {
log.info(String.format("getSaleAttrName skip sizeName[%s] sizeSpecArrCalc[%s]", sizeName, sizeSpecArrCalc.toString())); log.info(String.format("getSaleAttrName skip sizeName[%s] sizeSpecArrCalc[%s]", sizeName, sizeSpecArrCalc.toString()));
needSkip = true; needSkip = true;
} }
StrObjMap diffMap = (StrObjMap) (colorSpecArrCalc.clone()); List<String> diffMap = new ArrayList<>(colorSpecArrCalc);
diffMap.remove("默认"); diffMap.remove("默认");
if (ObjectUtil.isEmpty(diffMap) && ObjectUtil.isEmpty(sizeSpecArrCalc) && StrUtil.isEmpty(newColorName) && StrUtil.isEmpty(newSizeName)) { if (ObjectUtil.isEmpty(diffMap) && ObjectUtil.isEmpty(sizeSpecArrCalc) && StrUtil.isEmpty(newColorName) && StrUtil.isEmpty(newSizeName)) {
newColorName = "默认"; newColorName = "默认";

2
ms-biz/src/main/java/com/ms/api/task/ProcessMovePublishToPicTaskService.java
Unescape Escape View File

@ -975,7 +975,7 @@ public class ProcessMovePublishToPicTaskService extends TaskBaseService {
productDetailBase.put("newSizeNameAndOldSizeNameMap", specResult.get("newSizeNameAndOldSizeNameMap")); productDetailBase.put("newSizeNameAndOldSizeNameMap", specResult.get("newSizeNameAndOldSizeNameMap"));
productDetailBase.put("publishTips", specResult.get("publishTips")); productDetailBase.put("publishTips", specResult.get("publishTips"));
JSONArray specPrices = moveService.buildSpecPrice(productDetailBase, JSONArray specPrices = moveService.buildSpecPrice(productDetailBase,
condition, (StrObjMap) specResult.get("colorSpecArr"), (StrObjMap) specResult.get("sizeSpecArr"), condition, (List<String>) specResult.get("colorSpecArr"), (List<String>) specResult.get("sizeSpecArr"),
BeanUtil.toBean(queueMsg, MoveProductPublishQueueBO.class), (StrObjMap) specResult.get("newColorNameAndOldColorNameMap"), true, foundBanWordList); BeanUtil.toBean(queueMsg, MoveProductPublishQueueBO.class), (StrObjMap) specResult.get("newColorNameAndOldColorNameMap"), true, foundBanWordList);
productDetailBase.put("specPrices", specPrices); productDetailBase.put("specPrices", specPrices);

Write Preview
Loading…
Cancel
Save