Merge remote-tracking branch 'origin/feature/1.0.0' into feature/1.0.0

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/controller/console/ActiveController.java

@@ -64,23 +64,7 @@ public class ActiveController {
         return BaseResponse.create(result);
     }
 
-    @ApiOperation("分页查询码活动未关联的码包列表(新增修改页面)")
-    @GetMapping("listActivePackageAdd")
-    public BaseResponse<ListActivePackageAddRes> listActivePackageAdd(@Validated ListActivePackageAddReq req) throws Exception{
-        //分页查询
-        ListActivePackageAddRes result = activeService.listActivePackageAdd(req);
-        //包装出参
-        return BaseResponse.create(result);
-    }
 
-    @ApiOperation("分页查询关联码包列表(编辑审核页面)")
-    @GetMapping("listActivePackage")
-    public BaseResponse<ListActivePackageRes> listActivePackage(@Validated GetActiveReq getActiveReq) throws Exception{
-        //分页查询
-        ListActivePackageRes result = activeService.listActivePackage(getActiveReq);
-        //包装出参
-        return BaseResponse.create(result);
-    }
 
     @ApiOperation("查询活动明细(编辑审核页面)")
     @GetMapping("getActive")
@@ -91,15 +75,6 @@ public class ActiveController {
         return BaseResponse.create(result);
     }
 
-    @ApiOperation("分页查询关联的码包列表(重新提交申请单审核页面)")
-    @GetMapping("listActiveModifyApplyPackage")
-    public BaseResponse<ListActiveModifyApplyPackageRes> listActiveModifyApplyPackage(@Validated GetActiveModifyApplyReq req) throws Exception{
-        //分页查询
-        ListActiveModifyApplyPackageRes result = activeService.listActiveModifyApplyPackage(req);
-        //包装出参
-        return BaseResponse.create(result);
-    }
-
     @ApiOperation("查询活动明细(重新提交申请单审核页面)")
     @GetMapping("getActiveModifyApplyRes")
     public BaseResponse<GetActiveModifyApplyRes> getActiveModifyApplyRes(@Validated GetActiveModifyApplyReq req) throws Exception{
@@ -155,6 +130,34 @@ public class ActiveController {
         return BaseResponse.create();
     }
 
+
+    //    6.03已废弃
+//    @ApiOperation("分页查询码活动未关联的码包列表(新增修改页面)")
+//    @GetMapping("listActivePackageAdd")
+//    public BaseResponse<ListActivePackageAddRes> listActivePackageAdd(@Validated ListActivePackageAddReq req) throws Exception{
+//        //分页查询
+//        ListActivePackageAddRes result = activeService.listActivePackageAdd(req);
+//        //包装出参
+//        return BaseResponse.create(result);
+//    }
+//
+//    @ApiOperation("分页查询关联码包列表(编辑审核页面)")
+//    @GetMapping("listActivePackage")
+//    public BaseResponse<ListActivePackageRes> listActivePackage(@Validated GetActiveReq getActiveReq) throws Exception{
+//        //分页查询
+//        ListActivePackageRes result = activeService.listActivePackage(getActiveReq);
+//        //包装出参
+//        return BaseResponse.create(result);
+//    }
+//
+//    @ApiOperation("分页查询关联的码包列表(重新提交申请单审核页面)")
+//    @GetMapping("listActiveModifyApplyPackage")
+//    public BaseResponse<ListActiveModifyApplyPackageRes> listActiveModifyApplyPackage(@Validated GetActiveModifyApplyReq req) throws Exception{
+//        //分页查询
+//        ListActiveModifyApplyPackageRes result = activeService.listActiveModifyApplyPackage(req);
+//        //包装出参
+//        return BaseResponse.create(result);
+//    }
 }
 
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/entity/BaseActive.java

@@ -60,12 +60,6 @@ public class BaseActive {
 	@ApiModelProperty(value = "活动结束日期")
     private LocalDateTime endTime;
 
-	@ApiModelProperty(value = "品牌code")
-    private String brandCode;
-
-	@ApiModelProperty(value = "子品牌code")
-    private String subBrandCode;
-
     @ApiModelProperty(value = "活动tab页 1-统一URL ")
     private Integer urlTab;
 
@@ -95,4 +89,12 @@ public class BaseActive {
     @ApiModelProperty(value = "有修改活动申请单 1-是 0-不是")
     private Integer isModifyApply;
 
+
+    //    6.03已废弃
+//    @ApiModelProperty(value = "品牌code")
+//    private String brandCode;
+//
+//    @ApiModelProperty(value = "子品牌code")
+//    private String subBrandCode;
+
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/entity/BaseActiveModifyApply.java

@@ -62,12 +62,6 @@ public class BaseActiveModifyApply {
 	@Schema(name = "活动结束日期")
     private LocalDateTime endTime;
 
-	@Schema(name = "品牌code")
-    private String brandCode;
-
-	@Schema(name = "子品牌code")
-    private String subBrandCode;
-
     @Schema(name = "活动tab页 1-统一URL")
     private Integer urlTab;
 
@@ -91,6 +85,11 @@ public class BaseActiveModifyApply {
 	@Schema(name = "是否删除")
     private Integer isDelete;
 
-
+    //    6.03已废弃
+//    @Schema(name = "品牌code")
+//    private String brandCode;
+//
+//    @Schema(name = "子品牌code")
+//    private String subBrandCode;
 
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/mapper/QrPackageMapper.java

@@ -26,31 +26,37 @@ public interface QrPackageMapper extends BaseMapper<QrPackage> {
 	 */
 	QrPackageVO selectQrPackageDetailById(Long id);
 
-	/**
-	 * 通过码活动id查询关联码包列表
-	 * @param page
-	 * @param activeId
-	 * @return
-	 */
-	IPage<ActivePackageVO> listPackageById(IPage page, @Param("id") Long activeId);
-
-	/**
-	 * 通过品牌code查询关联码包列表
-	 * @param page
-	 * @param req
-	 * @return
-	 */
-	IPage<PackageActiveSearchVO> listPackageByBrandCode(IPage page, @Param("param") ListActivePackageAddReq req);
 
 	/**
 	 * 单码查询详细信息
 	 */
 	QrSingleCheckVO getQrSingleCheckDetailById(@Param("id") Long id);
 
-	/**
-	 * 通过码活动id查询关联码包列表(关联码活动申请表)
-	 * @param page
-	 * @return
-	 */
-	IPage<ActiveModifyApplyPackageVO> listPackageByActiveApplyId(IPage page, @Param("activeId") Long activeId);
+
+
+	//    6.03已废弃
+//	/**
+//	 * 通过码活动id查询关联码包列表
+//	 * @param page
+//	 * @param activeId
+//	 * @return
+//	 */
+//	IPage<ActivePackageVO> listPackageById(IPage page, @Param("id") Long activeId);
+//
+//
+//	/**
+//	 * 通过品牌code查询关联码包列表
+//	 * @param page
+//	 * @param req
+//	 * @return
+//	 */
+//	IPage<PackageActiveSearchVO> listPackageByBrandCode(IPage page, @Param("param") ListActivePackageAddReq req);
+//
+//
+//	/**
+//	 * 通过码活动id查询关联码包列表(关联码活动申请表)
+//	 * @param page
+//	 * @return
+//	 */
+//	IPage<ActiveModifyApplyPackageVO> listPackageByActiveApplyId(IPage page, @Param("activeId") Long activeId);
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/AddActiveReq.java

@@ -41,10 +41,6 @@ public class AddActiveReq implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime endTime;
 
-    @NotEmpty(message = "所属品牌为空")
-    @ApiModelProperty(value = "所属品牌")
-    private List<String> brandCodeList;
-
     @ApiModelProperty(value = "活动tab页 1-统一URL ")
     private Integer urlTab;
 
@@ -52,8 +48,13 @@ public class AddActiveReq implements Serializable {
     @ApiModelProperty(value = "活动域名")
     private String activeUrl;
 
-    @NotNull(message = "关联码包为空")
-    @ApiModelProperty(value = "关联码包")
-    private List<Long> qrPackageIdList;
 
+//    6.03已废弃
+//    @NotNull(message = "关联码包为空")
+//    @ApiModelProperty(value = "关联码包")
+//    private List<Long> qrPackageIdList;
+//
+//    @NotEmpty(message = "所属品牌为空")
+//    @ApiModelProperty(value = "所属品牌")
+//    private List<String> brandCodeList;
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/ResubmitActiveReq.java

@@ -36,18 +36,20 @@ public class ResubmitActiveReq implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime endTime;
 
-    @ApiModelProperty(value = "品牌code")
-    private List<String> brandCodeList;
-
     @ApiModelProperty(value = "活动tab页 1-统一URL ")
     private Integer urlTab;
 
     @ApiModelProperty(value = "活动域名")
     private String activeUrl;
 
-    @ApiModelProperty(value = "关联码包(新增)")
-    private List<Long> qrPackageIdAddList;
 
-    @ApiModelProperty(value = "关联码包(删除)")
-    private List<Long> qrPackageIdDeleteList;
+    //    6.03已废弃
+//    @ApiModelProperty(value = "关联码包(新增)")
+//    private List<Long> qrPackageIdAddList;
+//
+//    @ApiModelProperty(value = "关联码包(删除)")
+//    private List<Long> qrPackageIdDeleteList;
+//
+//    @ApiModelProperty(value = "品牌code")
+//    private List<String> brandCodeList;
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/UpdateActiveReq.java

@@ -35,19 +35,21 @@ public class UpdateActiveReq implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime endTime;
 
-    @ApiModelProperty(value = "品牌code")
-    private List<String> brandCodeList;
-
     @ApiModelProperty(value = "活动tab页 1-统一URL ")
     private Integer urlTab;
 
     @ApiModelProperty(value = "活动域名")
     private String activeUrl;
 
-    @ApiModelProperty(value = "关联码包(新增)")
-    private List<Long> qrPackageIdAddList;
 
-    @ApiModelProperty(value = "关联码包(删除)")
-    private List<Long> qrPackageIdDeleteList;
+    //    6.03已废弃
+//    @ApiModelProperty(value = "关联码包(新增)")
+//    private List<Long> qrPackageIdAddList;
+//
+//    @ApiModelProperty(value = "关联码包(删除)")
+//    private List<Long> qrPackageIdDeleteList;
+//
+//    @ApiModelProperty(value = "品牌code")
+//    private List<String> brandCodeList;
 
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/GetActiveModifyApplyRes.java

@@ -21,54 +21,9 @@ import java.util.List;
 @ApiModel
 public class GetActiveModifyApplyRes implements Serializable {
 
-    @ApiModelProperty(value = "码活动")
-    private Active active;
-
     @ApiModelProperty(value = "码活动申请单")
     private ActiveModifyApply activeModifyApply;
 
-    @ApiModelProperty(value = "码包列表")
-    private ListActiveModifyApplyPackageRes listActiveModifyApplyPackageRes;
-
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @ToString
-    @ApiModel(value = "GetActiveModifyApplyRes_Active")
-    public static class Active implements Serializable {
-        @ApiModelProperty(value = "码活动id")
-        private Long id;
-
-        @ApiModelProperty(value = "活动code（即页面上的手输的活动id）")
-        private String activeCode;
-
-        @ApiModelProperty(value = "活动名称")
-        private String activeName;
-
-        @ApiModelProperty(value = "活动类型 1-utc 2-bof 3-品质信息")
-        private Integer activeType;
-
-        @ApiModelProperty(value = "活动开始日期")
-        @JsonFormat(pattern = "yyyy-MM-dd")
-        private LocalDateTime beginTime;
-
-        @ApiModelProperty(value = "活动结束日期")
-        @JsonFormat(pattern = "yyyy-MM-dd")
-        private LocalDateTime endTime;
-
-        @ApiModelProperty(value = "品牌code")
-        private List<String> brandCodeList;
-
-        @ApiModelProperty(value = "品牌名称")
-        private List<String> brandNameList;
-
-        @ApiModelProperty(value = "活动域名")
-        private String activeUrl;
-
-        @ApiModelProperty(value = "活动tab页 1-统一URL ")
-        private Integer urlTab;
-    }
-
     @Data
     @NoArgsConstructor
     @AllArgsConstructor
@@ -110,4 +65,52 @@ public class GetActiveModifyApplyRes implements Serializable {
         @ApiModelProperty(value = "活动tab页 1-统一URL ")
         private Integer urlTab;
     }
+
+
+
+    //    6.03已废弃
+//    @ApiModelProperty(value = "码活动")
+//    private Active active;
+//
+//    @ApiModelProperty(value = "码包列表")
+//    private ListActiveModifyApplyPackageRes listActiveModifyApplyPackageRes;
+//
+//    @Data
+//    @NoArgsConstructor
+//    @AllArgsConstructor
+//    @ToString
+//    @ApiModel(value = "GetActiveModifyApplyRes_Active")
+//    public static class Active implements Serializable {
+//        @ApiModelProperty(value = "码活动id")
+//        private Long id;
+//
+//        @ApiModelProperty(value = "活动code（即页面上的手输的活动id）")
+//        private String activeCode;
+//
+//        @ApiModelProperty(value = "活动名称")
+//        private String activeName;
+//
+//        @ApiModelProperty(value = "活动类型 1-utc 2-bof 3-品质信息")
+//        private Integer activeType;
+//
+//        @ApiModelProperty(value = "活动开始日期")
+//        @JsonFormat(pattern = "yyyy-MM-dd")
+//        private LocalDateTime beginTime;
+//
+//        @ApiModelProperty(value = "活动结束日期")
+//        @JsonFormat(pattern = "yyyy-MM-dd")
+//        private LocalDateTime endTime;
+//
+//        @ApiModelProperty(value = "品牌code")
+//        private List<String> brandCodeList;
+//
+//        @ApiModelProperty(value = "品牌名称")
+//        private List<String> brandNameList;
+//
+//        @ApiModelProperty(value = "活动域名")
+//        private String activeUrl;
+//
+//        @ApiModelProperty(value = "活动tab页 1-统一URL ")
+//        private Integer urlTab;
+//    }
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/GetActiveRes.java

@@ -37,19 +37,21 @@ public class GetActiveRes implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime endTime;
 
-    @ApiModelProperty(value = "品牌code")
-    private List<String> brandCodeList;
-
-    @ApiModelProperty(value = "品牌名称")
-    private List<String> brandNameList;
-
     @ApiModelProperty(value = "活动tab页 1-统一URL ")
     private Integer urlTab;
 
     @ApiModelProperty(value = "活动域名")
     private String activeUrl;
 
-    @ApiModelProperty(value = "码包列表")
-    private ListActivePackageRes listActivePackageRes;
+
+    //    6.03已废弃
+//    @ApiModelProperty(value = "码包列表")
+//    private ListActivePackageRes listActivePackageRes;
+//
+//    @ApiModelProperty(value = "品牌code")
+//    private List<String> brandCodeList;
+//
+//    @ApiModelProperty(value = "品牌名称")
+//    private List<String> brandNameList;
 
 }

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

@@ -47,13 +47,6 @@ public interface ActiveService{
      */
     GetActiveRes getActive(GetActiveReq getActiveReq);
 
-    /**
-     * 分页查询关联的码包列表(编辑审核页面)
-     * @param getActiveReq
-     * @return
-     */
-    ListActivePackageRes listActivePackage(GetActiveReq getActiveReq);
-
     /**
      * 查询活动明细(重新提交申请单审核页面)
      * @param getActiveModifyApplyReq
@@ -61,19 +54,6 @@ public interface ActiveService{
      */
     GetActiveModifyApplyRes getActiveModifyApplyRes(GetActiveModifyApplyReq getActiveModifyApplyReq);
 
-    /**
-     * 分页查询关联的码包列表(重新提交申请单审核页面)
-     * @param getActiveModifyApplyReq
-     * @return
-     */
-    ListActiveModifyApplyPackageRes listActiveModifyApplyPackage(GetActiveModifyApplyReq getActiveModifyApplyReq);
-
-    /**
-     * 分页查询码活动未关联的码包列表(新增修改页面)
-     * @param listActivePackageAddReq
-     * @return
-     */
-    ListActivePackageAddRes listActivePackageAdd(ListActivePackageAddReq listActivePackageAddReq);
 
     /**
      * 活动启用
@@ -108,4 +88,29 @@ public interface ActiveService{
     void refuseActiveModifyApply(RefuseActiveModifyApplyReq req);
 
 
+
+
+    //    6.03已废弃
+//    /**
+//     * 分页查询关联的码包列表(编辑审核页面)
+//     * @param getActiveReq
+//     * @return
+//     */
+//    ListActivePackageRes listActivePackage(GetActiveReq getActiveReq);
+//
+//
+//    /**
+//     * 分页查询关联的码包列表(重新提交申请单审核页面)
+//     * @param getActiveModifyApplyReq
+//     * @return
+//     */
+//    ListActiveModifyApplyPackageRes listActiveModifyApplyPackage(GetActiveModifyApplyReq getActiveModifyApplyReq);
+//
+//
+//    /**
+//     * 分页查询码活动未关联的码包列表(新增修改页面)
+//     * @param listActivePackageAddReq
+//     * @return
+//     */
+//    ListActivePackageAddRes listActivePackageAdd(ListActivePackageAddReq listActivePackageAddReq);
 }

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

@@ -43,24 +43,12 @@ public class ActiveServiceImpl implements ActiveService {
     @Autowired
     private BaseActiveMapper baseActiveMapper;
 
-    @Autowired
-    private BaseActiveQrPackageMappingMapper baseActiveQrPackageMappingMapper;
-
     @Autowired
     private UserUtil userUtil;
 
-    @Autowired
-    private BaseBrandMapper baseBrandMapper;
-
-    @Autowired
-    private QrPackageMapper qrPackageMapper;
-
     @Autowired
     private BaseActiveModifyApplyMapper baseActiveModifyApplyMapper;
 
-    @Autowired
-    private BaseActiveModifyApplyQrPackageMappingMapper baseActiveModifyApplyQrPackageMappingMapper;
-    
     /**
      * 新增活动
      */
@@ -89,19 +77,21 @@ public class ActiveServiceImpl implements ActiveService {
         active.setApplyUserName(userUtil.getUser().getUserName());
         active.setBeginTime(req.getBeginTime());
         active.setEndTime(req.getEndTime());
-        active.setBrandCode(CollectionUtil.isNotEmpty(req.getBrandCodeList()) ? String.join(",", req.getBrandCodeList()) : null);
+        //    6.03已废弃
+//        active.setBrandCode(CollectionUtil.isNotEmpty(req.getBrandCodeList()) ? String.join(",", req.getBrandCodeList()) : null);
         active.setUrlTab(req.getUrlTab());
         active.setActiveUrl(req.getActiveUrl());
         active.setCreateBy(userId);
         active.setUpdateBy(userId);
         baseActiveMapper.insert(active);
 
-        //添加码活动和码包的关联
-        List<QrPackage> qrPackages = searchReviewPassPackageByPackageIds(req.getQrPackageIdList());
-        List<Long> qrPackageIdsAdd = qrPackages.stream().map(QrPackage::getId).collect(Collectors.toList());
-        if(CollectionUtil.isNotEmpty(qrPackageIdsAdd)) {
-            baseActiveQrPackageMappingMapper.batchInsert(active.getId(), qrPackageIdsAdd, userId);
-        }
+        //    6.03已废弃
+//        //添加码活动和码包的关联
+//        List<QrPackage> qrPackages = searchReviewPassPackageByPackageIds(req.getQrPackageIdList());
+//        List<Long> qrPackageIdsAdd = qrPackages.stream().map(QrPackage::getId).collect(Collectors.toList());
+//        if(CollectionUtil.isNotEmpty(qrPackageIdsAdd)) {
+//            baseActiveQrPackageMappingMapper.batchInsert(active.getId(), qrPackageIdsAdd, userId);
+//        }
 
     }
 
@@ -131,15 +121,16 @@ public class ActiveServiceImpl implements ActiveService {
         active.setApplyUserName(userUtil.getUser().getUserName());
         active.setBeginTime(req.getBeginTime());
         active.setEndTime(req.getEndTime());
-        active.setBrandCode(CollectionUtil.isNotEmpty(req.getBrandCodeList()) ? String.join(",", req.getBrandCodeList()) : null);
+        //    6.03已废弃
+//        active.setBrandCode(CollectionUtil.isNotEmpty(req.getBrandCodeList()) ? String.join(",", req.getBrandCodeList()) : null);
         active.setUrlTab(req.getUrlTab());
         active.setActiveUrl(req.getActiveUrl());
         active.setUpdateBy(userId);
         baseActiveMapper.updateById(active);
 
-
-        //删除添加关联的码包，重新插入
-        updateActivePackageMappiing(req.getId(), req.getQrPackageIdAddList(), req.getQrPackageIdDeleteList());
+        //    6.03已废弃
+//        //删除添加关联的码包，重新插入
+//        updateActivePackageMappiing(req.getId(), req.getQrPackageIdAddList(), req.getQrPackageIdDeleteList());
     }
 
     @Override
@@ -158,10 +149,12 @@ public class ActiveServiceImpl implements ActiveService {
         basmaUpdate.set("is_delete", 1)
                 .eq("active_id", req.getActiveId());
         baseActiveModifyApplyMapper.update(null, basmaUpdate);
-        UpdateWrapper<BaseActiveModifyApplyQrPackageMapping> basmamUpdate = new UpdateWrapper<>();
-        basmamUpdate.set("is_delete", 1)
-                .eq("active_id", req.getActiveId());
-        baseActiveModifyApplyQrPackageMappingMapper.update(null, basmamUpdate);
+
+        //    6.03已废弃
+//        UpdateWrapper<BaseActiveModifyApplyQrPackageMapping> basmamUpdate = new UpdateWrapper<>();
+//        basmamUpdate.set("is_delete", 1)
+//                .eq("active_id", req.getActiveId());
+//        baseActiveModifyApplyQrPackageMappingMapper.update(null, basmamUpdate);
 
         //新增活动申请单
         Long userId = userUtil.getUser().getId();
@@ -175,7 +168,8 @@ public class ActiveServiceImpl implements ActiveService {
         baseActiveModifyApply.setApplyUserName(userUtil.getUser().getUserName());
         baseActiveModifyApply.setBeginTime(req.getBeginTime());
         baseActiveModifyApply.setEndTime(req.getEndTime());
-        baseActiveModifyApply.setBrandCode(CollectionUtil.isNotEmpty(req.getBrandCodeList()) ? String.join(",", req.getBrandCodeList()) : null);
+        //    6.03已废弃
+//        baseActiveModifyApply.setBrandCode(CollectionUtil.isNotEmpty(req.getBrandCodeList()) ? String.join(",", req.getBrandCodeList()) : null);
         baseActiveModifyApply.setUrlTab(req.getUrlTab());
         baseActiveModifyApply.setActiveUrl(req.getActiveUrl());
         baseActiveModifyApply.setUpdateBy(userId);
@@ -188,8 +182,9 @@ public class ActiveServiceImpl implements ActiveService {
                 .eq("id", req.getActiveId());
         baseActiveMapper.update(null, activeUpdateWrapper);
 
-        //批量插入 活动编辑申请码包关联子表
-        batchInsertActiveModifyApplyPackageMappiing(baseActiveModifyApply.getId(), req.getActiveId(), req.getQrPackageIdAddList(), req.getQrPackageIdDeleteList());
+        //    6.03已废弃
+//        //批量插入 活动编辑申请码包关联子表
+//        batchInsertActiveModifyApplyPackageMappiing(baseActiveModifyApply.getId(), req.getActiveId(), req.getQrPackageIdAddList(), req.getQrPackageIdDeleteList());
     }
 
     /**
@@ -225,34 +220,25 @@ public class ActiveServiceImpl implements ActiveService {
 
         //转化出参
         GetActiveRes res = PojoConverterUtils.copy(active, GetActiveRes.class);
-        //处理品牌code，品牌名称
-        if(Objects.nonNull(active.getBrandCode())){
-            String[] brandSplit = active.getBrandCode().trim().split(",");
-            res.setBrandCodeList(Arrays.asList(brandSplit));
-            QueryWrapper<BaseBrand> baseBrandQW = new QueryWrapper<>();
-            baseBrandQW.in("brand_code", brandSplit);
-            List<BaseBrand> baseBrands = baseBrandMapper.selectList(baseBrandQW);
-            List<String> baseBrandNameList = baseBrands.stream().map(BaseBrand::getBrandName).collect(Collectors.toList());
-            res.setBrandNameList(baseBrandNameList);
-        }
 
-        //查询码活动关联的码包列表
-        res.setListActivePackageRes(listActivePackage(req));
+        //    6.03已废弃
+//        //处理品牌code，品牌名称
+//        if(Objects.nonNull(active.getBrandCode())){
+//            String[] brandSplit = active.getBrandCode().trim().split(",");
+//            res.setBrandCodeList(Arrays.asList(brandSplit));
+//            QueryWrapper<BaseBrand> baseBrandQW = new QueryWrapper<>();
+//            baseBrandQW.in("brand_code", brandSplit);
+//            List<BaseBrand> baseBrands = baseBrandMapper.selectList(baseBrandQW);
+//            List<String> baseBrandNameList = baseBrands.stream().map(BaseBrand::getBrandName).collect(Collectors.toList());
+//            res.setBrandNameList(baseBrandNameList);
+//        }
+//
+//        //查询码活动关联的码包列表
+//        res.setListActivePackageRes(listActivePackage(req));
         return res;
 
     }
 
-    @Override
-    public ListActivePackageRes listActivePackage(GetActiveReq req) {
-        //查询码活动关联的码包列表
-        IPage<ActivePackageVO> activePackageVOIPage = qrPackageMapper.listPackageById(PageUtil.createPage(req), req.getId());
-        List<ActivePackageVO> records = activePackageVOIPage.getRecords();
-        ListActivePackageRes listActivePackageRes = new ListActivePackageRes();
-        PageUtil.copyPageInfo(listActivePackageRes, activePackageVOIPage);
-        List<ListActivePackageRes.PackageBean> packageBeans = PojoConverterUtils.copyList(records, ListActivePackageRes.PackageBean.class);
-        listActivePackageRes.setPackageBeanList(packageBeans);
-        return listActivePackageRes;
-    }
 
     @Override
     public GetActiveModifyApplyRes getActiveModifyApplyRes(GetActiveModifyApplyReq req) {
@@ -270,60 +256,39 @@ public class ActiveServiceImpl implements ActiveService {
         GetActiveModifyApplyRes res = new GetActiveModifyApplyRes();
 
         //转化出参
-        GetActiveModifyApplyRes.Active resActive = PojoConverterUtils.copy(active, GetActiveModifyApplyRes.Active.class);
+        //    6.03已废弃
+//        GetActiveModifyApplyRes.Active resActive = PojoConverterUtils.copy(active, GetActiveModifyApplyRes.Active.class);
         GetActiveModifyApplyRes.ActiveModifyApply resActiveModifyApply = PojoConverterUtils.copy(activeModifyApply, GetActiveModifyApplyRes.ActiveModifyApply.class);
-        //处理品牌code，品牌名称
-        if(Objects.nonNull(active.getBrandCode())){
-            String[] brandSplit = active.getBrandCode().trim().split(",");
-            resActive.setBrandCodeList(Arrays.asList(brandSplit));
-            QueryWrapper<BaseBrand> baseBrandQW = new QueryWrapper<>();
-            baseBrandQW.in("brand_code", brandSplit);
-            List<BaseBrand> baseBrands = baseBrandMapper.selectList(baseBrandQW);
-            List<String> baseBrandNameList = baseBrands.stream().map(BaseBrand::getBrandName).collect(Collectors.toList());
-            resActive.setBrandNameList(baseBrandNameList);
-        }
 
-        if(Objects.nonNull(activeModifyApply.getBrandCode())){
-            String[] brandSplit = activeModifyApply.getBrandCode().trim().split(",");
-            resActiveModifyApply.setBrandCodeList(Arrays.asList(brandSplit));
-            QueryWrapper<BaseBrand> baseBrandQW = new QueryWrapper<>();
-            baseBrandQW.in("brand_code", brandSplit);
-            List<BaseBrand> baseBrands = baseBrandMapper.selectList(baseBrandQW);
-            List<String> baseBrandNameList = baseBrands.stream().map(BaseBrand::getBrandName).collect(Collectors.toList());
-            resActiveModifyApply.setBrandNameList(baseBrandNameList);
-        }
-
-        res.setActive(resActive);
+        //    6.03已废弃
+        //        //处理品牌code，品牌名称
+//        if(Objects.nonNull(active.getBrandCode())){
+//            String[] brandSplit = active.getBrandCode().trim().split(",");
+//            resActive.setBrandCodeList(Arrays.asList(brandSplit));
+//            QueryWrapper<BaseBrand> baseBrandQW = new QueryWrapper<>();
+//            baseBrandQW.in("brand_code", brandSplit);
+//            List<BaseBrand> baseBrands = baseBrandMapper.selectList(baseBrandQW);
+//            List<String> baseBrandNameList = baseBrands.stream().map(BaseBrand::getBrandName).collect(Collectors.toList());
+//            resActive.setBrandNameList(baseBrandNameList);
+//        }
+//
+//        if(Objects.nonNull(activeModifyApply.getBrandCode())){
+//            String[] brandSplit = activeModifyApply.getBrandCode().trim().split(",");
+//            resActiveModifyApply.setBrandCodeList(Arrays.asList(brandSplit));
+//            QueryWrapper<BaseBrand> baseBrandQW = new QueryWrapper<>();
+//            baseBrandQW.in("brand_code", brandSplit);
+//            List<BaseBrand> baseBrands = baseBrandMapper.selectList(baseBrandQW);
+//            List<String> baseBrandNameList = baseBrands.stream().map(BaseBrand::getBrandName).collect(Collectors.toList());
+//            resActiveModifyApply.setBrandNameList(baseBrandNameList);
+//        }
+//        res.setActive(resActive);
         res.setActiveModifyApply(resActiveModifyApply);
-        //查询码活动关联的码包列表
-        res.setListActiveModifyApplyPackageRes(listActiveModifyApplyPackage(req));
+        //    6.03已废弃
+//        //查询码活动关联的码包列表
+//        res.setListActiveModifyApplyPackageRes(listActiveModifyApplyPackage(req));
         return res;
     }
 
-    @Override
-    public ListActiveModifyApplyPackageRes listActiveModifyApplyPackage(GetActiveModifyApplyReq req) {
-        //查询码活动关联的码包列表
-        IPage<ActiveModifyApplyPackageVO> activeModifyApplyPackageVOIPage = qrPackageMapper.listPackageByActiveApplyId(PageUtil.createPage(req), req.getId());
-        List<ActiveModifyApplyPackageVO> records = activeModifyApplyPackageVOIPage.getRecords();
-        ListActiveModifyApplyPackageRes listActiveModifyApplyPackageRes = new ListActiveModifyApplyPackageRes();
-        PageUtil.copyPageInfo(listActiveModifyApplyPackageRes, activeModifyApplyPackageVOIPage);
-        List<ListActiveModifyApplyPackageRes.PackageBean> packageBeans = PojoConverterUtils.copyList(records, ListActiveModifyApplyPackageRes.PackageBean.class);
-        listActiveModifyApplyPackageRes.setPackageBeanList(packageBeans);
-        return listActiveModifyApplyPackageRes;
-    }
-
-    @Override
-    public ListActivePackageAddRes listActivePackageAdd(ListActivePackageAddReq req) {
-        //查询码活动关联的码包列表
-        IPage<PackageActiveSearchVO> packageActiveSearchVOIPage = qrPackageMapper.listPackageByBrandCode(PageUtil.createPage(req), req);
-        List<PackageActiveSearchVO> records = packageActiveSearchVOIPage.getRecords();
-        ListActivePackageAddRes listActivePackageAddRes = new ListActivePackageAddRes();
-        PageUtil.copyPageInfo(listActivePackageAddRes, packageActiveSearchVOIPage);
-        List<ListActivePackageAddRes.PackageBean> packageBeans = PojoConverterUtils.copyList(records, ListActivePackageAddRes.PackageBean.class);
-        listActivePackageAddRes.setPackageBeanList(packageBeans);
-        return listActivePackageAddRes;
-    }
-
     /**
      * 活动启用
      */
@@ -437,7 +402,8 @@ public class ActiveServiceImpl implements ActiveService {
         active.setActiveType(activeModifyApply.getActiveType());
         active.setBeginTime(activeModifyApply.getBeginTime());
         active.setEndTime(activeModifyApply.getEndTime());
-        active.setBrandCode(activeModifyApply.getBrandCode());
+        //    6.03已废弃
+//        active.setBrandCode(activeModifyApply.getBrandCode());
         active.setUrlTab(activeModifyApply.getUrlTab());
         active.setActiveUrl(activeModifyApply.getActiveUrl());
         active.setAuditUserId(userId);
@@ -446,35 +412,38 @@ public class ActiveServiceImpl implements ActiveService {
         active.setIsModifyApply(0);
         baseActiveMapper.updateById(active);
 
-        //分别查出新增的码包和删除的码包
-        //批量新增
-        QueryWrapper<BaseActiveModifyApplyQrPackageMapping> activeModifyApplyQrPackageMappingQWAdd = new QueryWrapper<>();
-        activeModifyApplyQrPackageMappingQWAdd.eq("apply_id", req.getApplyId());
-        activeModifyApplyQrPackageMappingQWAdd.eq("is_delete", 0);
-        activeModifyApplyQrPackageMappingQWAdd.eq("modify_type", ActiveModifyTypeEnum.ADD.getCode());
-        List<BaseActiveModifyApplyQrPackageMapping> baseActiveModifyApplyQrPackageMappingAdds = baseActiveModifyApplyQrPackageMappingMapper.selectList(activeModifyApplyQrPackageMappingQWAdd);
-        if(CollectionUtil.isNotEmpty(baseActiveModifyApplyQrPackageMappingAdds)){
-            //聚合新增的码包
-            List<Long> packageIdAddList = baseActiveModifyApplyQrPackageMappingAdds.stream().map(BaseActiveModifyApplyQrPackageMapping::getQrPackageId).collect(Collectors.toList());
-            baseActiveQrPackageMappingMapper.batchInsert(req.getActiveId(), packageIdAddList, baseActiveModifyApplyQrPackageMappingAdds.get(0).getCreateBy());
-        }
 
-        //批量删除
-        QueryWrapper<BaseActiveModifyApplyQrPackageMapping> activeModifyApplyQrPackageMappingQWDelete = new QueryWrapper<>();
-        activeModifyApplyQrPackageMappingQWDelete.eq("apply_id", req.getApplyId());
-        activeModifyApplyQrPackageMappingQWDelete.eq("is_delete", 0);
-        activeModifyApplyQrPackageMappingQWDelete.eq("modify_type", ActiveModifyTypeEnum.DELETE.getCode());
-        List<BaseActiveModifyApplyQrPackageMapping> baseActiveModifyApplyQrPackageMappingDeletes = baseActiveModifyApplyQrPackageMappingMapper.selectList(activeModifyApplyQrPackageMappingQWAdd);
-        if(CollectionUtil.isNotEmpty(baseActiveModifyApplyQrPackageMappingDeletes)){
-            //聚合删除的码包
-            List<Long> packageIdDeleteList = baseActiveModifyApplyQrPackageMappingDeletes.stream().map(BaseActiveModifyApplyQrPackageMapping::getQrPackageId).collect(Collectors.toList());
-            UpdateWrapper<BaseActiveQrPackageMapping> aqpmQW = new UpdateWrapper<>();
-            aqpmQW.set("is_delete", 1)
-                    .set("update_by", userId)
-                    .eq("active_id", req.getActiveId())
-                    .in("qr_package_id", packageIdDeleteList);
-            baseActiveQrPackageMappingMapper.update(null, aqpmQW);
-        }
+
+        //    6.03已废弃
+//        //分别查出新增的码包和删除的码包
+//        //批量新增
+//        QueryWrapper<BaseActiveModifyApplyQrPackageMapping> activeModifyApplyQrPackageMappingQWAdd = new QueryWrapper<>();
+//        activeModifyApplyQrPackageMappingQWAdd.eq("apply_id", req.getApplyId());
+//        activeModifyApplyQrPackageMappingQWAdd.eq("is_delete", 0);
+//        activeModifyApplyQrPackageMappingQWAdd.eq("modify_type", ActiveModifyTypeEnum.ADD.getCode());
+//        List<BaseActiveModifyApplyQrPackageMapping> baseActiveModifyApplyQrPackageMappingAdds = baseActiveModifyApplyQrPackageMappingMapper.selectList(activeModifyApplyQrPackageMappingQWAdd);
+//        if(CollectionUtil.isNotEmpty(baseActiveModifyApplyQrPackageMappingAdds)){
+//            //聚合新增的码包
+//            List<Long> packageIdAddList = baseActiveModifyApplyQrPackageMappingAdds.stream().map(BaseActiveModifyApplyQrPackageMapping::getQrPackageId).collect(Collectors.toList());
+//            baseActiveQrPackageMappingMapper.batchInsert(req.getActiveId(), packageIdAddList, baseActiveModifyApplyQrPackageMappingAdds.get(0).getCreateBy());
+//        }
+//
+//        //批量删除
+//        QueryWrapper<BaseActiveModifyApplyQrPackageMapping> activeModifyApplyQrPackageMappingQWDelete = new QueryWrapper<>();
+//        activeModifyApplyQrPackageMappingQWDelete.eq("apply_id", req.getApplyId());
+//        activeModifyApplyQrPackageMappingQWDelete.eq("is_delete", 0);
+//        activeModifyApplyQrPackageMappingQWDelete.eq("modify_type", ActiveModifyTypeEnum.DELETE.getCode());
+//        List<BaseActiveModifyApplyQrPackageMapping> baseActiveModifyApplyQrPackageMappingDeletes = baseActiveModifyApplyQrPackageMappingMapper.selectList(activeModifyApplyQrPackageMappingQWAdd);
+//        if(CollectionUtil.isNotEmpty(baseActiveModifyApplyQrPackageMappingDeletes)){
+//            //聚合删除的码包
+//            List<Long> packageIdDeleteList = baseActiveModifyApplyQrPackageMappingDeletes.stream().map(BaseActiveModifyApplyQrPackageMapping::getQrPackageId).collect(Collectors.toList());
+//            UpdateWrapper<BaseActiveQrPackageMapping> aqpmQW = new UpdateWrapper<>();
+//            aqpmQW.set("is_delete", 1)
+//                    .set("update_by", userId)
+//                    .eq("active_id", req.getActiveId())
+//                    .in("qr_package_id", packageIdDeleteList);
+//            baseActiveQrPackageMappingMapper.update(null, aqpmQW);
+//        }
 
 
     }
@@ -505,89 +474,140 @@ public class ActiveServiceImpl implements ActiveService {
     }
 
 
-    /**
-     * 更新码活动和码包关联子表
-     * @param activeId
-     * @param qrPackageIdAddList
-     */
-    private void updateActivePackageMappiing(Long activeId, List<Long> qrPackageIdAddList, List<Long> qrPackageIdDeleteList){
-        //添加和删除的去重
-        List<Long> distinctBatch = new ArrayList<>(qrPackageIdAddList);
-        distinctBatch.retainAll(qrPackageIdAddList);
-        qrPackageIdAddList.removeAll(distinctBatch);
-        qrPackageIdDeleteList.removeAll(distinctBatch);
-
-        Long loginUserId = userUtil.getUser().getId();
-
-        //批量删除
-        if(CollectionUtil.isNotEmpty(qrPackageIdDeleteList)){
-            UpdateWrapper<BaseActiveQrPackageMapping> aqpmQW = new UpdateWrapper<>();
-            aqpmQW.set("is_delete", 1)
-                    .set("update_by", loginUserId)
-                    .eq("active_id", activeId)
-                    .in("qr_package_id", qrPackageIdDeleteList);
-            baseActiveQrPackageMappingMapper.update(null, aqpmQW);
-        }
-
-        //批量添加
-        if(CollectionUtil.isNotEmpty(qrPackageIdAddList)){
-            List<QrPackage> qrPackages = searchReviewPassPackageByPackageIds(qrPackageIdAddList);
-            List<Long> qrPackageIdsAdd = qrPackages.stream().map(QrPackage::getId).collect(Collectors.toList());
-            if(CollectionUtil.isNotEmpty(qrPackageIdsAdd)) {
-                baseActiveQrPackageMappingMapper.batchInsert(activeId, qrPackageIdsAdd, loginUserId);
-            }
-        }
-    }
-
-    /**
-     * 根据packgeId列表查询有效的且审核通过的码包列表
-     * @param packageIdList
-     * @return
-     */
-    private List<QrPackage> searchReviewPassPackageByPackageIds(List<Long> packageIdList){
-        QueryWrapper<QrPackage> qrPackageQueryWrapper = new QueryWrapper<>();
-        qrPackageQueryWrapper.in("id", packageIdList);
-        qrPackageQueryWrapper.eq("apply_status", QrPackageApplyStatusEnum.REVIEW_PASS.getCode());
-        qrPackageQueryWrapper.eq("is_delete", 0);
-        return qrPackageMapper.selectList(qrPackageQueryWrapper);
-    }
 
-    /**
-     * 批量插入 活动编辑申请码包关联子表
-     * @param activeId
-     * @param qrPackageIdAddList
-     */
-    private void batchInsertActiveModifyApplyPackageMappiing(Long applyId, Long activeId, List<Long> qrPackageIdAddList, List<Long> qrPackageIdDeleteList){
-        //添加和删除的去重
-        List<Long> distinctBatch = new ArrayList<>(qrPackageIdAddList);
-        distinctBatch.retainAll(qrPackageIdDeleteList);
-        qrPackageIdAddList.removeAll(distinctBatch);
-        qrPackageIdDeleteList.removeAll(distinctBatch);
-
-        List<BatchInsertActiveModifyApplyQrPackageColumnReq.PackageAndModifyType> batchInsertamaqpcrpam = new ArrayList<>();
-        Long loginUserId = userUtil.getUser().getId();
-        qrPackageIdAddList.forEach(qrPackageIdAdd -> {
-            BatchInsertActiveModifyApplyQrPackageColumnReq.PackageAndModifyType packageAndModifyType = new BatchInsertActiveModifyApplyQrPackageColumnReq.PackageAndModifyType();
-            packageAndModifyType.setQrPackageId(qrPackageIdAdd);
-            packageAndModifyType.setModifyType(ActiveModifyTypeEnum.ADD.getCode());
-            batchInsertamaqpcrpam.add(packageAndModifyType);
-        });
-
-        qrPackageIdDeleteList.forEach(qrPackageIdDelete -> {
-            BatchInsertActiveModifyApplyQrPackageColumnReq.PackageAndModifyType packageAndModifyType = new BatchInsertActiveModifyApplyQrPackageColumnReq.PackageAndModifyType();
-            packageAndModifyType.setQrPackageId(qrPackageIdDelete);
-            packageAndModifyType.setModifyType(ActiveModifyTypeEnum.DELETE.getCode());
-            batchInsertamaqpcrpam.add(packageAndModifyType);
-        });
-
-        //批量插入
-        BatchInsertActiveModifyApplyQrPackageColumnReq columnReq = new BatchInsertActiveModifyApplyQrPackageColumnReq();
-        columnReq.setApplyId(applyId);
-        columnReq.setActiveId(activeId);
-        columnReq.setCreateBy(loginUserId);
-        columnReq.setUpdateBy(loginUserId);
-        columnReq.setPackageAndModifyTypeList(batchInsertamaqpcrpam);
-        baseActiveModifyApplyQrPackageMappingMapper.batchInsert(columnReq);
-    }
+    //    6.03已废弃
+//    @Autowired
+//    private BaseActiveQrPackageMappingMapper baseActiveQrPackageMappingMapper;
+//
+//    @Autowired
+//    private BaseBrandMapper baseBrandMapper;
+//
+//    @Autowired
+//    private QrPackageMapper qrPackageMapper;
+//
+//    @Autowired
+//    private BaseActiveModifyApplyQrPackageMappingMapper baseActiveModifyApplyQrPackageMappingMapper;
+//
+
+//    @Override
+//    public ListActivePackageRes listActivePackage(GetActiveReq req) {
+//        //查询码活动关联的码包列表
+//        IPage<ActivePackageVO> activePackageVOIPage = qrPackageMapper.listPackageById(PageUtil.createPage(req), req.getId());
+//        List<ActivePackageVO> records = activePackageVOIPage.getRecords();
+//        ListActivePackageRes listActivePackageRes = new ListActivePackageRes();
+//        PageUtil.copyPageInfo(listActivePackageRes, activePackageVOIPage);
+//        List<ListActivePackageRes.PackageBean> packageBeans = PojoConverterUtils.copyList(records, ListActivePackageRes.PackageBean.class);
+//        listActivePackageRes.setPackageBeanList(packageBeans);
+//        return listActivePackageRes;
+//    }
+//
+//    @Override
+//    public ListActiveModifyApplyPackageRes listActiveModifyApplyPackage(GetActiveModifyApplyReq req) {
+//        //查询码活动关联的码包列表
+//        IPage<ActiveModifyApplyPackageVO> activeModifyApplyPackageVOIPage = qrPackageMapper.listPackageByActiveApplyId(PageUtil.createPage(req), req.getId());
+//        List<ActiveModifyApplyPackageVO> records = activeModifyApplyPackageVOIPage.getRecords();
+//        ListActiveModifyApplyPackageRes listActiveModifyApplyPackageRes = new ListActiveModifyApplyPackageRes();
+//        PageUtil.copyPageInfo(listActiveModifyApplyPackageRes, activeModifyApplyPackageVOIPage);
+//        List<ListActiveModifyApplyPackageRes.PackageBean> packageBeans = PojoConverterUtils.copyList(records, ListActiveModifyApplyPackageRes.PackageBean.class);
+//        listActiveModifyApplyPackageRes.setPackageBeanList(packageBeans);
+//        return listActiveModifyApplyPackageRes;
+//    }
+//
+//    @Override
+//    public ListActivePackageAddRes listActivePackageAdd(ListActivePackageAddReq req) {
+//        //查询码活动关联的码包列表
+//        IPage<PackageActiveSearchVO> packageActiveSearchVOIPage = qrPackageMapper.listPackageByBrandCode(PageUtil.createPage(req), req);
+//        List<PackageActiveSearchVO> records = packageActiveSearchVOIPage.getRecords();
+//        ListActivePackageAddRes listActivePackageAddRes = new ListActivePackageAddRes();
+//        PageUtil.copyPageInfo(listActivePackageAddRes, packageActiveSearchVOIPage);
+//        List<ListActivePackageAddRes.PackageBean> packageBeans = PojoConverterUtils.copyList(records, ListActivePackageAddRes.PackageBean.class);
+//        listActivePackageAddRes.setPackageBeanList(packageBeans);
+//        return listActivePackageAddRes;
+//    }
+//
+//    /**
+//     * 更新码活动和码包关联子表
+//     * @param activeId
+//     * @param qrPackageIdAddList
+//     */
+//    private void updateActivePackageMappiing(Long activeId, List<Long> qrPackageIdAddList, List<Long> qrPackageIdDeleteList){
+//        //添加和删除的去重
+//        List<Long> distinctBatch = new ArrayList<>(qrPackageIdAddList);
+//        distinctBatch.retainAll(qrPackageIdAddList);
+//        qrPackageIdAddList.removeAll(distinctBatch);
+//        qrPackageIdDeleteList.removeAll(distinctBatch);
+//
+//        Long loginUserId = userUtil.getUser().getId();
+//
+//        //批量删除
+//        if(CollectionUtil.isNotEmpty(qrPackageIdDeleteList)){
+//            UpdateWrapper<BaseActiveQrPackageMapping> aqpmQW = new UpdateWrapper<>();
+//            aqpmQW.set("is_delete", 1)
+//                    .set("update_by", loginUserId)
+//                    .eq("active_id", activeId)
+//                    .in("qr_package_id", qrPackageIdDeleteList);
+//            baseActiveQrPackageMappingMapper.update(null, aqpmQW);
+//        }
+//
+//        //批量添加
+//        if(CollectionUtil.isNotEmpty(qrPackageIdAddList)){
+//            List<QrPackage> qrPackages = searchReviewPassPackageByPackageIds(qrPackageIdAddList);
+//            List<Long> qrPackageIdsAdd = qrPackages.stream().map(QrPackage::getId).collect(Collectors.toList());
+//            if(CollectionUtil.isNotEmpty(qrPackageIdsAdd)) {
+//                baseActiveQrPackageMappingMapper.batchInsert(activeId, qrPackageIdsAdd, loginUserId);
+//            }
+//        }
+//    }
+//
+//    /**
+//     * 根据packgeId列表查询有效的且审核通过的码包列表
+//     * @param packageIdList
+//     * @return
+//     */
+//    private List<QrPackage> searchReviewPassPackageByPackageIds(List<Long> packageIdList){
+//        QueryWrapper<QrPackage> qrPackageQueryWrapper = new QueryWrapper<>();
+//        qrPackageQueryWrapper.in("id", packageIdList);
+//        qrPackageQueryWrapper.eq("apply_status", QrPackageApplyStatusEnum.REVIEW_PASS.getCode());
+//        qrPackageQueryWrapper.eq("is_delete", 0);
+//        return qrPackageMapper.selectList(qrPackageQueryWrapper);
+//    }
+//
+//    /**
+//     * 批量插入 活动编辑申请码包关联子表
+//     * @param activeId
+//     * @param qrPackageIdAddList
+//     */
+//    private void batchInsertActiveModifyApplyPackageMappiing(Long applyId, Long activeId, List<Long> qrPackageIdAddList, List<Long> qrPackageIdDeleteList){
+//        //添加和删除的去重
+//        List<Long> distinctBatch = new ArrayList<>(qrPackageIdAddList);
+//        distinctBatch.retainAll(qrPackageIdDeleteList);
+//        qrPackageIdAddList.removeAll(distinctBatch);
+//        qrPackageIdDeleteList.removeAll(distinctBatch);
+//
+//        List<BatchInsertActiveModifyApplyQrPackageColumnReq.PackageAndModifyType> batchInsertamaqpcrpam = new ArrayList<>();
+//        Long loginUserId = userUtil.getUser().getId();
+//        qrPackageIdAddList.forEach(qrPackageIdAdd -> {
+//            BatchInsertActiveModifyApplyQrPackageColumnReq.PackageAndModifyType packageAndModifyType = new BatchInsertActiveModifyApplyQrPackageColumnReq.PackageAndModifyType();
+//            packageAndModifyType.setQrPackageId(qrPackageIdAdd);
+//            packageAndModifyType.setModifyType(ActiveModifyTypeEnum.ADD.getCode());
+//            batchInsertamaqpcrpam.add(packageAndModifyType);
+//        });
+//
+//        qrPackageIdDeleteList.forEach(qrPackageIdDelete -> {
+//            BatchInsertActiveModifyApplyQrPackageColumnReq.PackageAndModifyType packageAndModifyType = new BatchInsertActiveModifyApplyQrPackageColumnReq.PackageAndModifyType();
+//            packageAndModifyType.setQrPackageId(qrPackageIdDelete);
+//            packageAndModifyType.setModifyType(ActiveModifyTypeEnum.DELETE.getCode());
+//            batchInsertamaqpcrpam.add(packageAndModifyType);
+//        });
+//
+//        //批量插入
+//        BatchInsertActiveModifyApplyQrPackageColumnReq columnReq = new BatchInsertActiveModifyApplyQrPackageColumnReq();
+//        columnReq.setApplyId(applyId);
+//        columnReq.setActiveId(activeId);
+//        columnReq.setCreateBy(loginUserId);
+//        columnReq.setUpdateBy(loginUserId);
+//        columnReq.setPackageAndModifyTypeList(batchInsertamaqpcrpam);
+//        baseActiveModifyApplyQrPackageMappingMapper.batchInsert(columnReq);
+//    }
 
 }

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/QrPackageMapper.xml

@@ -175,66 +175,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE qp.id = #{id}
     </select>
 
-    <!--通过码活动id查询关联码包列表-->
-    <select id="listPackageById" resultType="com.abi.qms.platform.dao.vo.result.ActivePackageVO">
-        select
-        qp.id as packageId,
-        qp.qr_type,
-        bs.sku_name,
-        bb.brand_name,
-        bb.parent_brand_name,
-        qp.qr_number
-        from qr_package qp
-        inner join base_material bm on bm.id=qp.material_id
-        inner join base_sku bs on bs.id=bm.sku_id
-        inner join base_brand bb on bb.brand_code=bs.sub_brand_code
-        left join base_active_qr_package_mapping baqpm on baqpm.qr_package_id=qp.id
-        left join base_active ba on ba.id = baqpm.active_id
-        where ba.id = #{id}
-    </select>
-
-
-    <!--通过品牌code查询关联码包列表-->
-    <select id="listPackageByBrandCode" resultType="com.abi.qms.platform.dao.vo.result.PackageActiveSearchVO">
-        select
-        qp.id as packageId,
-        qp.qr_type,
-        bs.sku_name,
-        bb.brand_name,
-        bb.parent_brand_name,
-        qp.qr_number,
-        ba.active_name,
-        (CASE WHEN ba.active_name IS NULL THEN '0' ELSE '1' END) AS is_join_active
-        from qr_package qp
-        inner join base_material bm on bm.id=qp.material_id
-        inner join base_sku bs on bs.id=bm.sku_id
-        inner join base_brand bb on bb.brand_code=bs.sub_brand_code
-        left join base_active_qr_package_mapping baqpm on baqpm.qr_package_id=qp.id
-        left join base_active ba on ba.id = baqpm.active_id
-        where
-        bb.brand_code IN(
-        <foreach collection="param.brandCodeList" separator="," item="item">
-            #{item}
-        </foreach>
-        )
-        and qp.apply_status = 1
-        <if test="param.activeId != null">
-            AND ba.id is null or ba.id != #{param.activeId}
-        </if>
-        <if test="param.packageId != null">
-            AND qp.id = {param.packageId}
-        </if>
-        <if test="param.skuName != null and param.skuName != ''">
-            AND bs.sku_name like concat('%',#{param.skuName},'%')
-        </if>
-        <if test="param.qrType != null">
-            AND qp.qr_type = #{param.qrType}
-        </if>
-        and qp.qr_type = 2
-        and bb.is_delete = 0
-        order by qp.generate_time desc
-    </select>
-
     <select id="getQrSingleCheckDetailById" resultType="com.abi.qms.platform.dao.vo.result.QrSingleCheckVO">
         SELECT
         qp.id,
@@ -256,24 +196,85 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <!--通过码活动id查询关联码包列表-->
-    <select id="listPackageByActiveApplyId" resultType="com.abi.qms.platform.dao.vo.result.ActiveModifyApplyPackageVO">
-        select
-        qp.id as packageId,
-        qp.qr_type,
-        bs.sku_name,
-        bb.brand_name,
-        bb.parent_brand_name,
-        qp.qr_number,
-        IFNULL(bamaqpm.modify_type, 3) modify_type
-        from qr_package qp
-        inner join base_material bm on bm.id=qp.material_id
-        inner join base_sku bs on bs.id=bm.sku_id
-        inner join base_brand bb on bb.brand_code=bs.sub_brand_code
-		left join base_active_qr_package_mapping baqpm on baqpm.qr_package_id=qp.id
-        left join base_active ba on ba.id = baqpm.active_id
-		left join base_active_modify_apply bama on bama.active_id = ba.id and bama.is_delete = 0
-        left join base_active_modify_apply_qr_package_mapping bamaqpm on bamaqpm.apply_id=bama.id and bamaqpm.qr_package_id = qp.id and bamaqpm.is_delete = 0
-        where ba.id = #{activeId}
-        ORDER BY modify_type ASC
+    <select id="listPackageById" resultType="com.abi.qms.platform.dao.vo.result.ActivePackageVO">
+    select
+    qp.id as packageId,
+    qp.qr_type,
+    bs.sku_name,
+    bb.brand_name,
+    bb.parent_brand_name,
+    qp.qr_number
+    from qr_package qp
+    inner join base_material bm on bm.id=qp.material_id
+    inner join base_sku bs on bs.id=bm.sku_id
+    inner join base_brand bb on bb.brand_code=bs.sub_brand_code
+    left join base_active_qr_package_mapping baqpm on baqpm.qr_package_id=qp.id
+    left join base_active ba on ba.id = baqpm.active_id
+    where ba.id = #{id}
     </select>
+
+
+    <!--6.03已废弃-->
+    <!--&lt;!&ndash;通过品牌code查询关联码包列表&ndash;&gt;-->
+    <!--<select id="listPackageByBrandCode" resultType="com.abi.qms.platform.dao.vo.result.PackageActiveSearchVO">-->
+        <!--select-->
+        <!--qp.id as packageId,-->
+        <!--qp.qr_type,-->
+        <!--bs.sku_name,-->
+        <!--bb.brand_name,-->
+        <!--bb.parent_brand_name,-->
+        <!--qp.qr_number,-->
+        <!--ba.active_name,-->
+        <!--(CASE WHEN ba.active_name IS NULL THEN '0' ELSE '1' END) AS is_join_active-->
+        <!--from qr_package qp-->
+        <!--inner join base_material bm on bm.id=qp.material_id-->
+        <!--inner join base_sku bs on bs.id=bm.sku_id-->
+        <!--inner join base_brand bb on bb.brand_code=bs.sub_brand_code-->
+        <!--left join base_active_qr_package_mapping baqpm on baqpm.qr_package_id=qp.id-->
+        <!--left join base_active ba on ba.id = baqpm.active_id-->
+        <!--where-->
+        <!--bb.brand_code IN(-->
+        <!--<foreach collection="param.brandCodeList" separator="," item="item">-->
+            <!--#{item}-->
+        <!--</foreach>-->
+        <!--)-->
+        <!--and qp.apply_status = 1-->
+        <!--<if test="param.activeId != null">-->
+            <!--AND ba.id is null or ba.id != #{param.activeId}-->
+        <!--</if>-->
+        <!--<if test="param.packageId != null">-->
+            <!--AND qp.id = {param.packageId}-->
+        <!--</if>-->
+        <!--<if test="param.skuName != null and param.skuName != ''">-->
+            <!--AND bs.sku_name like concat('%',#{param.skuName},'%')-->
+        <!--</if>-->
+        <!--<if test="param.qrType != null">-->
+            <!--AND qp.qr_type = #{param.qrType}-->
+        <!--</if>-->
+        <!--and qp.qr_type = 2-->
+        <!--and bb.is_delete = 0-->
+        <!--order by qp.generate_time desc-->
+    <!--</select>-->
+
+    <!--&lt;!&ndash;通过码活动id查询关联码包列表&ndash;&gt;-->
+    <!--<select id="listPackageByActiveApplyId" resultType="com.abi.qms.platform.dao.vo.result.ActiveModifyApplyPackageVO">-->
+        <!--select-->
+        <!--qp.id as packageId,-->
+        <!--qp.qr_type,-->
+        <!--bs.sku_name,-->
+        <!--bb.brand_name,-->
+        <!--bb.parent_brand_name,-->
+        <!--qp.qr_number,-->
+        <!--IFNULL(bamaqpm.modify_type, 3) modify_type-->
+        <!--from qr_package qp-->
+        <!--inner join base_material bm on bm.id=qp.material_id-->
+        <!--inner join base_sku bs on bs.id=bm.sku_id-->
+        <!--inner join base_brand bb on bb.brand_code=bs.sub_brand_code-->
+		<!--left join base_active_qr_package_mapping baqpm on baqpm.qr_package_id=qp.id-->
+        <!--left join base_active ba on ba.id = baqpm.active_id-->
+		<!--left join base_active_modify_apply bama on bama.active_id = ba.id and bama.is_delete = 0-->
+        <!--left join base_active_modify_apply_qr_package_mapping bamaqpm on bamaqpm.apply_id=bama.id and bamaqpm.qr_package_id = qp.id and bamaqpm.is_delete = 0-->
+        <!--where ba.id = #{activeId}-->
+        <!--ORDER BY modify_type ASC-->
+    <!--</select>-->
 </mapper>