Commit 61ab5c96 by huvchao@126.com

productGroupList

parent 21428b30
...@@ -5,6 +5,7 @@ import lombok.AllArgsConstructor; ...@@ -5,6 +5,7 @@ import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import org.apache.commons.lang.StringUtils;
/** /**
* 商品组信息 * 商品组信息
...@@ -30,4 +31,32 @@ public class ProductGroupVo { ...@@ -30,4 +31,32 @@ public class ProductGroupVo {
* 第三方商品组编码。后台人工录入,有可能不唯一。 * 第三方商品组编码。后台人工录入,有可能不唯一。
*/ */
private String thirdGroupId; private String thirdGroupId;
@Override
public int hashCode() {
StringBuilder sb = new StringBuilder();
sb.append(groupId).append(thirdGroupId).append(groupName);
return sb.toString().hashCode();
}
@Override
public boolean equals(Object o) {
if (this == o)
return true;
if (o == null || getClass() != o.getClass())
return false;
// 原始字符串
StringBuilder originalString = new StringBuilder();
originalString.append(groupId).append(thirdGroupId).append(groupName);
//当前字符串
ProductGroupVo groupVo = (ProductGroupVo) o;
StringBuilder currentString = new StringBuilder();
currentString.append(groupVo.groupId).append(groupVo.thirdGroupId).append(groupVo.groupName);
return StringUtils.equals(originalString.toString(), currentString.toString());
}
} }
...@@ -1635,6 +1635,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -1635,6 +1635,7 @@ public class OrderServiceImpl implements Orderservice {
if(CollectionUtils.isNotEmpty(productDto.getComboProduct())){ if(CollectionUtils.isNotEmpty(productDto.getComboProduct())){
for (CreateOrderProductRequest comboProduct : productDto.getComboProduct()){ for (CreateOrderProductRequest comboProduct : productDto.getComboProduct()){
String comboSkuId = comboProduct.getSpecification(); String comboSkuId = comboProduct.getSpecification();
System.out.println(comboSkuId);
if (products.get(comboSkuId) != null) { if (products.get(comboSkuId) != null) {
comboProduct.setCustomerCode(products.get(comboSkuId).getCustomerCode()); comboProduct.setCustomerCode(products.get(comboSkuId).getCustomerCode());
comboProduct.setProductCode(products.get(comboSkuId).getProductCode()); comboProduct.setProductCode(products.get(comboSkuId).getProductCode());
...@@ -1650,7 +1651,6 @@ public class OrderServiceImpl implements Orderservice { ...@@ -1650,7 +1651,6 @@ public class OrderServiceImpl implements Orderservice {
} }
} }
} }
} }
return createOrderDto; return createOrderDto;
} }
...@@ -1669,7 +1669,9 @@ public class OrderServiceImpl implements Orderservice { ...@@ -1669,7 +1669,9 @@ public class OrderServiceImpl implements Orderservice {
ProductGroupVo productGroupVo = ProductGroupVo.builder() ProductGroupVo productGroupVo = ProductGroupVo.builder()
.groupId(groupDetail.getGroupId()).groupName(productGroup.getName()) .groupId(groupDetail.getGroupId()).groupName(productGroup.getName())
.thirdGroupId(productGroup.getGroupCode()).build(); .thirdGroupId(productGroup.getGroupCode()).build();
targetGroupList.add(productGroupVo); if (!targetGroupList.contains(productGroupVo)) {
targetGroupList.add(productGroupVo);
}
} }
} }
product.setProductGroupList(targetGroupList); product.setProductGroupList(targetGroupList);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment