Merge remote-tracking branch 'origin/dev/dev' into dev/dev

src/main/java/com/ai/da/mapper/primary/entity/OrderInfo.java

@@ -15,7 +15,7 @@ public class OrderInfo  extends BaseEntity{
 
     private Long productId;//支付产品id
 
-    private Integer totalFee;//订单金额(元)
+    private Float totalFee;//订单金额(元)
 
     private String codeUrl;//订单二维码连接
 

src/main/java/com/ai/da/mapper/primary/entity/PaymentInfo.java

@@ -17,7 +17,7 @@ public class PaymentInfo extends BaseEntity{
 
     private String tradeState;//交易状态
 
-    private Integer payerTotal;//支付金额(分)
+    private Long payerTotal;//支付金额(元)
 
     private String content;//通知参数
 }

src/main/java/com/ai/da/mapper/primary/entity/Product.java

@@ -9,7 +9,8 @@ public class Product extends BaseEntity{
 
     private String title; //商品名称
 
-    private Integer price; //价格（分）
+//    private Integer price; //价格（分）
+    private Float price; //价格（元）
 
     private Integer credits; // 积分
 }

src/main/java/com/ai/da/mapper/primary/entity/RefundInfo.java

@@ -13,9 +13,11 @@ public class RefundInfo extends BaseEntity{
 
     private String refundId;//支付系统退款单号(微信)
 
-    private Integer totalFee;//原订单金额(分)
+//    private Integer totalFee;//原订单金额(分)
+    private Float totalFee;//原订单金额(分)
 
-    private Integer refund;//退款金额(分)
+//    private Integer refund;//退款金额(分)
+    private Float refund;//退款金额(分)
 
     private String reason;//退款原因