fix: 接单审核校验

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmScorePackageStatusController.java

@@ -20,6 +20,7 @@ import com.qunzhixinxi.hnqz.common.core.util.R;
 import com.qunzhixinxi.hnqz.common.log.annotation.SysLog;
 import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDateTime;
@@ -36,6 +37,7 @@ import java.util.stream.Collectors;
  *
  * @date 2020-07-17 23:32:01
  */
+@Slf4j
 @RestController
 @AllArgsConstructor
 @RequestMapping("/wmscorepackagestatus")
@@ -162,14 +164,18 @@ public class WmScorePackageStatusController {
 	 * @param wmScorePackageStatus
 	 * @return
 	 */
+	@SysLog("接单审核")
 	@PostMapping("/approvalStatus")
 	public R approvalStatus(@RequestBody WmScorePackageStatus wmScorePackageStatus) {
+		log.info("接单审核参数:{}", wmScorePackageStatus);
+
 		if (wmScorePackageStatus.getId() == null) {
 			return R.failed("缺少参数ID");
 		}
 		if (StringUtil.isEmpty(wmScorePackageStatus.getStatus())) {
 			return R.failed("缺少参数:审批意见");
 		}
+
 		return wmScorePackageStatusService.approvalStatus(wmScorePackageStatus);
 	}
 
@@ -178,14 +184,18 @@ public class WmScorePackageStatusController {
 	 *
 	 * @param statusBatch 批量审批信息
 	 */
+	@SysLog("批量接单审核")
 	@PutMapping("/approvalStatus/batch")
 	public R approvalStatusBatch(@RequestBody WmScorePackageStatusBatch statusBatch) {
+		log.info("批量接单审核参数:{}", statusBatch);
+
 		if (StrUtil.isEmpty(statusBatch.getBatchIds())) {
 			return R.failed("缺少参数ID");
 		}
 		if (statusBatch.getStatus() == null) {
 			return R.failed("缺少参数:审批意见");
 		}
+
 		return R.ok(wmScorePackageStatusService.approvalStatusBatch(statusBatch));
 	}
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmScorePackageStatusServiceImpl.java

@@ -23,6 +23,7 @@ import com.qunzhixinxi.hnqz.admin.mapper.WmScorePackageStatusMapper;
 import com.qunzhixinxi.hnqz.admin.mapper.WmTaskMapper;
 import com.qunzhixinxi.hnqz.admin.service.WmScorePackageStatusService;
 import com.qunzhixinxi.hnqz.common.core.constant.CommonConstants;
+import com.qunzhixinxi.hnqz.common.core.exception.BizException;
 import com.qunzhixinxi.hnqz.common.core.util.R;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -65,6 +66,10 @@ public class WmScorePackageStatusServiceImpl extends ServiceImpl<WmScorePackageS
 		wmScorePackageStatus.setPackageId(packageStatus1.getPackageId());
 		//审批
 		WmScorePackage wmScorePackage=wmScorePackageMapper.selectById(wmScorePackageStatus.getPackageId());
+		if (!StrUtil.equals(wmScorePackage.getScorePackageStatus(), ScorePackageStatusEnum.PENDING_APPROVAL.val())) {
+			return R.failed("积分包状态不是已申领待审批");
+		}
+
 		if(wmScorePackage.getPackageType1().equals(PackageTypeEnum.TYPE1_SCOTE_PACKAGE.val())) {
 			//定额包一人一包，所以score=userscore
 			wmScorePackageStatus.setUserScore(String.valueOf(wmScorePackage.getScore()));
@@ -519,7 +524,9 @@ public class WmScorePackageStatusServiceImpl extends ServiceImpl<WmScorePackageS
 
 		// 获取积分包
 		WmScorePackage wmScorePackage = wmScorePackageMapper.selectById(status.getPackageId());
-
+		if (!StrUtil.equals(wmScorePackage.getScorePackageStatus(), ScorePackageStatusEnum.PENDING_APPROVAL.val())) {
+			throw new BizException("积分包状态不是已申领待审批");
+		}
 
 		log.warn("开始审批,id:[{}], packageId:[{}]", status, wmScorePackage.getId());
 		//定额