zoujiajian 1 tydzień temu
rodzic
commit
3e759c8d3e

+ 4 - 3
netflix-service/src/main/java/com/cyksj/service/market/impl/MarketFrontServiceImpl.java

@@ -327,7 +327,7 @@ public class MarketFrontServiceImpl implements MarketFrontService {
 				.eq(TaskFollowPlatVerify::getUserId, userId)) > 0) {
 			throw BusinessRuntimeException.getInstance("请勿重复提交关注任务");
 		}
-		String imgUrl = thirdPartyFileUploadService.uploadImage(file);
+		String imgUrl = file == null || file.isEmpty() ? null : thirdPartyFileUploadService.uploadImage(file);
 		TaskFollowPlatVerify taskFollowPlatVerify = new TaskFollowPlatVerify();
 		taskFollowPlatVerify.setTaskId(taskId);
 		taskFollowPlatVerify.setUserId(userId);
@@ -366,10 +366,11 @@ public class MarketFrontServiceImpl implements MarketFrontService {
 		if (!taskFollowReq.getTaskId().equals(dbTaskFollowPlatVerify.getTaskId())) {
 			throw BusinessRuntimeException.getInstance("任务与提交记录不匹配");
 		}
-		String imgUrl = thirdPartyFileUploadService.uploadImage(file);
 		dbTaskFollowPlatVerify.setPlatNickname(taskFollowReq.getPlatNickname());
 		dbTaskFollowPlatVerify.setStatus(TaskFollowPlatVerify.Status.verifying);
-		dbTaskFollowPlatVerify.setImg(imgUrl);
+		if (file != null && !file.isEmpty()) {
+			dbTaskFollowPlatVerify.setImg(thirdPartyFileUploadService.uploadImage(file));
+		}
 		taskFollowPlatVerifyMapper.updateById(dbTaskFollowPlatVerify);
 
 		TaskUserCompleteRecord record = taskUserCompleteRecordMapper.selectOne(Wrappers.lambdaQuery(TaskUserCompleteRecord.class)

+ 2 - 2
netflix-web/src/main/java/com/cyksj/web/controller/market/TaskFrontController.java

@@ -180,7 +180,7 @@ public class TaskFrontController {
 	@PostMapping(value = "/post/follow", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
 	@NoSubmit
 	public Result<String> toCompleteFollowTask(@ModelAttribute @Validated TaskFollowReq taskFollowReq,
-			@RequestParam("file") MultipartFile file) {
+			@RequestParam(value = "file", required = false) MultipartFile file) {
 		Long userId = StpUserUtil.getLoginIdAsLong();
 		taskFollowReq.setUserId(userId);
 		marketFrontService.toCompleteFollowTask(taskFollowReq, file);
@@ -204,7 +204,7 @@ public class TaskFrontController {
 	@PutMapping(value = "/put/follow", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
 	@NoSubmit
 	public Result<String> updateFailFollowTask(@ModelAttribute @Validated TaskFollowReq taskFollowReq,
-			@RequestParam("file") MultipartFile file) {
+			@RequestParam(value = "file", required = false) MultipartFile file) {
 		Long userId = StpUserUtil.getLoginIdAsLong();
 		taskFollowReq.setUserId(userId);
 		marketFrontService.updateFailFollowTask(taskFollowReq, file);