Merge remote-tracking branch 'origin/master'

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

@@ -214,5 +214,5 @@ public class Order extends BaseEntityNoID {
     private String paySerialNumber;
 
     @ApiModelProperty("发行数量")
-    private Integer total;
+    private Integer totalCount;
 }

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

@@ -279,7 +279,7 @@ public class OrderService {
                     .countId(collection.getCountId())
                     .vip(vip)
                     .vipPoint(usePoint)
-                    .total(collection.getTotal())
+                    .totalCount(collection.getTotal())
                     .build();
             if (coupon != null) {
                 coupon.setUsed(true);

src/main/resources/application.yaml

@@ -222,9 +222,9 @@ adapay:
   notify-url: https://njnft.izouma.vip/notify/adapay
 sandpay:
   url: https://cashier.sandpay.com.cn/qr/api
-  mid: 6888806044146
-  sign-cert-path: classpath:cert/6888806044146.pfx
-  sign-cert-pwd: 123456
+  mid: 6888803044895
+  sign-cert-path: classpath:cert/siyao.pfx
+  sign-cert-pwd: lasuo0424
   sand-cert-path: classpath:cert/sand.cer
   notify-url: https://test.adcs.vip/sandpay/notify
 rocketmq: