Merge remote-tracking branch 'origin/develop/mvp' into develop/mvp

pdf-office-api/pdf-office-api-account/src/main/java/cn/kdan/cloud/pdf/office/api/account/dto/UpdateUserForOrderDTO.java

@@ -23,7 +23,7 @@ public class UpdateUserForOrderDTO {
     /**
      *  1windows 2 mac
      */
-    private Integer platform;;
+    private Integer platform;
 
     /**
      * 失效日期

pdf-office-api/pdf-office-api-account/src/main/java/cn/kdan/cloud/pdf/office/api/account/vo/LoginDevice.java

@@ -267,26 +267,25 @@ public class LoginDevice implements Serializable {
 
     @Override
     public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", id=").append(id);
-        sb.append(", productId=").append(productId);
-        sb.append(", uniqueSn=").append(uniqueSn);
-        sb.append(", appId=").append(appId);
-        sb.append(", userId=").append(userId);
-        sb.append(", model=").append(model);
-        sb.append(", os=").append(os);
-        sb.append(", language=").append(language);
-        sb.append(", timeZone=").append(timeZone);
-        sb.append(", appVersion=").append(appVersion);
-        sb.append(", platform=").append(platform);
-        sb.append(", updatedAt=").append(updatedAt);
-        sb.append(", createdAt=").append(createdAt);
-        sb.append(", validFlag=").append(validFlag);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
+        String sb = getClass().getSimpleName() +
+                " [" +
+                "Hash = " + hashCode() +
+                ", id=" + id +
+                ", productId=" + productId +
+                ", uniqueSn=" + uniqueSn +
+                ", appId=" + appId +
+                ", userId=" + userId +
+                ", model=" + model +
+                ", os=" + os +
+                ", language=" + language +
+                ", timeZone=" + timeZone +
+                ", appVersion=" + appVersion +
+                ", platform=" + platform +
+                ", updatedAt=" + updatedAt +
+                ", createdAt=" + createdAt +
+                ", validFlag=" + validFlag +
+                ", serialVersionUID=" + serialVersionUID +
+                "]";
+        return sb;
     }
 }

pdf-office-api/pdf-office-api-account/src/main/java/cn/kdan/cloud/pdf/office/api/account/vo/OauthClientDetails.java

@@ -266,26 +266,25 @@ public class OauthClientDetails implements Serializable {
 
     @Override
     public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", clientId=").append(clientId);
-        sb.append(", resourceIds=").append(resourceIds);
-        sb.append(", clientSecret=").append(clientSecret);
-        sb.append(", scope=").append(scope);
-        sb.append(", authorizedGrantTypes=").append(authorizedGrantTypes);
-        sb.append(", webServerRedirectUri=").append(webServerRedirectUri);
-        sb.append(", authorities=").append(authorities);
-        sb.append(", accessTokenValidity=").append(accessTokenValidity);
-        sb.append(", refreshTokenValidity=").append(refreshTokenValidity);
-        sb.append(", additionalInformation=").append(additionalInformation);
-        sb.append(", autoapprove=").append(autoapprove);
-        sb.append(", state=").append(state);
-        sb.append(", tokenUrl=").append(tokenUrl);
-        sb.append(", userInfoUrl=").append(userInfoUrl);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
+        String sb = getClass().getSimpleName() +
+                " [" +
+                "Hash = " + hashCode() +
+                ", clientId=" + clientId +
+                ", resourceIds=" + resourceIds +
+                ", clientSecret=" + clientSecret +
+                ", scope=" + scope +
+                ", authorizedGrantTypes=" + authorizedGrantTypes +
+                ", webServerRedirectUri=" + webServerRedirectUri +
+                ", authorities=" + authorities +
+                ", accessTokenValidity=" + accessTokenValidity +
+                ", refreshTokenValidity=" + refreshTokenValidity +
+                ", additionalInformation=" + additionalInformation +
+                ", autoapprove=" + autoapprove +
+                ", state=" + state +
+                ", tokenUrl=" + tokenUrl +
+                ", userInfoUrl=" + userInfoUrl +
+                ", serialVersionUID=" + serialVersionUID +
+                "]";
+        return sb;
     }
 }

pdf-office-api/pdf-office-api-account/src/main/java/cn/kdan/cloud/pdf/office/api/account/vo/UserSubscriptionInfo.java

@@ -165,20 +165,19 @@ public class UserSubscriptionInfo implements Serializable {
 
     @Override
     public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", id=").append(id);
-        sb.append(", userId=").append(userId);
-        sb.append(", platform=").append(platform);
-        sb.append(", status=").append(status);
-        sb.append(", endDate=").append(endDate);
-        sb.append(", payType=").append(payType);
-        sb.append(", appId=").append(appId);
-        sb.append(", productId=").append(productId);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
+        String sb = getClass().getSimpleName() +
+                " [" +
+                "Hash = " + hashCode() +
+                ", id=" + id +
+                ", userId=" + userId +
+                ", platform=" + platform +
+                ", status=" + status +
+                ", endDate=" + endDate +
+                ", payType=" + payType +
+                ", appId=" + appId +
+                ", productId=" + productId +
+                ", serialVersionUID=" + serialVersionUID +
+                "]";
+        return sb;
     }
 }

pdf-office-payment/src/main/java/cn/kdan/cloud/pdf/office/payment/service/impl/SubscriptionsServiceImpl.java

@@ -252,7 +252,7 @@ public class SubscriptionsServiceImpl extends ServiceImpl<SubscriptionsMapper, S
     @Override
     public List<SubscriptionsVO> getSubscriptionsByUserIdAndProductId(String userId, String productId) {
         return this.baseMapper.selectList(new LambdaQueryWrapper<Subscription>().eq(Subscription::getUserId,userId)
-                .eq(Subscription::getProductId,productId)).stream().map(subscription -> {
+                .eq(Subscription::getProductId,productId).ne(Subscription::getPayment,PaymentMethodEnum.NO_NEED_TO_PAY.getValue())).stream().map(subscription -> {
             SubscriptionsVO subscriptionsVO = new SubscriptionsVO();
             BeanUtils.copyProperties(subscription,subscriptionsVO);
             return subscriptionsVO;