diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/shouman/OrderCreationRequestBody.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/shouman/OrderCreationRequestBody.java index 8f796bc26..2ae59d7ee 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/shouman/OrderCreationRequestBody.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/shouman/OrderCreationRequestBody.java @@ -24,6 +24,7 @@ public class OrderCreationRequestBody implements RequestBody { private final static String QUOTE = ":"; private final static String WIA = "维亚智通"; private final static String TRANSACTION_NUMBER = "交易号"; + private final static String SHOP_CODE = "店铺名称"; public OrderCreationRequestBody(List orderContents, Map countryMap) { this.orderContents = orderContents; @@ -60,7 +61,8 @@ public class OrderCreationRequestBody implements RequestBody { totalPrice = totalPrice.add(price); putNonNull(contentJson, "theImagePath", content.getImageUrl()); putNonNull(contentJson, "comment", generateRemark(content.getRemark(), content.getCustomizationData(), - content.getContentRecRegex(), content.getContentExtRegex(), content.getPlatformOrderNumber())); + content.getContentRecRegex(), content.getContentExtRegex(), content.getShopErpCode(), + content.getPlatformOrderNumber())); putNonNull(contentJson, "sku", content.getSku()); putNonNull(contentJson, "outboundNumder", content.getQuantity()); // Typo intended outboundInfos.add(contentJson); @@ -71,7 +73,7 @@ public class OrderCreationRequestBody implements RequestBody { } private String generateRemark(String baseRemark, String customizationData, String contentRecRegex, String contentExtRegex, - String platformOrderNumber) { + String shopErpCode, String platformOrderNumber) { StringBuilder sb = new StringBuilder(); String[] baseRemarks = baseRemark.split(DEFAULT_SPLIT); for (String remark : baseRemarks) { @@ -92,6 +94,9 @@ public class OrderCreationRequestBody implements RequestBody { .append(LINE_BREAK); } } + sb.append(SHOP_CODE) + .append(shopErpCode) + .append(LINE_BREAK); sb.append(TRANSACTION_NUMBER) .append(platformOrderNumber) .append(LINE_BREAK); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/ShoumanOrderContent.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/ShoumanOrderContent.java index 906977129..426708733 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/ShoumanOrderContent.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/ShoumanOrderContent.java @@ -7,6 +7,7 @@ import java.math.BigDecimal; @Data public class ShoumanOrderContent { + private String shopErpCode; private String platformOrderId; private String platformOrderNumber; private String postcode; @@ -24,10 +25,12 @@ public class ShoumanOrderContent { private String imageUrl; private String sku; - public ShoumanOrderContent(String platformOrderId, String platformOrderNumber, String postcode, String recipient, - String city, String country, String platformOrderContentId, String customizationData, - Integer quantity, String productName, String remark, String contentRecRegex, - String contentExtRegex, BigDecimal price, String imageUrl, String sku) { + public ShoumanOrderContent(String shopErpCode, String platformOrderId, String platformOrderNumber, String postcode, + String recipient, String city, String country, String platformOrderContentId, + String customizationData, Integer quantity, String productName, String remark, + String contentRecRegex, String contentExtRegex, BigDecimal price, String imageUrl, + String sku) { + this.shopErpCode = shopErpCode; this.platformOrderId = platformOrderId; this.platformOrderNumber = platformOrderNumber; this.postcode = postcode; @@ -49,6 +52,7 @@ public class ShoumanOrderContent { @Override public String toString() { return "ShoumanOrderContent{" + + "shopErpCode='" + shopErpCode + '\'' + "platformOrderId='" + platformOrderId + '\'' + "platformOrderNumber='" + platformOrderNumber + '\'' + ", postcode='" + postcode + '\'' + diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderContentMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderContentMapper.xml index ff9969480..1ff3717e9 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderContentMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderContentMapper.xml @@ -362,7 +362,8 @@