添加 审核通过活动申请单 的接口

添加 审核驳回活动申请单 的接口

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

@@ -141,6 +141,20 @@ public class ActiveController {
         return BaseResponse.create();
     }
 
+    @ApiOperation("审核通过活动申请单")
+    @PostMapping("/passActiveModifyApply")
+    public BaseResponse passActiveModifyApply(@Validated @RequestBody PassActiveModifyApplyReq req) {
+        activeService.passActiveModifyApply(req);
+        return BaseResponse.create();
+    }
+
+    @ApiOperation("审核驳回活动申请单")
+    @PostMapping("/refuseActiveModifyApply")
+    public BaseResponse refuseActiveModifyApply(@Validated @RequestBody RefuseActiveModifyApplyReq req) {
+        activeService.refuseActiveModifyApply(req);
+        return BaseResponse.create();
+    }
+
 }
 
 

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

@@ -0,0 +1,26 @@
+package com.abi.qms.platform.dto.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @author Eurus
+ * @date 2021/6/1 11:49
+ * @Description: 审核通过活动申请单 入参
+ */
+@Data
+@ApiModel
+public class PassActiveModifyApplyReq implements Serializable {
+
+    @NotNull(message = "码活动id为空")
+    @ApiModelProperty(value = "码活动id")
+    private Long activeId;
+
+    @NotNull(message = "申请单id为空")
+    @ApiModelProperty(value = "申请单id")
+    private Long applyId;
+}

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

@@ -0,0 +1,26 @@
+package com.abi.qms.platform.dto.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @author Eurus
+ * @date 2021/6/1 11:51
+ * @Description:
+ */
+@Data
+@ApiModel
+public class RefuseActiveModifyApplyReq implements Serializable {
+
+    @NotNull(message = "码活动id为空")
+    @ApiModelProperty(value = "码活动id")
+    private Long activeId;
+
+    @NotNull(message = "申请单id为空")
+    @ApiModelProperty(value = "申请单id")
+    private Long applyId;
+}

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

@@ -97,4 +97,15 @@ public interface ActiveService{
      */
     void refuseActive(RefuseActiveReq req);
 
+    /**
+     * 审核通过活动申请单
+     */
+    void passActiveModifyApply(PassActiveModifyApplyReq req);
+
+    /**
+     * 审核驳回活动申请单
+     */
+    void refuseActiveModifyApply(RefuseActiveModifyApplyReq req);
+
+
 }

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

@@ -116,7 +116,7 @@ public class ActiveServiceImpl implements ActiveService {
         AssertUtil.isNull(active,"活动不存在");
 
         if(ActiveAuditStatusEnum.REVIEW_PASS.is(active.getAuditStatus())){
-            throw new BusinessException("该数据已审核通过，请调用重新提交审核的接口。");
+            throw new BusinessException("该数据已审核通过，请调用码活动申请单的接口。");
         }
 
         //2-修改活动
@@ -147,8 +147,8 @@ public class ActiveServiceImpl implements ActiveService {
         BaseActive active = baseActiveMapper.selectById(req.getActiveId());
         AssertUtil.isNull(active,"活动不存在");
 
-        if(ActiveAuditStatusEnum.REVIEW_PASS.is(active.getAuditStatus())){
-            throw new BusinessException("该数据已审核通过，请调用重新提交审核的接口。");
+        if(!ActiveAuditStatusEnum.REVIEW_PASS.is(active.getAuditStatus())){
+            throw new BusinessException("该数据没有审核通过，请调用编辑码活动的接口。");
         }
 
         //删除原有申请单数据
@@ -404,6 +404,102 @@ public class ActiveServiceImpl implements ActiveService {
 
     }
 
+    @Override
+    public void passActiveModifyApply(PassActiveModifyApplyReq req) {
+
+        //1-查询活动
+        BaseActive active = baseActiveMapper.selectById(req.getActiveId());
+        AssertUtil.isNull(active,"活动不存在");
+
+        if(!ActiveAuditStatusEnum.REVIEW_PASS.is(active.getAuditStatus())){
+            throw new BusinessException("该数据没有审核通过，请调用审核码活动的接口。");
+        }
+        //查询码活动申请单
+        BaseActiveModifyApply activeModifyApply = baseActiveModifyApplyMapper.selectById(req.getApplyId());
+        AssertUtil.isNull(activeModifyApply,"码活动申请单不存在");
+        if(ActiveAuditStatusEnum.WAIT_REVIEW.is(activeModifyApply.getAuditStatus())){
+            throw new BusinessException("该码活动申请单不能审核");
+        }
+
+        //审核通过码活动申请单
+        Long userId = userUtil.getUser().getId();
+        activeModifyApply.setAuditStatus(ActiveAuditStatusEnum.REVIEW_PASS.getCode());
+        activeModifyApply.setAuditUserId(userId);
+        activeModifyApply.setAuditUserName(userUtil.getUser().getUserName());
+        activeModifyApply.setUpdateBy(userId);
+        baseActiveModifyApplyMapper.updateById(activeModifyApply);
+
+        //修改码活动
+        active.setActiveName(activeModifyApply.getActiveName());
+        active.setActiveType(activeModifyApply.getActiveType());
+        active.setBeginTime(activeModifyApply.getBeginTime());
+        active.setEndTime(activeModifyApply.getEndTime());
+        active.setBrandCode(activeModifyApply.getBrandCode());
+        active.setActiveUrl(activeModifyApply.getActiveUrl());
+        active.setAuditUserId(userId);
+        active.setAuditUserName(userUtil.getUser().getUserName());
+        active.setUpdateBy(userId);
+        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);
+        }
+
+
+    }
+
+    @Override
+    public void refuseActiveModifyApply(RefuseActiveModifyApplyReq req) {
+        //1-查询活动
+        BaseActive active = baseActiveMapper.selectById(req.getActiveId());
+        AssertUtil.isNull(active,"活动不存在");
+
+        if(!ActiveAuditStatusEnum.REVIEW_PASS.is(active.getAuditStatus())){
+            throw new BusinessException("该数据没有审核通过，请调用审核码活动的接口。");
+        }
+        //查询码活动申请单
+        BaseActiveModifyApply activeModifyApply = baseActiveModifyApplyMapper.selectById(req.getApplyId());
+        AssertUtil.isNull(activeModifyApply,"码活动申请单不存在");
+        if(ActiveAuditStatusEnum.WAIT_REVIEW.is(activeModifyApply.getAuditStatus())){
+            throw new BusinessException("该码活动申请单不能审核");
+        }
+
+        //审核拒绝码活动申请单
+        Long userId = userUtil.getUser().getId();
+        activeModifyApply.setAuditStatus(ActiveAuditStatusEnum.REVIEW_REFUSE.getCode());
+        activeModifyApply.setAuditUserId(userId);
+        activeModifyApply.setAuditUserName(userUtil.getUser().getUserName());
+        activeModifyApply.setUpdateBy(userId);
+        baseActiveModifyApplyMapper.updateById(activeModifyApply);
+    }
+
 
     /**
      * 更新码活动和码包关联子表