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

src/main/java/com/izouma/nineth/domain/Order.java

@@ -2,6 +2,7 @@ package com.izouma.nineth.domain;
 
 import com.izouma.nineth.annotations.Searchable;
 import com.izouma.nineth.converter.StringArrayConverter;
+import com.izouma.nineth.enums.CollectionType;
 import com.izouma.nineth.enums.OrderStatus;
 import com.izouma.nineth.enums.PayMethod;
 import io.swagger.annotations.ApiModel;
@@ -51,6 +52,10 @@ public class Order extends BaseEntity {
     @ApiModelProperty("特性")
     private List<Collection.CollectionProperty> properties;
 
+    @ApiModelProperty("类型")
+    @Enumerated(EnumType.STRING)
+    private CollectionType type;
+
     @ApiModelProperty("铸造者")
     @Searchable
     private String minter;

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

@@ -96,6 +96,7 @@ public class OrderService {
                 .name(collection.getName())
                 .pic(collection.getPics())
                 .properties(collection.getProperties())
+                .type(collection.getType())
                 .minter(minter.getNickname())
                 .minterAvatar(minter.getAvatar())
                 .qty(qty)

src/main/resources/application.yaml

@@ -69,9 +69,9 @@ wx:
     subAppId: #服务商模式下的子商户公众账号ID
     subMchId: #服务商模式下的子商户号
     keyPath: classpath:/cert/apiclient_cert.p12
-    notifyUrl: http://9th.izouma.com/notify/order/weixin
-    refundNotifyUrl: http://zmj.izouma.com/wx/refundNotify
-    returnUrl: http://9th.izouma.com/9th/orders
+    notifyUrl: http://nft.9space.vip/notify/order/weixin
+    refundNotifyUrl: http://nft.9space.vip/wx/refundNotify
+    returnUrl: http://nft.9space.vip/9th/orders
 storage:
   provider: aliyun
   local_path: /var/www/upload/
@@ -82,7 +82,7 @@ aliyun:
   oss-bucket-name: awesomeadmin
   oss-domain: https://awesomeadmin.oss-cn-hangzhou.aliyuncs.com
 general:
-  host: http://art.izouma.com
+  host: http://nft.9space.vip
 mychain:
   rest:
     bizid: a00e36c5
@@ -116,8 +116,8 @@ alipay:
   appCertPath: classpath:cert/appCertPublicKey_2021002120645023.crt
   aliPubCertPath: classpath:cert/alipayCertPublicKey_RSA2.crt
   rootCertPath: classpath:cert/alipayRootCert.crt
-  notifyUrl: http://9th.izouma.com/notify/order/alipay
-  returnUrl: http://9th.izouma.com/9th/orders
+  notifyUrl: http://nft.9space.vip/notify/order/alipay
+  returnUrl: http://nft.9space.vip/9th/orders
 ---
 
 spring:
@@ -129,4 +129,13 @@ spring:
   profiles: prod
   datasource:
     url: jdbc:mysql://mysql.izouma.com/nineth_test?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2b8
-
+general:
+  host: http://nft.9space.vip
+wx:
+  pay:
+    notify-url: http://nft.9space.vip/notify/order/weixin
+    refund-notify-url: http://nft.9space.vip/wx/refundNotify
+    return-url: http://nft.9space.vip/9th/orders
+alipay:
+  notify-url: http://nft.9space.vip/notify/order/alipay
+  return-url: http://nft.9space.vip/9th/orders