%!s(int64=4) %!d(string=hai) anos · 21740b9ab1
--- a/src/main/java/com/izouma/nineth/service/OrderService.java
+++ b/src/main/java/com/izouma/nineth/service/OrderService.java
@@ -391,7 +391,7 @@ public class OrderService {
 
				             userRepo.findById(order.getInvitor()).ifPresent(user -> {
			
 
				                 BigDecimal shareRatio = user.getShareRatio();
			
 
				                 if (shareRatio != null && shareRatio.compareTo(BigDecimal.ZERO) > 0) {
			
 
				-                    BigDecimal totalPrice = order.getTotalPrice().min(order.getGasPrice());
			
 
				+                    BigDecimal totalPrice = order.getTotalPrice().subtract(order.getGasPrice());
			
 
				                     commissionRecordRepo.save(CommissionRecord.builder()
			
 
				                             .orderId(order.getId())
			
 
				                             .totalPrice(totalPrice)
			
--- a/src/main/nine-space/public/favicon.png
+++ b/src/main/nine-space/public/favicon.png
--- a/src/main/nine-space/public/index.html
+++ b/src/main/nine-space/public/index.html
@@ -3,6 +3,7 @@
 
				     <head>
			
 
				         <meta charset="utf-8" />
			
 
				         <meta http-equiv="X-UA-Compatible" content="IE=edge" />
			
 
				+        <link rel="icon" href="<%= BASE_URL %>favicon.png" />
			
 
				         <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, viewport-fit=cover" />
			
 
				         <meta name="msapplication-tap-highlight" content="no" />
			
 
				         <meta name="format-detection" content="telphone=no" />
			
--- a/src/main/nine-space/src/router/index.js
+++ b/src/main/nine-space/src/router/index.js
@@ -432,6 +432,11 @@ router.beforeEach((to, from, next) => {
 
				         return;
			
 
				     }
			
 
				     console.log(to);
			
 
				+
			
 
				+    if(to.query.invitor){
			
 
				+        sessionStorage.setItem('invitor',to.query.invitor)
			
 
				+    }
			
 
				+
			
 
				     if (!store.state.userInfo && to.meta.pageType !== Page.Login) {
			
 
				         store
			
 
				             .dispatch('getUserInfo')
			
--- a/src/main/nine-space/src/views/Submit.vue
+++ b/src/main/nine-space/src/views/Submit.vue
@@ -165,8 +165,9 @@ export default {
 
				             if (this.couponInfo) {
			
 
				                 url += '&couponId=' + this.couponInfo.id;
			
 
				             }
			
 
				-            if (this.$route.query.invitor) {
			
 
				-                url += '&invitor=' + this.$route.query.invitor;
			
 
				+            let invitor = sessionStorage.getItem('invitor');
			
 
				+            if (invitor) {
			
 
				+                url += '&invitor=' + invitor;
			
 
				             }
			
 
				             this.$http
			
 
				                 .post(url)
			
--- a/src/main/nine-space/src/views/product/Detail.vue
+++ b/src/main/nine-space/src/views/product/Detail.vue
@@ -159,7 +159,7 @@
 
				                 <van-collapse-item name="0" class="goods-info">
			
 
				                     <template #title>
			
 
				                         <div class="titleIcon page-title">
			
 
				-                            <img src="../../assets/icon-lianshangxinxi.png" alt="" />
			
 
				+                            <img src="../../assets/icon-lianshangxinxi(1).png" alt="" />
			
 
				                             持有特权
			
 
				                             <span>（灰色表示已使用）</span>
			
 
				                         </div>
			
@@ -209,7 +209,7 @@
 
				                 <van-collapse-item name="2" class="goods-info">
			
 
				                     <template #title>
			
 
				                         <div class="page-title">
			
 
				-                            <img src="../../assets/icon-lianshangxinxi(2).png" alt="" />链上信息
			
 
				+                            <img src="../../assets/icon-lianshangxinxi(3).png" alt="" />链上信息
			
 
				                         </div>
			
 
				                     </template>
			
 
				                     <div class="page-text" v-if="info.txHash || info.blockNumber || info.tokenId">
			
--- a/src/main/pc-space/public/favicon.png
+++ b/src/main/pc-space/public/favicon.png
--- a/src/main/pc-space/public/index.html
+++ b/src/main/pc-space/public/index.html
@@ -4,7 +4,7 @@
 
				         <meta charset="utf-8" />
			
 
				         <meta http-equiv="X-UA-Compatible" content="IE=edge" />
			
 
				         <meta name="viewport" content="width=device-width,initial-scale=1.0" />
			
 
				-        <link rel="icon" href="<%= BASE_URL %>favicon.ico" />
			
 
				+        <link rel="icon" href="<%= BASE_URL %>favicon.png" />
			
 
				         <title>第九空间</title>
			
 
				         <link rel="stylesheet" href="./client.css" />
			
 
				         <link rel="stylesheet" href="https://at.alicdn.com/t/font_2852142_5nb94jewry2.css" />
			
--- a/src/main/vue/public/favicon.png
+++ b/src/main/vue/public/favicon.png
--- a/src/main/vue/public/index.html
+++ b/src/main/vue/public/index.html
@@ -4,7 +4,7 @@
 
				     <meta charset="utf-8">
			
 
				     <meta http-equiv="X-UA-Compatible" content="IE=edge">
			
 
				     <meta name="viewport" content="width=device-width,initial-scale=1.0">
			
 
				-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
			
 
				+    <link rel="icon" href="<%= BASE_URL %>favicon.png">
			
 
				     <script src="<%= BASE_URL %>fontawesome-v5.13.0.js"></script>
			
 
				     <title>管理后台</title>
			
 
				   </head>
			
--- a/src/test/java/com/izouma/nineth/service/OrderServiceTest.java
+++ b/src/test/java/com/izouma/nineth/service/OrderServiceTest.java
@@ -4,6 +4,7 @@ import com.github.binarywang.wxpay.exception.WxPayException;
 
				 import com.izouma.nineth.ApplicationTests;
			
 
				 import com.izouma.nineth.domain.Order;
			
 
				 import com.izouma.nineth.enums.OrderStatus;
			
 
				+import com.izouma.nineth.repo.OrderRepo;
			
 
				 import org.apache.commons.codec.EncoderException;
			
 
				 import org.junit.Test;
			
 
				 import org.springframework.beans.factory.annotation.Autowired;
			
@@ -11,6 +12,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 
				 public class OrderServiceTest extends ApplicationTests {
			
 
				     @Autowired
			
 
				     private OrderService orderService;
			
 
				+    @Autowired
			
 
				+    private OrderRepo    orderRepo;
			
 
				 
			
 
				     @Test
			
 
				     public void create() throws EncoderException, WxPayException {
			
@@ -27,4 +30,9 @@ public class OrderServiceTest extends ApplicationTests {
 
				     public void setSales() {
			
 
				         orderService.setSales();
			
 
				     }
			
 
				+
			
 
				+    @Test
			
 
				+    public void commission() {
			
 
				+        orderService.commission(orderRepo.findById(4437L).get());
			
 
				+    }
			
 
				 }