--no commit message

com.zrqx.fg.member/src/main/java/com/zrqx/bg/member/controller/samplebookapply/FgBookFeedBackController.java

@@ -7,9 +7,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.zrqx.bg.member.service.samplebookapply.FgBookFeedBackService;
+import com.zrqx.bg.member.service.samplebookapply.FgSampleBookApplyService;
 import com.zrqx.core.constant.member.MemberRequestPath;
+import com.zrqx.core.enums.BooleanStatusEnum;
 import com.zrqx.core.enums.member.samplebookapply.SampleBookApplyApplyStatusEnum;
+import com.zrqx.core.form.member.fg.samplebookapply.FgConfirmForm;
 import com.zrqx.core.model.member.samplebookapply.BookFeedBack;
+import com.zrqx.core.model.member.samplebookapply.SampleBookApply;
 import com.zrqx.core.util.response.CallBack;
 
 import io.swagger.annotations.Api;
@@ -30,12 +34,4 @@ public class FgBookFeedBackController {
 		model.setStatus(SampleBookApplyApplyStatusEnum.ALREADY_FEEDBACK.getCode());
 		return fgBookFeedBackService.insertSelective(model)?CallBack.success(true):CallBack.fail();
 	}
-	
-	@ApiOperation( value = "待收货反馈", notes="待收货反馈")
-	@PostMapping(value = MemberRequestPath.SAMPLE_BOOK_WAIT_FEEDBACK_STATUS)
-	public CallBack<Boolean> waitFeedback(@RequestBody BookFeedBack model){
-		model.setStatus(SampleBookApplyApplyStatusEnum.RECEIVED_GOODS.getCode());
-		return fgBookFeedBackService.insertSelective(model)?CallBack.success(true):CallBack.fail();
-	}
-	
 }

com.zrqx.fg.member/src/main/java/com/zrqx/bg/member/controller/samplebookapply/FgSampleBookApplyController.java

@@ -11,10 +11,12 @@ import org.springframework.web.bind.annotation.RestController;
 import com.zrqx.bg.member.service.samplebookapply.FgSampleBookApplyService;
 import com.zrqx.core.commons.redis.FgRedisManage;
 import com.zrqx.core.constant.member.MemberRequestPath;
+import com.zrqx.core.enums.BooleanStatusEnum;
 import com.zrqx.core.enums.member.samplebookapply.SampleBookApplyApplyStatusEnum;
 import com.zrqx.core.form.member.bg.member.samplebookapply.QuerySampleBookApplyForm;
 import com.zrqx.core.form.member.bg.member.samplebookapply.UpdateApplyStatus;
 import com.zrqx.core.form.member.bg.member.samplebookapply.UpdateSampleBookApplyStatusForm;
+import com.zrqx.core.form.member.fg.samplebookapply.FgConfirmForm;
 import com.zrqx.core.model.member.departmentmember.DepartmentMember;
 import com.zrqx.core.model.member.member.Member;
 import com.zrqx.core.model.member.samplebookapply.SampleBookApply;
@@ -82,7 +84,7 @@ public class FgSampleBookApplyController {
 	}
 	
 	
-	/*@ApiOperation(value = "设置发货", notes = "设置发货")
+	@ApiOperation(value = "设置发货", notes = "设置发货")
 	@PostMapping(value = MemberRequestPath.BATCH_UPDATE_SEND_BOOK)
 	public CallBack<Boolean> batchUpdateStatus(@RequestBody UpdateApplyStatus form){
 		Example example = fgSampleBookApplyService.createExample();
@@ -93,7 +95,7 @@ public class FgSampleBookApplyController {
 		entity.setExpressType(form.getExpressType());
 		entity.setExpressNumber(form.getExpressNumber());
 		return CallBack.success(fgSampleBookApplyService.UpdateByExampleSelective(entity,example));
-	}*/
+	}
 	
 	@ApiOperation( value = "样书申请列表", notes = "样书申请列表")
 	@GetMapping(value = MemberRequestPath.LIST)
@@ -104,6 +106,19 @@ public class FgSampleBookApplyController {
 		return CallBack.success(fgSampleBookApplyService.queryExample(pageParam,example));
 	}
 	
+	@ApiOperation( value = "确认收货", notes="确认收货")
+	@PostMapping(value = MemberRequestPath.SAMPLE_BOOK_WAIT_FEEDBACK_STATUS)
+	public CallBack<Boolean> waitFeedback(@RequestBody FgConfirmForm form){
+		SampleBookApply model =  fgSampleBookApplyService.selectByPrimaryKey(form.getId());
+		if(model != null){
+			if(form.getStatus().equals(BooleanStatusEnum.YES.getCode())){
+				model.setApplyStatus(SampleBookApplyApplyStatusEnum.RECEIVED_GOODS.getCode());
+			}else{
+				model.setApplyStatus(SampleBookApplyApplyStatusEnum.WAIT_FEEDBACK.getCode());
+			}
 			
+		}
+		return fgSampleBookApplyService.insertSelective(model)?CallBack.success(true):CallBack.fail();
+	}
 	
 }