撞配bug修复

src/main/java/cn/com/uitech/authorization/mapper/SuperBomSkuInfoMapper.java

@@ -29,7 +29,7 @@ public interface SuperBomSkuInfoMapper extends IBaseMapper<SuperBomSkuInfo> {
 
     SuperBomSkuInfo getSkuInfoByConfigId(String configId);
 
-    ArrayList<SuperBomSkuConfigInfo> getConfigInfos(String configId);
+    List<String> getConfigInfos(String configId);
 
     void updateSkuStatus(SuperBomSkuInfo returnSkuInfo);
 }

src/main/java/cn/com/uitech/authorization/pojo/entity/SuperBomSkuConfigInfo.java

@@ -8,6 +8,7 @@ import lombok.experimental.Accessors;
 
 import javax.persistence.Column;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 @Accessors(chain = true)
@@ -86,5 +87,8 @@ public class SuperBomSkuConfigInfo implements Serializable {
     @Column(name = "id")
     private String id;
 
+    @Transient
+    private String cvCode;
+
 
 }
\ No newline at end of file

src/main/java/cn/com/uitech/authorization/service/impl/IntegrateServiceImpl.java

@@ -370,9 +370,11 @@ public class IntegrateServiceImpl implements IntegrateService {
                 if (!CollectionUtils.isEmpty(skuInfos)) {
                     for (SuperBomSkuInfo skuInfo : skuInfos) {
                         //对比查出来的skuConfig信息是否完全一样
-                        ArrayList<SuperBomSkuConfigInfo> items = superBomSkuInfoMapper.getConfigInfos(skuInfo.getConfigId());
+                        List<String> items = superBomSkuInfoMapper.getConfigInfos(skuInfo.getConfigId());
+                        List<String> newItems = new ArrayList<>();
                         ArrayList<SuperBomSkuConfigInfo> params = new ArrayList<>(superBomSkuInfo.getCharacteristicList());
-                        boolean equals = params.toString().equals(items.toString());
+                        params.forEach(param -> newItems.add(param.getCharacteristicCode() + param.getCharacteristicValueCode()));
+                        boolean equals = items.containsAll(newItems);
                         //撞配成功
                         if (equals) {
                             SuperBomSkuInfo getSkuByConfigId = superBomSkuInfoMapper.getSkuInfoByConfigId(skuInfo.getConfigId());

src/main/resources/mapper/SuperBomSkuInfoMapper.xml

@@ -185,16 +185,9 @@
     select * from super_bom_sku_info where config_id = #{configId}
     </select>
 
-<select id="getConfigInfos" resultType="cn.com.uitech.authorization.pojo.entity.SuperBomSkuConfigInfo">
+<select id="getConfigInfos" resultType="java.lang.String">
     select
-        characteristic_Code,
-        characteristic_Name,
-        unis_Sales_C_Name,
-        h3c_C_Code,
-        characteristic_Value_Code,
-        characteristic_Value_Name,
-        unis_Sales_V_Name,
-        h3c_v_Value
+        characteristic_Code || characteristic_Value_Code cvcode
      from super_bom_sku_config_info where config_id  = #{configId}
     </select>