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

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

@@ -100,9 +100,9 @@ public class MetaUserPropService {
             }
             int goldNum = metaPropPrice * metaPropNum;
             metaUserGoldService.changeNum(userId, goldNum, String.format("永久道具:[%S],数量:[%S],单价:[%S],转化成金币[%S]", metaProp.getId(), metaPropNum, metaPropPrice, goldNum));
+            metaUserProp.setNum(1);
             // 未拥有该道具，领取一个，多余转化为金币
             if (init) {
-                metaUserProp.setNum(1);
                 MetaUserProp save = metaUserPropRepo.save(metaUserProp);
                 metaUserPropRecordService.save(metaUserProp.getUserId(), metaProp, MetaPropOperationType.RECEIVE, 1);
                 return MetaRestResult.returnSuccess(String.format("永久道具仅限持有一个，多余道具将转化为[%S]个金币！", goldNum), save);