|
@@ -184,31 +184,31 @@ public class AwaitSendController {
|
|
|
* 组装数据
|
|
|
*/
|
|
|
EOrderRequestData eOrderRequestData = new EOrderRequestData();
|
|
|
- eOrderRequestData.setShipperCode(post);
|
|
|
- eOrderRequestData.setOrderCode(orderId);
|
|
|
- eOrderRequestData.setPayType(3);
|
|
|
- eOrderRequestData.setExpType("1");
|
|
|
- eOrderRequestData.setCost(0.00);
|
|
|
- eOrderRequestData.setOtherCost(0.0);
|
|
|
+ eOrderRequestData.ShipperCode = (post);
|
|
|
+ eOrderRequestData.OrderCode = (orderId);
|
|
|
+ eOrderRequestData.PayType = (3);
|
|
|
+ eOrderRequestData.ExpType = ("1");
|
|
|
+ eOrderRequestData.Cost = (0.00);
|
|
|
+ eOrderRequestData.OtherCost = (0.0);
|
|
|
|
|
|
|
|
|
if (post.equalsIgnoreCase("EMS")) {
|
|
|
|
|
|
- eOrderRequestData.setCustomerName("90000009971400");
|
|
|
- eOrderRequestData.setCustomerPwd("90000009971400");
|
|
|
+ eOrderRequestData.CustomerName = ("90000009971400");
|
|
|
+ eOrderRequestData.CustomerPwd = ("90000009971400");
|
|
|
} else if (post.equalsIgnoreCase("SF")) {
|
|
|
|
|
|
- eOrderRequestData.setMonthCode("7690035114");
|
|
|
+ eOrderRequestData.MonthCode = ("7690035114");
|
|
|
} else if (post.equalsIgnoreCase("YZBK")) {
|
|
|
|
|
|
} else if (post.equalsIgnoreCase("STO")) {
|
|
|
|
|
|
- eOrderRequestData.setCustomerName("爱贝源");
|
|
|
- eOrderRequestData.setCustomerPwd("Iamberry321.");
|
|
|
- eOrderRequestData.setSendSite("广东东莞公司");
|
|
|
+ eOrderRequestData.CustomerName = ("爱贝源");
|
|
|
+ eOrderRequestData.CustomerPwd = ("Iamberry321.");
|
|
|
+ eOrderRequestData.SendSite = ("广东东莞公司");
|
|
|
} else if (post.equalsIgnoreCase("DBL")) {
|
|
|
|
|
|
- eOrderRequestData.setCustomerName("651476854");
|
|
|
+ eOrderRequestData.CustomerName = ("651476854");
|
|
|
}
|
|
|
|
|
|
String[] addrs = salesOrderInfo.getSalesAddressInfo().split("-");
|
|
@@ -233,7 +233,7 @@ public class AwaitSendController {
|
|
|
Receiver.put("ExpAreaName", addrs[2]);
|
|
|
Receiver.put("Address", salesOrderInfo.getSalesAddressInfo());
|
|
|
Receiver.put("PostCode", PostCode);
|
|
|
- eOrderRequestData.setReceiver(Receiver);
|
|
|
+ eOrderRequestData.Receiver = (Receiver);
|
|
|
|
|
|
Map<String, Object> Sender = new HashMap<String, Object>();
|
|
|
Sender.put("Name", storeShip.getStoreShipName());
|
|
@@ -243,7 +243,7 @@ public class AwaitSendController {
|
|
|
Sender.put("ExpAreaName", "清溪镇");
|
|
|
Sender.put("Address", storeShip.getStoreShipAddress());
|
|
|
Sender.put("PostCode", "523660");
|
|
|
- eOrderRequestData.setSender(Sender);
|
|
|
+ eOrderRequestData.Sender = (Sender);
|
|
|
|
|
|
List<Map<String, Object>> Commodity = new ArrayList<>();
|
|
|
SalesOrderItem item = new SalesOrderItem();
|
|
@@ -267,11 +267,10 @@ public class AwaitSendController {
|
|
|
product1.put("GoodsWeight", colorIsWeight/1000);
|
|
|
Commodity.add(product1);
|
|
|
|
|
|
- eOrderRequestData.setCommodity(Commodity);
|
|
|
- eOrderRequestData.setWeight(colorIsWeight/1000);
|
|
|
- eOrderRequestData.setQuantity(1);
|
|
|
- eOrderRequestData.setIsReturnPrintTemplate(1);
|
|
|
-
|
|
|
+ eOrderRequestData.Commodity = (Commodity);
|
|
|
+ eOrderRequestData.Weight = (colorIsWeight/1000);
|
|
|
+ eOrderRequestData.Quantity = (1);
|
|
|
+ eOrderRequestData.IsReturnPrintTemplate = (1);
|
|
|
try {
|
|
|
String json = OrderUtils.orderOnlineByJson(eOrderRequestData);
|
|
|
JSONObject jsonObject = JSONObject.parseObject(json);
|
|
@@ -314,6 +313,7 @@ public class AwaitSendController {
|
|
|
}
|
|
|
return ResponseJson.getSUCCESS().addResponseKeyValue("json", json);
|
|
|
} catch (Exception e) {
|
|
|
+ LOGGER.error("", e);
|
|
|
return ResponseJson.getFAILURE().addResponseKeyValue("error", e.getMessage());
|
|
|
}
|
|
|
}
|