Merge branch 'dev-sunka-bag' of xiongzhu/raex_back into master

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

@@ -78,4 +78,15 @@ public class MetaTaskToUser extends BaseEntity {
     @ApiModelProperty("进度")
     @ExcelIgnore
     private String process;
+
+    @ApiModelProperty("金币奖励数量")
+    @ExcelProperty("金币奖励数量")
+    private int goldNum;
+
+    @ApiModelProperty("道具id")
+    @ExcelProperty("道具id")
+    private Long metaPropId;
+
+    @Transient
+    private MetaProp metaProp;
 }

src/main/java/com/izouma/nineth/repo/MetaPropRepo.java

@@ -16,4 +16,6 @@ public interface MetaPropRepo extends JpaRepository<MetaProp, Long>, JpaSpecific
     void softDelete(Long id);
 
     List<MetaProp> findAllByDel(boolean del);
+
+    MetaProp findByIdAndDel(Long id, boolean del);
 }

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

@@ -1,12 +1,14 @@
 package com.izouma.nineth.service;
 
 import com.alibaba.excel.util.CollectionUtils;
+import com.izouma.nineth.domain.MetaProp;
 import com.izouma.nineth.domain.MetaTask;
 import com.izouma.nineth.domain.MetaTaskToUser;
 import com.izouma.nineth.domain.MetaUserTaskProgress;
 import com.izouma.nineth.dto.MetaRestResult;
 import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.enums.MetaTaskStatus;
+import com.izouma.nineth.repo.MetaPropRepo;
 import com.izouma.nineth.repo.MetaTaskRepo;
 import com.izouma.nineth.repo.MetaTaskToUserRepo;
 import com.izouma.nineth.repo.MetaUserTaskProgressRepo;
@@ -36,6 +38,8 @@ public class MetaTaskToUserService {
 
     private final String PREFIX = "0/";
 
+    private MetaPropRepo metaPropRepo;
+
     public Page<MetaTaskToUser> all(PageQuery pageQuery) {
         return metaTaskToUserRepo.findAll(JpaUtils.toSpecification(pageQuery, MetaTaskToUser.class), JpaUtils.toPageRequest(pageQuery));
     }
@@ -80,6 +84,12 @@ public class MetaTaskToUserService {
         if (Objects.nonNull(metaTask.getAwardPic())) {
             metaTaskToUser.setAwardPic(metaTask.getAwardPic());
         }
+        if (metaTask.getGoldNum() > 0) {
+            metaTaskToUser.setGoldNum(metaTask.getGoldNum());
+        }
+        if (Objects.nonNull(metaTask.getMetaPropId())) {
+            metaTaskToUser.setMetaPropId(metaTask.getMetaPropId());
+        }
         metaTaskToUser.setTaskName(metaTask.getName());
         metaTaskToUser.setTaskType(metaTask.getType());
         metaTaskToUser.setDetail(metaTask.getDetail());
@@ -115,6 +125,12 @@ public class MetaTaskToUserService {
      * @param metaTaskToUser 参数
      */
     private void setProgress(MetaTaskToUser metaTaskToUser) {
+        if (Objects.nonNull(metaTaskToUser.getMetaPropId())) {
+            MetaProp metaProp = metaPropRepo.findByIdAndDel(metaTaskToUser.getMetaPropId(), false);
+            if (Objects.nonNull(metaProp)) {
+                metaTaskToUser.setMetaProp(metaProp);
+            }
+        }
         MetaTask metaTask = metaTaskRepo.findByIdAndDel(metaTaskToUser.getTaskId(), false);
         if (Objects.isNull(metaTask)) {
             log.error("任务信息为空");