Skip to content

Commit 878f453

Browse files
chenquan-didichenquan-didi
committed
chore: 调整错误的命名
1 parent 542e977 commit 878f453

37 files changed

+209
-154
lines changed

‎ddes-open-sdk/src/main/java/com/xiaoju/open/sdk/didies/ApiClient.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import com.xiaoju.open.sdk.didies.service.regulation.Regulation;
2121
import com.xiaoju.open.sdk.didies.service.role.Role;
2222
import com.xiaoju.open.sdk.didies.service.traveler.Traveler;
23-
import com.xiaoju.open.sdk.didies.service.workspace.Workspace;
23+
import com.xiaoju.open.sdk.didies.service.workplace.Workplace;
2424
import lombok.Getter;
2525

2626
/**
@@ -189,12 +189,12 @@ public Traveler traveler() {
189189
return new Traveler(tokenHolder, config);
190190
}
191191
/**
192-
* 获取Workspace
192+
* 获取Workplace
193193
*
194-
* @return Workspace
194+
* @return Workplace
195195
*/
196-
public Workspace workspace() {
197-
return new Workspace(tokenHolder, config);
196+
public Workplace workplace() {
197+
return new Workplace(tokenHolder, config);
198198
}
199199

200200
}

‎ddes-open-sdk/src/main/java/com/xiaoju/open/sdk/didies/core/Config.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public class Config {
9191
/**
9292
* AES加密长度，默认AES128
9393
*/
94-
final private EncryptTypeEnum encryptType = EncryptTypeEnum.NORMAL;
94+
private EncryptTypeEnum encryptType = EncryptTypeEnum.NORMAL;
9595

9696
/**
9797
* 获取httpTransport

‎ddes-open-sdk/src/main/java/com/xiaoju/open/sdk/didies/service/approval/v1/model/PassengerInfo.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class PassengerInfo {
3535
*
3636
*/
3737
@JsonProperty("passenger_type")
38-
private String passengerType;
38+
private Integer passengerType;
3939
/**
4040
* employeeNumber
4141
*

‎ddes-open-sdk/src/main/java/com/xiaoju/open/sdk/didies/service/approval/v1/model/TravelCity.java‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,35 @@ public class TravelCity {
2828
*/
2929
@JsonProperty("name")
3030
private String name;
31+
/**
32+
* 目的地维度 默认0; 1：国家；2：省；0：城市(包括县级市)
33+
*
34+
*/
35+
@JsonProperty("address_dimension")
36+
private Integer addressDimension;
37+
/**
38+
* 出发国家ID
39+
*
40+
*/
41+
@JsonProperty("country_id")
42+
private Integer countryId;
43+
/**
44+
* 出发国家名称
45+
*
46+
*/
47+
@JsonProperty("country_name")
48+
private String countryName;
49+
/**
50+
* 出发省ID
51+
*
52+
*/
53+
@JsonProperty("province_id")
54+
private Integer provinceId;
55+
/**
56+
* 出发省名称
57+
*
58+
*/
59+
@JsonProperty("province_name")
60+
private String provinceName;
3161
}
3262

‎ddes-open-sdk/src/main/java/com/xiaoju/open/sdk/didies/service/approval/v1/model/Trip.java‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,5 +72,65 @@ public class Trip {
7272
*/
7373
@JsonProperty("is_return")
7474
private Integer isReturn;
75+
/**
76+
* 出发地维度 默认0; 1：国家；2：省；0：城市(包括县级市)
77+
*
78+
*/
79+
@JsonProperty("departure_address_dimension")
80+
private Integer departureAddressDimension;
81+
/**
82+
* 出发国家ID
83+
*
84+
*/
85+
@JsonProperty("departure_country_id")
86+
private Integer departureCountryId;
87+
/**
88+
* 出发国家名称
89+
*
90+
*/
91+
@JsonProperty("departure_country_name")
92+
private String departureCountryName;
93+
/**
94+
* 出发省ID
95+
*
96+
*/
97+
@JsonProperty("departure_province_id")
98+
private Integer departureProvinceId;
99+
/**
100+
* 出发省名称
101+
*
102+
*/
103+
@JsonProperty("departure_province_name")
104+
private String departureProvinceName;
105+
/**
106+
* 目的地维度 默认0; 1：国家；2：省；0：城市(包括县级市) 地址维度字段
107+
*
108+
*/
109+
@JsonProperty("destination_address_dimension")
110+
private Integer destinationAddressDimension;
111+
/**
112+
* 到达国家ID
113+
*
114+
*/
115+
@JsonProperty("destination_country_id")
116+
private Integer destinationCountryId;
117+
/**
118+
* 到达国家名称
119+
*
120+
*/
121+
@JsonProperty("destination_country_name")
122+
private String destinationCountryName;
123+
/**
124+
* 到达省ID
125+
*
126+
*/
127+
@JsonProperty("destination_province_id")
128+
private Integer destinationProvinceId;
129+
/**
130+
* 到达省名称
131+
*
132+
*/
133+
@JsonProperty("destination_province_name")
134+
private String destinationProvinceName;
75135
}
76136

‎ddes-open-sdk/src/main/java/com/xiaoju/open/sdk/didies/service/bill/v1/model/GetNotGenBillDetailOfInterFlightRequest.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
package com.xiaoju.open.sdk.didies.service.bill.v1.model;
22

3-
import com.fasterxml.jackson.annotation.JsonInclude;
43
import com.fasterxml.jackson.annotation.JsonProperty;
5-
import com.fasterxml.jackson.annotation.JsonCreator;
6-
import com.fasterxml.jackson.annotation.JsonTypeName;
7-
import com.fasterxml.jackson.annotation.JsonValue;
84
import com.xiaoju.open.sdk.didies.core.model.BaseReq;
9-
import com.fasterxml.jackson.annotation.JsonProperty;
105
import lombok.AllArgsConstructor;
116
import lombok.Data;
127
import lombok.EqualsAndHashCode;

‎ddes-open-sdk/src/main/java/com/xiaoju/open/sdk/didies/service/bill/v1/model/GetNotGenBillDetailOfInterHotelApiReply.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
package com.xiaoju.open.sdk.didies.service.bill.v1.model;
22

3-
import com.fasterxml.jackson.annotation.JsonInclude;
43
import com.fasterxml.jackson.annotation.JsonProperty;
5-
import com.fasterxml.jackson.annotation.JsonCreator;
6-
import com.fasterxml.jackson.annotation.JsonTypeName;
7-
import com.fasterxml.jackson.annotation.JsonValue;
8-
import com.xiaoju.open.sdk.didies.service.bill.v1.model.GetNotGenBillDetailOfInterHotelReply;
94
import com.xiaoju.open.sdk.didies.core.model.BaseResp;
10-
import com.fasterxml.jackson.annotation.JsonProperty;
115
import lombok.AllArgsConstructor;
126
import lombok.Data;
137
import lombok.EqualsAndHashCode;

‎ddes-open-sdk/src/main/java/com/xiaoju/open/sdk/didies/service/bill/v1/model/GetNotGenBillDetailOfInterHotelReply.java‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
11
package com.xiaoju.open.sdk.didies.service.bill.v1.model;
22

3+
import com.fasterxml.jackson.annotation.JsonInclude;
4+
import com.fasterxml.jackson.annotation.JsonProperty;
5+
import com.fasterxml.jackson.annotation.JsonCreator;
6+
import com.fasterxml.jackson.annotation.JsonTypeName;
7+
import com.fasterxml.jackson.annotation.JsonValue;
8+
import com.xiaoju.open.sdk.didies.service.bill.v1.model.NotGenBDOfOverseasHotelItem;
9+
import java.util.ArrayList;
10+
import java.util.List;
311
import com.fasterxml.jackson.annotation.JsonProperty;
412
import lombok.AllArgsConstructor;
513
import lombok.Data;
14+
import lombok.EqualsAndHashCode;
615
import lombok.NoArgsConstructor;
716
import lombok.experimental.SuperBuilder;
817

9-
import java.util.List;
10-
1118

1219

1320

‎ddes-open-sdk/src/main/java/com/xiaoju/open/sdk/didies/service/bill/v1/model/GetNotGenBillDetailOfInterHotelRequest.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
package com.xiaoju.open.sdk.didies.service.bill.v1.model;
22

3-
import com.fasterxml.jackson.annotation.JsonInclude;
43
import com.fasterxml.jackson.annotation.JsonProperty;
5-
import com.fasterxml.jackson.annotation.JsonCreator;
6-
import com.fasterxml.jackson.annotation.JsonTypeName;
7-
import com.fasterxml.jackson.annotation.JsonValue;
84
import com.xiaoju.open.sdk.didies.core.model.BaseReq;
9-
import com.fasterxml.jackson.annotation.JsonProperty;
105
import lombok.AllArgsConstructor;
116
import lombok.Data;
127
import lombok.EqualsAndHashCode;

‎ddes-open-sdk/src/main/java/com/xiaoju/open/sdk/didies/service/bill/v1/model/GetNotGenBillDetailOfManualOrderReply.java‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,13 @@
11
package com.xiaoju.open.sdk.didies.service.bill.v1.model;
22

3-
import com.fasterxml.jackson.annotation.JsonInclude;
4-
import com.fasterxml.jackson.annotation.JsonProperty;
5-
import com.fasterxml.jackson.annotation.JsonCreator;
6-
import com.fasterxml.jackson.annotation.JsonTypeName;
7-
import com.fasterxml.jackson.annotation.JsonValue;
8-
import com.xiaoju.open.sdk.didies.service.bill.v1.model.NotGenBDOfManualOrderItem;
9-
import java.util.ArrayList;
10-
import java.util.List;
113
import com.fasterxml.jackson.annotation.JsonProperty;
124
import lombok.AllArgsConstructor;
135
import lombok.Data;
14-
import lombok.EqualsAndHashCode;
156
import lombok.NoArgsConstructor;
167
import lombok.experimental.SuperBuilder;
178

9+
import java.util.List;
10+
1811

1912

2013

0 commit comments

Comments
 (0)