|
|
|
@ -137,17 +137,18 @@ public class NodeDataPushListener {
|
|
|
|
|
PushOrderDetailEntity pushOrderDetailEntity = detailEntityMap.get(orderCode); |
|
|
|
|
String boxCodeList = pushOrderDetailEntity.getBoxCodeList(); |
|
|
|
|
JSONArray boxCodeListJson = JSONUtil.parseArray(boxCodeList); |
|
|
|
|
JSONArray details = new JSONArray(); |
|
|
|
|
// JSONArray details = new JSONArray();
|
|
|
|
|
JSONObject detail = new JSONObject(); |
|
|
|
|
boxCodeListJson.forEach(item -> { |
|
|
|
|
JSONObject jsonObject = new JSONObject(); |
|
|
|
|
jsonObject.set(item.toString(), 1); |
|
|
|
|
details.add(jsonObject); |
|
|
|
|
// JSONObject jsonObject = new JSONObject();
|
|
|
|
|
detail.set(item.toString(), 1); |
|
|
|
|
// details.add(jsonObject);
|
|
|
|
|
}); |
|
|
|
|
if (!CollUtil.contains(pushEntityMap.keySet(), orderCode)) { |
|
|
|
|
JSONObject js = new JSONObject(); |
|
|
|
|
js.set("extOrderNo", orderCode); |
|
|
|
|
js.set("extWaybillNO", mainJson.getStr("serviceNumber")); |
|
|
|
|
js.set("detail", details); |
|
|
|
|
js.set("detail", detail); |
|
|
|
|
js.set("shipNo", mainJson.getStr("waybillNumber")); |
|
|
|
|
js.set("targetNo", pushOrderEntityMap.get(orderCode).getTransportNo()); |
|
|
|
|
js.set("targetType", "1"); |
|
|
|
|