Skip to content

Commit 2189a50

Browse files
committed
对于现有string类型,不使用枚举
1 parent abd4a13 commit 2189a50

File tree

7 files changed

+38
-37
lines changed

7 files changed

+38
-37
lines changed

src/main/java/com/alipay/global/api/example/legacy/CashierPayDemoCode.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package com.alipay.global.api.example.legacy;
22

3+
import java.util.Arrays;
4+
import java.util.List;
5+
36
import com.alipay.global.api.AlipayClient;
47
import com.alipay.global.api.DefaultAlipayClient;
58
import com.alipay.global.api.example.model.Callback;
@@ -17,9 +20,6 @@
1720
import com.alipay.global.api.response.ams.pay.AlipayPayQueryResponse;
1821
import com.alipay.global.api.response.ams.pay.AlipayPayResponse;
1922

20-
import java.util.Arrays;
21-
import java.util.List;
22-
2323
/**
2424
* The demo code mainly shows how to use the API correctly and the specific implementation needs to be performed by merchants.
2525
*/
@@ -90,7 +90,7 @@ public RetryResult doProcess() {
9090
RedirectActionForm redirectActionForm = alipayPayResponse
9191
.getRedirectActionForm();
9292
String redirectUrl = redirectActionForm.getRedirectUrl();
93-
String method = redirectActionForm.getMethod().name();
93+
String method = redirectActionForm.getMethod();
9494
String parameters = redirectActionForm.getParameters();
9595
// TODO 1、Jump to the checkout page
9696
// TODO 2、Wait notify,eg: PayNotifyListener
Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
package com.alipay.global.api.model.ams;
22

3+
import java.util.List;
4+
35
import lombok.AllArgsConstructor;
46
import lombok.Builder;
57
import lombok.Data;
68
import lombok.NoArgsConstructor;
79

8-
import java.util.List;
9-
1010
@Data
1111
@Builder
1212
@AllArgsConstructor
1313
@NoArgsConstructor
1414
public class BusinessInfo {
1515

16-
private String mcc;
17-
private List<WebSite> websites;
18-
private String englishName;
19-
private String doingBusinessAs;
20-
private String mainSalesCountry;
21-
private String appName;
22-
private String serviceDescription;
16+
private String mcc;
17+
private List<WebSite> websites;
18+
private String englishName;
19+
private String doingBusinessAs;
20+
private String mainSalesCountry;
21+
private String appName;
22+
private String serviceDescription;
2323
}
Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,35 @@
11
package com.alipay.global.api.model.ams;
22

3+
import java.util.List;
4+
import java.util.Map;
5+
36
import com.alipay.global.api.model.aps.Logo;
7+
48
import lombok.AllArgsConstructor;
59
import lombok.Builder;
610
import lombok.Data;
711
import lombok.NoArgsConstructor;
812

9-
import java.util.List;
10-
import java.util.Map;
11-
1213
@Data
1314
@Builder
1415
@NoArgsConstructor
1516
@AllArgsConstructor
1617
public class PaymentOption {
1718

18-
private String paymentMethodType;
19-
private PaymentMethodCategoryType paymentMethodCategory;
20-
private List<String> paymentMethodRegion;
21-
private boolean enabled;
22-
private boolean preferred;
23-
private DisableReasonType disableReason;
19+
private String paymentMethodType;
20+
private PaymentMethodCategoryType paymentMethodCategory;
21+
private List<String> paymentMethodRegion;
22+
private boolean enabled;
23+
private boolean preferred;
24+
private String disableReason;
2425
private Map<String, AmountLimitInfo> amountLimitInfoMap;
25-
private List<String> supportedCurrencies;
26-
private PaymentOptionDetail paymentOptionDetail;
27-
private String extendInfo;
28-
private Logo logo;
29-
private List<String> promoNames;
26+
private List<String> supportedCurrencies;
27+
private PaymentOptionDetail paymentOptionDetail;
28+
private String extendInfo;
29+
private Logo logo;
30+
private List<String> promoNames;
3031

31-
private Installment installment;
32-
private List<PromotionInfo> promotionInfos;
32+
private Installment installment;
33+
private List<PromotionInfo> promotionInfos;
3334

3435
}
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package com.alipay.global.api.model.ams;
22

3+
import java.util.List;
4+
35
import lombok.AllArgsConstructor;
46
import lombok.Builder;
57
import lombok.Data;
68
import lombok.NoArgsConstructor;
79

8-
import java.util.List;
9-
1010
@Data
1111
@Builder
1212
@NoArgsConstructor
@@ -15,8 +15,8 @@ public class PaymentOptionDetail {
1515

1616
private List<SupportCardBrand> supportCardBrands;
1717

18-
private List<FundingType> funding;
18+
private List<String> funding;
1919

20-
private List<SupportBank> supportBanks;
20+
private List<SupportBank> supportBanks;
2121

2222
}

src/main/java/com/alipay/global/api/model/ams/PeriodRule.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
@AllArgsConstructor
1212
public class PeriodRule {
1313

14-
private PeriodType periodType;
14+
private String periodType;
1515

1616
private Integer periodCount;
1717

src/main/java/com/alipay/global/api/model/ams/RedirectActionForm.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
@AllArgsConstructor
1212
public class RedirectActionForm {
1313

14-
private MethodType method;
14+
private String method;
1515
private String parameters;
1616
private String redirectUrl;
1717

src/main/java/com/alipay/global/api/model/ams/SupportCardBrand.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
@AllArgsConstructor
1212
public class SupportCardBrand {
1313

14-
private CardBrandType cardBrand;
14+
private String cardBrand;
1515

16-
private Logo logo;
16+
private Logo logo;
1717

1818
}

0 commit comments

Comments
 (0)