根据业务修改 编辑活动(待审核/审核拒绝 初次) 接口

新增 修改码活动(已审核通过) 接口

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/vo/result/ActiveModifyApplyPackageVO.java

@@ -0,0 +1,34 @@
+package com.abi.qms.platform.dao.vo.result;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+/**
+ * @author Eurus
+ * @date 2021/5/31 15:54
+ * @Description: 活动编辑申请码包关联子表 返回
+ */
+public class ActiveModifyApplyPackageVO implements Serializable {
+
+    @ApiModelProperty("码包id")
+    private Long packageId;
+
+    @ApiModelProperty("码类型 1-箱码 2-盖码")
+    private Integer qrType;
+
+    @ApiModelProperty("sku名称")
+    private String skuName;
+
+    @ApiModelProperty("品牌名称")
+    private String brandName;
+
+    @ApiModelProperty("上级品牌名称")
+    private String parentBrandName;
+
+    @ApiModelProperty("码数量")
+    private Long qrNumber;
+
+    @ApiModelProperty("修改类型: 1-新增 2-删除")
+    private Integer modifyType;
+}

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/ActiveServiceImpl.java

@@ -397,7 +397,7 @@ public class ActiveServiceImpl implements ActiveService {
     private void batchInsertActiveModifyApplyPackageMappiing(Long applyId, Long activeId, List<Long> qrPackageIdAddList, List<Long> qrPackageIdDeleteList){
         //添加和删除的去重
         List<Long> distinctBatch = new ArrayList<>(qrPackageIdAddList);
-        distinctBatch.retainAll(qrPackageIdAddList);
+        distinctBatch.retainAll(qrPackageIdDeleteList);
         qrPackageIdAddList.removeAll(distinctBatch);
         qrPackageIdDeleteList.removeAll(distinctBatch);