Merge branch 'master' of http://git.izouma.com/xiongzhu/9th

build_all.sh

@@ -0,0 +1,6 @@
+git checkout
+git pull
+mvn clean package
+systemctl stop 9th
+mv -f target/9th-0.0.1-SNAPSHOT.jar /var/www/9th/9th-0.0.1-SNAPSHOT.jar
+systemctl start 9th

build_h5.sh

@@ -0,0 +1,6 @@
+git checkout
+git pull
+mvn clean package
+systemctl stop 9th
+mv -f target/9th-0.0.1-SNAPSHOT.jar /var/www/9th/9th-0.0.1-SNAPSHOT.jar
+systemctl start 9th

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

@@ -2,7 +2,6 @@ package com.izouma.nineth.service;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.alipay.api.AlipayApiException;
 import com.alipay.api.AlipayClient;
 import com.alipay.api.request.AlipayTradeWapPayRequest;
 import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult;
@@ -13,9 +12,8 @@ import com.github.binarywang.wxpay.exception.WxPayException;
 import com.github.binarywang.wxpay.service.WxPayService;
 import com.izouma.nineth.config.AlipayProperties;
 import com.izouma.nineth.config.WxPayProperties;
-import com.izouma.nineth.domain.*;
 import com.izouma.nineth.domain.Collection;
-import com.izouma.nineth.dto.NFTAccount;
+import com.izouma.nineth.domain.*;
 import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.enums.CollectionType;
 import com.izouma.nineth.enums.OrderStatus;
@@ -24,17 +22,13 @@ import com.izouma.nineth.event.CreateAssetEvent;
 import com.izouma.nineth.exception.BusinessException;
 import com.izouma.nineth.repo.*;
 import com.izouma.nineth.utils.JpaUtils;
-import com.izouma.nineth.utils.JsonUtils;
-import com.izouma.nineth.utils.SecurityUtils;
 import com.izouma.nineth.utils.SnowflakeIdWorker;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.EncoderException;
 import org.apache.commons.codec.net.URLCodec;
-import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.RandomUtils;
 import org.apache.commons.lang3.Range;
-import org.apache.http.client.utils.URLEncodedUtils;
 import org.springframework.context.event.EventListener;
 import org.springframework.core.env.Environment;
 import org.springframework.data.domain.Page;
@@ -82,7 +76,7 @@ public class OrderService {
         if (qty > collection.getStock()) {
             throw new BusinessException("库存不足");
         }
-        if (!collection.isCanResale()) {
+        if (!collection.isSalable()) {
             throw new BusinessException("该藏品当前不可购买");
         }
         if (collection.getType() == CollectionType.BLIND_BOX) {

src/main/pc-space/src/components/SecurityPhone.vue

@@ -5,7 +5,7 @@
             <el-step title="绑定新手机号"></el-step>
             <el-step title="完成"></el-step>
         </el-steps>
-        <el-form :label-position="labelPosition" ref="form2" label-width="340px" :model="ruleForm" :rules="rules">
+        <el-form :label-position="labelPosition" ref="form2" label-width="290px" :model="ruleForm" :rules="rules">
             <el-form-item label="新手机号" prop="phone">
                 <el-input style="width: 300px" v-model="ruleForm.phone" placeholder="请输入新的手机号码"></el-input>
             </el-form-item>
@@ -17,9 +17,11 @@
                 </el-input>
             </el-form-item>
         </el-form>
-        <div class="btn">
-            <el-button type="primary" @click="phoneSend">确认</el-button>
-            <div class="btn2" @click="Jump">返回</div>
+        <div class="btn1">
+            <div class="btn2">
+                <el-button type="primary" @click="phoneSend">确认</el-button>
+                <div class="btn3" @click="Jump">返回</div>
+            </div>
         </div>
     </div>
 </template>
@@ -78,7 +80,7 @@ export default {
 </script>
 <style lang="less" scoped>
 /deep/ .el-steps {
-    margin-left: 385px;
+    margin-left: 329px;
 }
 /deep/.el-step:nth-child(1) {
     .el-step__icon {
@@ -109,21 +111,24 @@ export default {
     color: #939599;
 }
 .container {
-    .btn {
-        margin: 80px 0 0 110px;
-        display: flex;
-        justify-content: center;
+    .btn1 {
+        margin-left: 10px;
         .btn2 {
-            width: 130px;
-            height: 36px;
-            background: #c4c7cc;
-            border-radius: 4px;
-            cursor: pointer;
-            color: #ffffff;
-            font-size: 13px;
-            text-align: center;
-            line-height: 36px;
-            margin-left: 20px;
+            display: flex;
+            justify-content: center;
+            margin-top: 80px;
+            .btn3 {
+                width: 130px;
+                height: 36px;
+                background: #c4c7cc;
+                border-radius: 4px;
+                cursor: pointer;
+                color: #ffffff;
+                font-size: 13px;
+                text-align: center;
+                line-height: 36px;
+                margin-left: 20px;
+            }
         }
     }
     /deep/ .el-button {

src/main/pc-space/src/components/TransactionPhone.vue

@@ -5,7 +5,7 @@
             <el-step title="绑定新手机号"></el-step>
             <el-step title="完成"></el-step>
         </el-steps>
-        <el-form :label-position="labelPosition" ref="form2" label-width="340px" :model="ruleForm" :rules="rules">
+        <el-form :label-position="labelPosition" ref="form2" label-width="290px" :model="ruleForm" :rules="rules">
             <el-form-item label="新手机号" prop="phone">
                 <el-input style="width: 300px" v-model="ruleForm.phone" placeholder="请输入新的手机号码"></el-input>
             </el-form-item>
@@ -17,9 +17,11 @@
                 </el-input>
             </el-form-item>
         </el-form>
-        <div class="btn">
-            <el-button type="primary" @click="phoneSend">确认</el-button>
-            <div class="btn2" @click="Jump">返回</div>
+        <div class="btn1">
+            <div class="btn2">
+                <el-button type="primary" @click="phoneSend">确认</el-button>
+                <div class="btn3" @click="Jump">返回</div>
+            </div>
         </div>
     </div>
 </template>
@@ -78,7 +80,7 @@ export default {
 </script>
 <style lang="less" scoped>
 /deep/ .el-steps {
-    margin-left: 385px;
+    margin-left: 329px;
 }
 /deep/.el-step:nth-child(1) {
     .el-step__icon {
@@ -109,21 +111,24 @@ export default {
     color: #939599;
 }
 .container {
-    .btn {
-        margin: 80px 0 0 110px;
-        display: flex;
-        justify-content: center;
+    .btn1 {
+        margin-left: 10px;
         .btn2 {
-            width: 130px;
-            height: 36px;
-            background: #c4c7cc;
-            border-radius: 4px;
-            cursor: pointer;
-            color: #ffffff;
-            font-size: 13px;
-            text-align: center;
-            line-height: 36px;
-            margin-left: 20px;
+            display: flex;
+            justify-content: center;
+            margin-top: 80px;
+            .btn3 {
+                width: 130px;
+                height: 36px;
+                background: #c4c7cc;
+                border-radius: 4px;
+                cursor: pointer;
+                color: #ffffff;
+                font-size: 13px;
+                text-align: center;
+                line-height: 36px;
+                margin-left: 20px;
+            }
         }
     }
     /deep/ .el-button {

src/main/pc-space/src/views/user/Security.vue

@@ -16,7 +16,7 @@
                 <el-form
                     :label-position="labelPosition"
                     ref="form"
-                    label-width="340px"
+                    label-width="290px"
                     :model="ruleForm"
                     :rules="rules"
                 >
@@ -34,9 +34,11 @@
                         </el-input>
                     </el-form-item>
                 </el-form>
-                <div class="btn">
-                    <el-button type="primary" @click="codeSend">确认</el-button>
-                    <div class="btn2" @click="all('/accountdata')">返回</div>
+                <div class="btn1">
+                    <div class="btn2">
+                        <el-button type="primary" @click="codeSend">确认</el-button>
+                        <div class="btn3" @click="all('/accountdata')">返回</div>
+                    </div>
                 </div>
             </div>
             <div v-else>
@@ -92,20 +94,20 @@ export default {
             this.sendMsg(this.ruleForm.phone);
         },
         codeSend() {
-            // this.flag = false;
-            this.$http
-                .get('/sms/verify', {
-                    phone: this.ruleForm.phone,
-                    code: this.ruleForm.code
-                })
-                .then(() => {
-                    this.ruleForm.code = '';
-                    this.ruleForm.phone = '';
-                    this.flag = false;
-                })
-                .catch(e => {
-                    this.$message.error(e.error);
-                });
+            this.flag = false;
+            // this.$http
+            //     .get('/sms/verify', {
+            //         phone: this.ruleForm.phone,
+            //         code: this.ruleForm.code
+            //     })
+            //     .then(() => {
+            //         this.ruleForm.code = '';
+            //         this.ruleForm.phone = '';
+            //         this.flag = false;
+            //     })
+            //     .catch(e => {
+            //         this.$message.error(e.error);
+            //     });
         },
         Jump() {
             this.flag = true;
@@ -117,7 +119,7 @@ export default {
 
 <style lang="less" scoped>
 /deep/ .el-steps {
-    margin-left: 385px;
+    margin-left: 329px;
 }
 /deep/.el-step:nth-child(1) {
     .el-step__icon {
@@ -148,21 +150,24 @@ export default {
     color: #939599;
 }
 .container {
-    .btn {
-        display: flex;
-        justify-content: center;
-        margin: 80px 0 0 110px;
+    .btn1 {
+        margin-left: 10px;
         .btn2 {
-            width: 130px;
-            height: 36px;
-            background: #c4c7cc;
-            border-radius: 4px;
-            cursor: pointer;
-            color: #ffffff;
-            font-size: 13px;
-            text-align: center;
-            line-height: 36px;
-            margin-left: 20px;
+            display: flex;
+            justify-content: center;
+            margin-top: 80px;
+            .btn3 {
+                width: 130px;
+                height: 36px;
+                background: #c4c7cc;
+                border-radius: 4px;
+                cursor: pointer;
+                color: #ffffff;
+                font-size: 13px;
+                text-align: center;
+                line-height: 36px;
+                margin-left: 20px;
+            }
         }
     }
     /deep/ .el-button {

src/main/pc-space/src/views/user/SecuritySuccess.vue

@@ -57,7 +57,7 @@ export default {
 
 <style lang="less" scoped>
 /deep/ .el-steps {
-    margin-left: 385px;
+    margin-left: 329px;
 }
 /deep/.el-step:nth-child(1) {
     .el-step__icon {
@@ -83,7 +83,6 @@ export default {
 .container {
     .fail {
         text-align: center;
-        margin-left: 100px;
         .text1 {
             width: 68px;
             height: 68px;
@@ -94,7 +93,7 @@ export default {
             font-weight: 400;
             color: #ffffff;
             line-height: 24px;
-            margin-top: 20px;
+            margin: 20px 0 59px;
         }
         .botn {
             width: 130px;
@@ -106,7 +105,7 @@ export default {
             text-align: center;
             background: linear-gradient(133deg, #00ffcb 0%, #006eff 100%);
             border-radius: 4px;
-            margin: 59px 0 0 488px;
+            margin: 0 auto;
         }
     }
     /deep/ .el-step__title {

src/main/pc-space/src/views/user/Transaction.vue

@@ -16,7 +16,7 @@
                 <el-form
                     :label-position="labelPosition"
                     ref="form"
-                    label-width="340px"
+                    label-width="290px"
                     :model="ruleForm"
                     :rules="rules"
                 >
@@ -34,9 +34,11 @@
                         </el-input>
                     </el-form-item>
                 </el-form>
-                <div class="btn">
-                    <el-button type="primary" @click="codeSend">确认</el-button>
-                    <div class="btn2" @click="all('/accountdata')">返回</div>
+                <div class="btn1">
+                    <div class="btn2">
+                        <el-button type="primary" @click="codeSend">确认</el-button>
+                        <div class="btn3" @click="all('/accountdata')">返回</div>
+                    </div>
                 </div>
             </div>
             <div v-else>
@@ -92,20 +94,20 @@ export default {
             this.sendMsg(this.ruleForm.phone);
         },
         codeSend() {
-            // this.flag = false;
-            this.$http
-                .get('/sms/verify', {
-                    phone: this.ruleForm.phone,
-                    code: this.ruleForm.code
-                })
-                .then(() => {
-                    this.ruleForm.code = '';
-                    this.ruleForm.phone = '';
-                    this.flag = false;
-                })
-                .catch(e => {
-                    this.$message.error(e.error);
-                });
+            this.flag = false;
+            // this.$http
+            //     .get('/sms/verify', {
+            //         phone: this.ruleForm.phone,
+            //         code: this.ruleForm.code
+            //     })
+            //     .then(() => {
+            //         this.ruleForm.code = '';
+            //         this.ruleForm.phone = '';
+            //         this.flag = false;
+            //     })
+            //     .catch(e => {
+            //         this.$message.error(e.error);
+            //     });
         },
         Jump() {
             this.flag = true;
@@ -117,7 +119,7 @@ export default {
 
 <style lang="less" scoped>
 /deep/ .el-steps {
-    margin-left: 385px;
+    margin-left: 329px;
 }
 /deep/.el-step:nth-child(1) {
     .el-step__icon {
@@ -148,21 +150,24 @@ export default {
     color: #939599;
 }
 .container {
-    .btn {
-        display: flex;
-        justify-content: center;
-        margin: 80px 0 0 110px;
+    .btn1 {
+        margin-left: 10px;
         .btn2 {
-            width: 130px;
-            height: 36px;
-            background: #c4c7cc;
-            border-radius: 4px;
-            cursor: pointer;
-            color: #ffffff;
-            font-size: 13px;
-            text-align: center;
-            line-height: 36px;
-            margin-left: 20px;
+            display: flex;
+            justify-content: center;
+            margin-top: 80px;
+            .btn3 {
+                width: 130px;
+                height: 36px;
+                background: #c4c7cc;
+                border-radius: 4px;
+                cursor: pointer;
+                color: #ffffff;
+                font-size: 13px;
+                text-align: center;
+                line-height: 36px;
+                margin-left: 20px;
+            }
         }
     }
     /deep/ .el-button {

src/main/pc-space/src/views/user/TransactionSuccess.vue

@@ -57,7 +57,7 @@ export default {
 
 <style lang="less" scoped>
 /deep/ .el-steps {
-    margin-left: 385px;
+    margin-left: 329px;
 }
 /deep/.el-step:nth-child(1) {
     .el-step__icon {
@@ -83,7 +83,6 @@ export default {
 .container {
     .fail {
         text-align: center;
-        margin-left: 100px;
         .text1 {
             width: 68px;
             height: 68px;
@@ -94,7 +93,7 @@ export default {
             font-weight: 400;
             color: #ffffff;
             line-height: 24px;
-            margin-top: 20px;
+            margin: 20px 0 59px;
         }
         .botn {
             width: 130px;
@@ -106,7 +105,7 @@ export default {
             text-align: center;
             background: linear-gradient(133deg, #00ffcb 0%, #006eff 100%);
             border-radius: 4px;
-            margin: 59px 0 0 488px;
+            margin: 0 auto;
         }
     }
     /deep/ .el-step__title {