|
@@ -115,9 +115,16 @@ public class AwaitSendController {
|
|
|
eOrderRequestData.setExpType("1");
|
|
|
eOrderRequestData.setCost(0.00);
|
|
|
eOrderRequestData.setOtherCost(0.0);
|
|
|
- if (post.equalsIgnoreCase("DBL")) {
|
|
|
- eOrderRequestData.setCustomerName("testdbl");
|
|
|
- }
|
|
|
+// if (post.equalsIgnoreCase("DBL")) {
|
|
|
+// eOrderRequestData.setCustomerName("testdbl");
|
|
|
+// }
|
|
|
+// if(post.equalsIgnoreCase("sto")){ //申通
|
|
|
+// eOrderRequestData.setCustomerName("2868442074");
|
|
|
+// }else if(post.equalsIgnoreCase("sf")){ //顺丰
|
|
|
+// eOrderRequestData.setCustomerName("7690035114");
|
|
|
+// }else if(post.equalsIgnoreCase("ems")){ //EMS
|
|
|
+// eOrderRequestData.setCustomerName("90000009971400");
|
|
|
+// }
|
|
|
// 收件人信息
|
|
|
String[] addrs = salesOrderInfo.getSalesAddressInfo().split("-");
|
|
|
if (addrs.length <= 3) {
|
|
@@ -145,7 +152,7 @@ public class AwaitSendController {
|
|
|
List<SalesOrderItem> items = salesOrderService.listSalesOrderItem(item);
|
|
|
for (SalesOrderItem temp : items) {
|
|
|
Map<String, Object> product1 = new HashMap<String, Object>();
|
|
|
- product1.put("GoodsName", temp.getItemProductName() + "(" + (temp.getItemProductColor()) + ")");
|
|
|
+ product1.put("GoodsName", temp.getProductAbbreviation() + "(" + (temp.getColorAbbreviation()) + ")*"+temp.getItemNum());
|
|
|
product1.put("GoodsWeight", 10.0);
|
|
|
Commodity.add(product1);
|
|
|
}
|