|
@@ -189,11 +189,12 @@ public class AwaitSendController {
|
|
|
*/
|
|
|
EOrderRequestData eOrderRequestData = new EOrderRequestData();
|
|
|
eOrderRequestData.ShipperCode = (post);
|
|
|
- eOrderRequestData.OrderCode = (orderId);
|
|
|
+ eOrderRequestData.OrderCode = (UUID.randomUUID().toString().replace("-", ""));
|
|
|
eOrderRequestData.PayType = (3);
|
|
|
eOrderRequestData.ExpType = ("1");
|
|
|
eOrderRequestData.Cost = (0.00);
|
|
|
eOrderRequestData.OtherCost = (0.0);
|
|
|
+ eOrderRequestData.Remark = salesId + "-" + orderId;
|
|
|
|
|
|
// 不同的快递公司需要做不同的处理
|
|
|
if (post.equalsIgnoreCase("EMS")) {
|
|
@@ -274,16 +275,12 @@ public class AwaitSendController {
|
|
|
}
|
|
|
String uuid = UUIDGenerator.getUUID().substring(0, 8);
|
|
|
|
|
|
- LOGGER.info("===salesId:" + salesId + "uuid:"+uuid);
|
|
|
-
|
|
|
Map<String, Object> product1 = new HashMap<String, Object>();
|
|
|
product1.put("GoodsName", uuid);
|
|
|
product1.put("Goodsquantity", Goodsquantity);
|
|
|
// 计算产品重量
|
|
|
product1.put("GoodsWeight", colorIsWeight/1000);
|
|
|
|
|
|
- LOGGER.info("===salesId:" + salesId + "重量:" + colorIsWeight/1000);
|
|
|
-
|
|
|
commodity.add(product1);
|
|
|
|
|
|
eOrderRequestData.Commodity = (commodity);
|
|
@@ -299,6 +296,7 @@ public class AwaitSendController {
|
|
|
json = json.replace(uuid, goodName);
|
|
|
// 获取电子面单成功
|
|
|
String code = jsonObject.getJSONObject("Order").getString("LogisticCode");
|
|
|
+
|
|
|
// 订单发货
|
|
|
SalesOrder salesOrder = new SalesOrder();
|
|
|
salesOrder.setSalesPostFirm(eOrderRequestData.ShipperCode);
|