Merge remote-tracking branch 'remotes/origin/feature/1.9.11_goodsGroup' into develop

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/vo/ProductGroupVo.java

@@ -5,6 +5,7 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.apache.commons.lang.StringUtils;
 
 /**
  * 商品组信息
@@ -30,4 +31,32 @@ public class ProductGroupVo {
      * 第三方商品组编码。后台人工录入，有可能不唯一。
      */
     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());
+    }
 }

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -1639,6 +1639,7 @@ public class OrderServiceImpl implements Orderservice {
             if(CollectionUtils.isNotEmpty(productDto.getComboProduct())){
                 for (CreateOrderProductRequest comboProduct : productDto.getComboProduct()){
                     String comboSkuId = comboProduct.getSpecification();
+                    System.out.println(comboSkuId);
                     if (products.get(comboSkuId) != null) {
                         comboProduct.setCustomerCode(products.get(comboSkuId).getCustomerCode());
                         comboProduct.setProductCode(products.get(comboSkuId).getProductCode());
@@ -1654,7 +1655,6 @@ public class OrderServiceImpl implements Orderservice {
                     }
                 }
             }
-
         }
         return createOrderDto;
     }
@@ -1673,7 +1673,9 @@ public class OrderServiceImpl implements Orderservice {
                 ProductGroupVo productGroupVo = ProductGroupVo.builder()
                         .groupId(groupDetail.getGroupId()).groupName(productGroup.getName())
                         .thirdGroupId(productGroup.getGroupCode()).build();
-                targetGroupList.add(productGroupVo);
+                if (!targetGroupList.contains(productGroupVo)) {
+                    targetGroupList.add(productGroupVo);
+                }
             }
         }
         product.setProductGroupList(targetGroupList);