Merge branch 'dev'

# Conflicts:
#	src/main/java/com/izouma/nineth/dto/UserRegister.java
#	src/main/java/com/izouma/nineth/service/OrderService.java

src/main/java/com/izouma/nineth/dto/UserRegister.java

@@ -49,6 +49,4 @@ public class UserRegister {
 
     @ApiModelProperty("藏品Id")
     private Long collectionId;
-
-    private String intro;
 }

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

@@ -395,9 +395,9 @@ public class OrderService {
             if (collection.getServiceCharge() + collection.getRoyalties() > 0) {
                 // 扣除手续费、服务费、GAS费
                 restAmount = divMoney(totalAmount, restAmount, divMembers, owner.getMemberId(),
-                        100 - (collection.getServiceCharge() + collection.getRoyalties()), true);
+                        100 - (collection.getServiceCharge() + collection.getRoyalties()), false);
             }
-            restAmount = divMoney(restAmount, divMembers, "0", restAmount, false);
+            restAmount = divMoney(restAmount, divMembers, "0", restAmount, true);
         } else {
             if (invitor != null && invitor.getShareRatio() != null
                     && invitor.getShareRatio().compareTo(BigDecimal.ZERO) > 0) {

src/main/vue/src/views/CollectionEdit.vue

@@ -39,6 +39,12 @@
                         ></model-upload>
                         <div class="tip">请将FBX文件与贴图打包成zip压缩包上传</div>
                     </el-form-item>
+                    <el-form-item label="相机距离" v-if="formData.model3d">
+                        <el-input-number v-model="scale" :min="0.1" :step="0.1"></el-input-number>
+                    </el-form-item>
+                    <el-form-item label="Y轴偏移" v-if="formData.model3d">
+                        <el-input-number v-model="yOffset"></el-input-number>
+                    </el-form-item>
                     <div class="inline-wrapper">
                         <el-form-item prop="minterId" label="铸造者">
                             <minter-select
@@ -303,6 +309,12 @@ export default {
                     return this.$http
                         .get('collection/get/' + this.$route.query.id)
                         .then(res => {
+                            if (res.model3d) {
+                                let url = new URL(res.model3d.url);
+                                this.scale = Number(url.searchParams.get('scale')) || 1;
+                                this.yOffset = Number(url.searchParams.get('yOffset')) || 0;
+                                res.model3d.url = url.origin + url.pathname;
+                            }
                             res.properties = res.properties || [];
                             res.privileges = res.privileges || [];
                             this.formData = res;
@@ -517,7 +529,9 @@ export default {
                 detail: [{ required: true, message: '请填写内容' }],
                 remark: [{ required: true, message: '请填写说明' }]
             },
-            customUrl: resolveUrl(this.$baseUrl, 'upload/3dModel')
+            customUrl: resolveUrl(this.$baseUrl, 'upload/3dModel'),
+            scale: 1,
+            yOffset: 0
         };
     },
     methods: {
@@ -532,6 +546,9 @@ export default {
         },
         submit() {
             let data = { ...this.formData };
+            if (data.model3d) {
+                data.model3d.url = data.model3d.url + '?scale=' + this.scale + '&yOffset=' + this.yOffset;
+            }
 
             this.saving = true;
             this.$http