审核不通过的时候将样书券返回给用户

com.zrqx.bg.member/src/main/java/com/zrqx/bg/member/controller/samplebookapply/SampleBookApplyController.java

@@ -97,23 +97,7 @@ public class SampleBookApplyController {
 	@ApiOperation(value = "批量审核", notes = "批量审核")
 	@PostMapping(value = MemberRequestPath.BATCH_UPDATE_STATUS)
 	public CallBack<Boolean> batchUpdateStatus(@RequestBody UpdateSampleBookApplyStatusForm form){
-		if (form.getIds() == null || form.getIds().isEmpty()) {
-			CallBack.success(true);
-		}
-		form.getIds().forEach(id -> {
-			SampleBookApply ac = sampleBookApplyService.notNull(id);
-			ac.setApplyStatus(form.getApplyStatus());
-			ac.setExamineFail(form.getText());
-			sampleBookApplyService.updateByPrimaryKeySelective(ac);
-			//若通过则扣掉相应的样书券数量
-			if(SampleBookApplyApplyStatusEnum.SUCCESS_REVIEW.getCode().equals(form.getApplyStatus())){
-				//验证样书券数量是否满足
-				sampleBookService.checkNum(1,ac.getMemberId());
-				//若申请，则减去对应数量的用户样书券
-				sampleBookService.reduce(1,ac.getMemberId());
-			}
-		});
-		return  CallBack.success();
+		return  CallBack.success(sampleBookApplyService.batchUpdateStatus(form));
 	}
 	
 	
@@ -134,18 +118,7 @@ public class SampleBookApplyController {
 	@ApiOperation(value = "审核通过|不通过原因", notes = "审核通过|不通过原因")
 	@PostMapping(value = MemberRequestPath.SAVE_TEXT)
 	public CallBack<Boolean> batchUpdateStatus(@RequestBody SaveApplyFailForm form){
-		SampleBookApply entity = sampleBookApplyService.selectByPrimaryKey(Integer.valueOf(form.getId()));
-		entity.setExamineFail(form.getText());
-		entity.setApplyStatus(form.getStatus());
-		//若通过则扣掉相应的样书券数量
-		if(SampleBookApplyApplyStatusEnum.SUCCESS_REVIEW.getCode().equals(form.getStatus())){
-			//验证样书券数量是否满足
-			sampleBookService.checkNum(1,entity.getMemberId());
-			//若申请，则减去对应数量的用户样书券
-			sampleBookService.reduce(1,entity.getMemberId());
-		}
-
-		return CallBack.success(sampleBookApplyService.updateByPrimaryKey(entity));
+		return CallBack.success(sampleBookApplyService.batchUpdateStatus(form));
 	}
 	
 	@ApiOperation(value = "导出样书券申请单")

com.zrqx.bg.member/src/main/java/com/zrqx/bg/member/service/samplebookapply/SampleBookApplyService.java

@@ -3,6 +3,8 @@ package com.zrqx.bg.member.service.samplebookapply;
 import java.util.List;
 
 import com.zrqx.core.form.member.bg.member.samplebookapply.QuerySampleBookApplyForm;
+import com.zrqx.core.form.member.bg.member.samplebookapply.SaveApplyFailForm;
+import com.zrqx.core.form.member.bg.member.samplebookapply.UpdateSampleBookApplyStatusForm;
 import com.zrqx.core.form.member.bg.member.samplebookvoucher.QuerySampleBookVoucherForm;
 import com.zrqx.core.model.member.samplebookapply.SampleBookApply;
 import com.zrqx.core.service.BaseService;
@@ -10,6 +12,7 @@ import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.vo.member.samplebookapply.SampleBookApplyVo;
 import com.zrqx.core.vo.member.samplebookvoucher.SampleBookVoucherVo;
+import org.springframework.web.bind.annotation.RequestBody;
 
 public interface SampleBookApplyService extends BaseService<SampleBookApply,Integer>{
 
@@ -52,4 +55,24 @@ public interface SampleBookApplyService extends BaseService<SampleBookApply,Inte
 	 * @date: 2019年5月24日 下午1:58:29
 	 */
 	List<SampleBookApplyVo> listExport(PageParam pageParam, QuerySampleBookApplyForm form);
+
+	/**
+	 * 功能描述: <br>
+	 * 〈〉批量审核
+	 * @Param: [form]
+	 * @Return: boolean
+	 * @Author: zzg
+	 * @Date: 2020/8/3 11:30
+	 */
+	boolean batchUpdateStatus(@RequestBody UpdateSampleBookApplyStatusForm form);
+
+	/**
+	 * 功能描述: <br>
+	 * 〈〉审核通过|不通过原因
+	 * @Param: [form]
+	 * @Return: boolean
+	 * @Author: zzg
+	 * @Date: 2020/8/3 11:30
+	 */
+	boolean batchUpdateStatus(@RequestBody SaveApplyFailForm form);
 }

com.zrqx.bg.member/src/main/java/com/zrqx/bg/member/service/samplebookapply/SampleBookApplyServiceImpl.java

 package com.zrqx.bg.member.service.samplebookapply;
 
 import java.util.List;
+
+import com.zrqx.bg.member.service.samplebookvoucher.SampleBookService;
+import com.zrqx.core.enums.member.samplebookapply.SampleBookApplyApplyStatusEnum;
+import com.zrqx.core.form.member.bg.member.samplebookapply.SaveApplyFailForm;
+import com.zrqx.core.form.member.bg.member.samplebookapply.UpdateSampleBookApplyStatusForm;
+import com.zrqx.core.util.response.CallBack;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -38,6 +44,9 @@ public class SampleBookApplyServiceImpl extends BaseModelServiceImpl<SampleBookA
 	private DepartmentMapper departmentMapper;
 	@Autowired
 	private SchoolMapper schoolMapper;
+
+	@Autowired
+	private SampleBookService sampleBookService;
 	
 	
 	@Override
@@ -110,5 +119,41 @@ public class SampleBookApplyServiceImpl extends BaseModelServiceImpl<SampleBookA
 		return this.list(pageParam, form, false);
 	}
 
-	
+
+	@Override
+	public boolean batchUpdateStatus(UpdateSampleBookApplyStatusForm form) {
+		if (form.getIds() == null || form.getIds().isEmpty()) {
+			CallBack.success(true);
+		}
+		form.getIds().forEach(id -> {
+			SampleBookApply ac = this.notNull(id);
+			ac.setApplyStatus(form.getApplyStatus());
+			ac.setExamineFail(form.getText());
+			sampleBookApplyMapper.updateByPrimaryKeySelective(ac);
+			//若通过则扣掉相应的样书券数量
+			if(SampleBookApplyApplyStatusEnum.SUCCESS_REVIEW.getCode().equals(form.getApplyStatus())){
+				//验证样书券数量是否满足
+				sampleBookService.checkNum(1,ac.getMemberId());
+				//若申请，则减去对应数量的用户样书券
+				sampleBookService.reduce(1,ac.getMemberId());
+			}
+		});
+		return true;
+	}
+
+	@Override
+	public boolean batchUpdateStatus(SaveApplyFailForm form) {
+		SampleBookApply entity = this.selectByPrimaryKey(Integer.valueOf(form.getId()));
+		entity.setExamineFail(form.getText());
+		entity.setApplyStatus(form.getStatus());
+		//若通过则扣掉相应的样书券数量
+		if(SampleBookApplyApplyStatusEnum.SUCCESS_REVIEW.getCode().equals(form.getStatus())){
+			//验证样书券数量是否满足
+			sampleBookService.checkNum(1,entity.getMemberId());
+			//若申请，则减去对应数量的用户样书券
+			sampleBookService.reduce(1,entity.getMemberId());
+		}
+
+		return this.updateByPrimaryKey(entity);
+	}
 }