Merge branch 'dev-meta' of xiongzhu/raex_back into master

src/main/java/com/izouma/nineth/domain/MetaTaskToUser.java

@@ -45,6 +45,9 @@ public class MetaTaskToUser extends BaseEntity{
     @Column(columnDefinition = "TEXT")
     private String detail;
 
+    @ApiModelProperty("奖励图片")
+    private String awardPic;
+
     @ApiModelProperty("当前状态")
     @Enumerated(EnumType.STRING)
     private MetaTaskStatus status;

src/main/java/com/izouma/nineth/service/MetaTaskToUserService.java

@@ -66,11 +66,17 @@ public class MetaTaskToUserService {
         if (Objects.isNull(metaTask.getType())) {
             return MetaRestResult.returnError(String.format("任务[%S]缺少任务类型", metaTaskToUser.getTaskId()));
         }
+        if (Objects.isNull(metaTask.getDetail())) {
+            return MetaRestResult.returnError(String.format("任务[%S]缺少任务详情", metaTaskToUser.getTaskId()));
+        }
         // 判断当前玩家是否领取过任务
         MetaTaskToUser dbMetaTaskToUser = metaTaskToUserRepo.findByUserIdAndTaskIdAndDel(metaTaskToUser.getUserId(), metaTaskToUser.getTaskId(), false);
         if (Objects.nonNull(dbMetaTaskToUser)) {
             return MetaRestResult.returnError(String.format("当前用户已在[%S]领取过该任务[%S]", dbMetaTaskToUser.getGetTime(), metaTask.getName()));
         }
+        if (Objects.nonNull(metaTask.getAwardPic())) {
+            metaTaskToUser.setAwardPic(metaTask.getAwardPic());
+        }
         metaTaskToUser.setTaskName(metaTask.getName());
         metaTaskToUser.setTaskType(metaTask.getType());
         metaTaskToUser.setDetail(metaTask.getDetail());