|
|
@@ -248,13 +248,18 @@ public class OrderController {
|
|
|
return R.SUCCESS();
|
|
|
}
|
|
|
|
|
|
- private static void pushDeliveryInfo(Order order) {
|
|
|
+ private void pushDeliveryInfo(Order order) {
|
|
|
if (order.getOrderType().equals(4)) {
|
|
|
Map<Object, Object> map = new LinkedTreeMap<>();
|
|
|
map.put("orderNumber", order.getOrderNumber());
|
|
|
map.put("dvyId", order.getDvyId());
|
|
|
map.put("dvyFlowId", order.getDvyFlowId());
|
|
|
map.put("dvyTime", LocalDateTime.ofInstant(order.getDvyTime().toInstant(), ZoneId.systemDefault()));
|
|
|
+ Delivery delivery = deliveryService.getById(order.getDvyId());
|
|
|
+ if (delivery!=null){
|
|
|
+ map.put("dvyNo", delivery.getDvyNo());
|
|
|
+ map.put("dvyName", delivery.getDvyName());
|
|
|
+ }
|
|
|
System.out.println(HttpUtil.post(SMConstants.SM_BASE_URL + "/api/v1/xsb/order/updateDeliveryStatus", map));
|
|
|
}
|
|
|
}
|
|
|
@@ -392,14 +397,4 @@ public class OrderController {
|
|
|
orderService.deleteTempSubOrder(subOrderNumber);
|
|
|
return R.SUCCESS();
|
|
|
}
|
|
|
-
|
|
|
- public static void main(String[] args) {
|
|
|
- Order order = new Order();
|
|
|
- order.setOrderNumber("WM20251231210408173");
|
|
|
- order.setDvyFlowId("WM20251231210408173");
|
|
|
- order.setDvyId(1L);
|
|
|
- order.setDvyTime(new Date());
|
|
|
- order.setOrderType(4);
|
|
|
- pushDeliveryInfo(order);
|
|
|
- }
|
|
|
}
|