github
/
jeecg-boot
mirror of https://github.com/jeecgboot/jeecg-boot
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update Shouman order creation request according to provider's demand

pull/8040/head
Qiuyi LI 2024-03-05 15:32:42 +01:00
parent 32c09f5bc9
commit 4a7e8bdce8
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/shouman/OrderCreationRequestBody.java
View File

@ -10,8 +10,6 @@ import java.math.BigDecimal;
import java.util.Calendar; import java.util.Calendar;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@Data @Data
public class OrderCreationRequestBody implements RequestBody { public class OrderCreationRequestBody implements RequestBody {
@ -25,6 +23,7 @@ public class OrderCreationRequestBody implements RequestBody {
private final static String CUSTOM = "定制"; private final static String CUSTOM = "定制";
private final static String QUOTE = ":"; private final static String QUOTE = ":";
private final static String WIA = "维亚智通"; private final static String WIA = "维亚智通";
private final static String TRANSACTION_NUMBER = "交易号";
public OrderCreationRequestBody(List<ShoumanOrderContent> orderContents, Map<String, Country> countryMap) { public OrderCreationRequestBody(List<ShoumanOrderContent> orderContents, Map<String, Country> countryMap) {
this.orderContents = orderContents; this.orderContents = orderContents;
@ -41,13 +40,14 @@ public class OrderCreationRequestBody implements RequestBody {
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
// TODO: 2023/11/29 Change to real address // TODO: 2023/11/29 Change to real address
ShoumanOrderContent anyContent = orderContents.get(0); ShoumanOrderContent anyContent = orderContents.get(0);
putNonNull(json, "address", anyContent.getPostcode()); putNonNull(json, "address", "收货人：王生 收货地址： 广东省东镇芦莞市寮步溪二路40号汇元佳科技园二栋10楼公司前台 手机：17633551138");
putNonNull(json, "addressee", anyContent.getRecipient()); putNonNull(json, "addressee", "王生");
putNonNull(json, "city", anyContent.getCity()); putNonNull(json, "city", "东莞市");
String countryName = anyContent.getCountry(); String countryName = anyContent.getCountry();
Country country = countryMap.get(countryName); Country country = countryMap.get(countryName);
putNonNull(json, "country", country.getNameZh()); putNonNull(json, "country", "CHINA");
putNonNull(json, "countryCode", country.getCode()); putNonNull(json, "countryCode", "CN");
// TODO: 2023/11/29 Change to real address
putNonNull(json, "orderId", anyContent.getPlatformOrderId()); putNonNull(json, "orderId", anyContent.getPlatformOrderId());
JSONArray outboundInfos = new JSONArray(); JSONArray outboundInfos = new JSONArray();
BigDecimal totalPrice = BigDecimal.ZERO; BigDecimal totalPrice = BigDecimal.ZERO;
@ -60,7 +60,7 @@ public class OrderCreationRequestBody implements RequestBody {
totalPrice = totalPrice.add(price); totalPrice = totalPrice.add(price);
putNonNull(contentJson, "theImagePath", content.getImageUrl()); putNonNull(contentJson, "theImagePath", content.getImageUrl());
putNonNull(contentJson, "comment", generateRemark(content.getRemark(), content.getCustomizationData(), putNonNull(contentJson, "comment", generateRemark(content.getRemark(), content.getCustomizationData(),
content.getContentRecRegex(), content.getContentExtRegex())); content.getContentRecRegex(), content.getContentExtRegex(), content.getPlatformOrderNumber()));
putNonNull(contentJson, "sku", content.getSku()); putNonNull(contentJson, "sku", content.getSku());
putNonNull(contentJson, "outboundNumder", content.getQuantity()); // Typo intended putNonNull(contentJson, "outboundNumder", content.getQuantity()); // Typo intended
outboundInfos.add(contentJson); outboundInfos.add(contentJson);
@ -70,7 +70,8 @@ public class OrderCreationRequestBody implements RequestBody {
return json; return json;
} }
private String generateRemark(String baseRemark, String customizationData, String contentRecRegex, String contentExtRegex) { private String generateRemark(String baseRemark, String customizationData, String contentRecRegex, String contentExtRegex,
String platformOrderNumber) {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
String[] baseRemarks = baseRemark.split(DEFAULT_SPLIT); String[] baseRemarks = baseRemark.split(DEFAULT_SPLIT);
for (String remark : baseRemarks) { for (String remark : baseRemarks) {
@ -91,6 +92,9 @@ public class OrderCreationRequestBody implements RequestBody {
.append(LINE_BREAK); .append(LINE_BREAK);
} }
} }
sb.append(TRANSACTION_NUMBER)
.append(platformOrderNumber)
.append(LINE_BREAK);
Calendar instance = Calendar.getInstance(); Calendar instance = Calendar.getInstance();
// Add date (format MM-dd) and company name at the end // Add date (format MM-dd) and company name at the end
sb.append(WIA) sb.append(WIA)