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

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

@@ -72,7 +72,7 @@ public class MetaLuckyDrawAwardReceiveRecordService {
         metaLuckyDrawAwardReceiveRecord.setFinishTime(LocalDateTime.now());
         metaLuckyDrawAwardReceiveRecord.setMetaLuckDrawAward(metaLuckyDrawAwardModel);
         metaLuckyDrawAwardReceiveRecord.setMetaLuckDrawAwardName(metaLuckyDrawAwardModel.getName());
-        MetaServiceResult receive = metaAwardReceiveService.receive(new MetaAwardReceiveDTO(metaLuckyDrawAwardModel.getAwardType(), metaLuckyDrawAwardModel.getConfig(), userId, "抽奖活动"));
+        MetaServiceResult receive = metaAwardReceiveService.receive(new MetaAwardReceiveDTO(metaLuckyDrawAwardModel.getAwardType(), metaLuckyDrawAwardModel.getConfig(), userId, "抽奖活动" + metaLuckyDrawId));
         if (!receive.isSuccess()) {
             // 抽奖记录正常保存，返回自动领奖错误信息！
             metaLuckyDrawAwardReceiveRecordRepo.save(metaLuckyDrawAwardReceiveRecord);

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

@@ -60,7 +60,7 @@ public class MetaSignAwardDrawRecordService {
         MetaAwardReceiveDTO metaAwardReceiveDTO = new MetaAwardReceiveDTO();
         metaAwardReceiveDTO.setAwardType(awardType);
         metaAwardReceiveDTO.setUserId(userId);
-        metaAwardReceiveDTO.setRemark("累计签到");
+        metaAwardReceiveDTO.setRemark("累计签到" + metaSignAwardId);
         if (MetaAwardTypeEnum.GOLD.equals(awardType)) {
             metaAwardReceiveDTO.setConfig(String.valueOf(metaSignAward.getGoldNum()));
         }

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

@@ -112,7 +112,7 @@ public class MetaUserPropService {
         }
         MetaUserProp save = metaUserPropRepo.save(metaUserProp);
         metaUserPropRecordService.save(metaUserProp.getUserId(), metaProp, MetaPropOperationType.RECEIVE, num);
-        return MetaRestResult.returnSuccess(save);
+        return MetaRestResult.returnSuccess("道具领取成功！", save);
 
     }