|
|
@ -701,11 +701,11 @@ public class ProcessProductPublishTaskService extends TaskBaseService {
|
|
|
|
List<DataItem> attributes = attrRetData.getData();
|
|
|
|
List<DataItem> attributes = attrRetData.getData();
|
|
|
|
log.info("attributes :" + JSON.toJSONString(attributes));
|
|
|
|
log.info("attributes :" + JSON.toJSONString(attributes));
|
|
|
|
String title = productDetailBase.getString("title");
|
|
|
|
String title = productDetailBase.getString("title");
|
|
|
|
Map<String, List<StrObjMap>> productFormatNew = buildProductAttrs(attributes, sourceAttrs, title,queueMsg);
|
|
|
|
// Map<String, List<StrObjMap>> productFormatNew = buildProductAttrs(attributes, sourceAttrs, title,queueMsg);
|
|
|
|
log.info("productFormatNew :" + JSON.toJSONString(productFormatNew));
|
|
|
|
// log.info("productFormatNew :" + JSON.toJSONString(productFormatNew));
|
|
|
|
Map<String, List<StrObjMap>> productFormatNew2 = buildProductAttrsByDd(attributes, sourceAttrs, title, queueMsg);
|
|
|
|
Map<String, List<StrObjMap>> productFormatNew = buildProductAttrsByDd(attributes, sourceAttrs, title, queueMsg);
|
|
|
|
log.info("productFormatNew2 :" + JSON.toJSONString(productFormatNew2));
|
|
|
|
// log.info("productFormatNew2 :" + JSON.toJSONString(productFormatNew2));
|
|
|
|
E.throwMSException("测试");
|
|
|
|
// E.throwMSException("测试");
|
|
|
|
productFormatNew = attachBrand2ProductFormatNew(brandId, brandName, productFormatNew);
|
|
|
|
productFormatNew = attachBrand2ProductFormatNew(brandId, brandName, productFormatNew);
|
|
|
|
productDetailBase.put("productFormatNew", productFormatNew);
|
|
|
|
productDetailBase.put("productFormatNew", productFormatNew);
|
|
|
|
|
|
|
|
|
|
|
@ -728,9 +728,9 @@ public class ProcessProductPublishTaskService extends TaskBaseService {
|
|
|
|
mStrObjmap.put("diy_type", attribute.getDiyType());
|
|
|
|
mStrObjmap.put("diy_type", attribute.getDiyType());
|
|
|
|
String valueStr = ObjectUtil.isNotEmpty(attribute.getOptions()) ? attribute.getOptions().get(0).getValue() : "0";
|
|
|
|
String valueStr = ObjectUtil.isNotEmpty(attribute.getOptions()) ? attribute.getOptions().get(0).getValue() : "0";
|
|
|
|
mStrObjmap.put("value", Integer.parseInt(valueStr));
|
|
|
|
mStrObjmap.put("value", Integer.parseInt(valueStr));
|
|
|
|
mStrObjmap.put("type", attribute.getType());
|
|
|
|
// mStrObjmap.put("type", attribute.getType());
|
|
|
|
mStrObjmap.put("required", attribute.getRequired());
|
|
|
|
// mStrObjmap.put("required", attribute.getRequired());
|
|
|
|
mStrObjmap.put("attr", attribute.getPropertyName());
|
|
|
|
// mStrObjmap.put("attr", attribute.getPropertyName());
|
|
|
|
matchList.add(mStrObjmap);
|
|
|
|
matchList.add(mStrObjmap);
|
|
|
|
matchAttrs.put(String.valueOf(currAid), matchList);
|
|
|
|
matchAttrs.put(String.valueOf(currAid), matchList);
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -974,7 +974,7 @@ public class ProcessProductPublishTaskService extends TaskBaseService {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
matchAttr = new StrObjMap();
|
|
|
|
matchAttr = new StrObjMap();
|
|
|
|
matchAttr.put("name", name);
|
|
|
|
matchAttr.put("name", name);
|
|
|
|
matchAttr.put("diy_type", 0);
|
|
|
|
matchAttr.put("diy_type", attribute.getDiyType());
|
|
|
|
matchAttr.put("value", CommonTool.convertStringToInt(value));
|
|
|
|
matchAttr.put("value", CommonTool.convertStringToInt(value));
|
|
|
|
matchAttr.put("type",attribute.getType());
|
|
|
|
matchAttr.put("type",attribute.getType());
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -1218,7 +1218,7 @@ public class ProcessProductPublishTaskService extends TaskBaseService {
|
|
|
|
if (sourceValue != null) {
|
|
|
|
if (sourceValue != null) {
|
|
|
|
StrObjMap matchAttr = new StrObjMap();
|
|
|
|
StrObjMap matchAttr = new StrObjMap();
|
|
|
|
matchAttr.put("name", sourceValue);
|
|
|
|
matchAttr.put("name", sourceValue);
|
|
|
|
matchAttr.put("diy_type", 0);
|
|
|
|
matchAttr.put("diy_type", attribute.getDiyType());
|
|
|
|
matchAttr.put("value", 0);
|
|
|
|
matchAttr.put("value", 0);
|
|
|
|
matchAttr.put("type",attribute.getType());
|
|
|
|
matchAttr.put("type",attribute.getType());
|
|
|
|
matchAttr.put("required",attribute.getRequired());
|
|
|
|
matchAttr.put("required",attribute.getRequired());
|
|
|
|