Merge branch 'dev/dev_xp' into dev/dev

# Conflicts:
#	src/main/java/com/ai/da/model/vo/AccountLoginVO.java
#	src/main/java/com/ai/da/service/impl/AccountServiceImpl.java

src/main/java/com/ai/da/model/vo/AccountLoginVO.java

@@ -46,4 +46,22 @@ public class AccountLoginVO {
 
     private String Language;
 
+    // 订阅id(stripe提供)
+    private String subscriptionId;
+
+    // 订阅状态
+    private String status;
+
+    // 订阅过期时间
+    private String expireTime;
+
+    // 订阅类型 month || year
+    private String subscriptionType;
+
+    // 是否自动续订
+    private boolean isAutoRenewal;
+
+    // 是否是affiliate
+    private boolean isAffiliate = false;
+
 }

src/main/java/com/ai/da/model/vo/AffiliateInvitationDetailsVO.java

@@ -0,0 +1,25 @@
+package com.ai.da.model.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class AffiliateInvitationDetailsVO {
+
+    private Long accountId;
+
+    private String username;
+
+    private Float firstSubscriptionPaymentAmount;
+
+    private Float commission;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private LocalDateTime time;
+}

src/main/java/com/ai/da/model/vo/AffiliateVO.java

@@ -0,0 +1,15 @@
+package com.ai.da.model.vo;
+
+import com.ai.da.mapper.primary.entity.Affiliate;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class AffiliateVO extends Affiliate {
+
+    private Long linkViewCount;
+
+}

src/main/java/com/ai/da/model/vo/OrderListVO.java

@@ -0,0 +1,29 @@
+package com.ai.da.model.vo;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 用于订单列表展示（展示的是所有支付信息）
+ */
+@Data
+public class OrderListVO {
+
+    private Long id;
+
+    private Float amount;
+
+    private String paymentMethod;
+
+    private String state;
+
+    private String orderType;
+
+    private String invoiceLink;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private LocalDateTime createTime;
+}