sm order

yami-shop-platform/src/main/java/com/yami/shop/platform/controller/OrderController.java

@@ -43,6 +43,8 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -219,7 +221,7 @@ public class OrderController {
         //orderParam.setHbOrderStatus(OrderStatus.CONSIGNMENT.value());
         orderParam.setUserId(order.getUserId());
         orderParam.setOrderNumber(order.getOrderNumber());
-
+        orderParam.setOrderType(order.getOrderType());
         orderService.delivery(orderParam);
         pushDeliveryInfo(orderParam);
 
@@ -246,14 +248,14 @@ public class OrderController {
         return R.SUCCESS();
     }
 
-    private void pushDeliveryInfo(Order order) {
+    private static 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", order.getDvyTime());
-            HttpUtil.post(SMConstants.SM_BASE_URL + "/api/v1/xsb/order/updateDeliveryStatus", map);
+            map.put("dvyTime", LocalDateTime.ofInstant(order.getDvyTime().toInstant(), ZoneId.systemDefault()));
+            System.out.println(HttpUtil.post(SMConstants.SM_BASE_URL + "/api/v1/xsb/order/updateDeliveryStatus", map));
         }
     }
 
@@ -389,4 +391,13 @@ public class OrderController {
         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);
+    }
 }

yami-shop-service/src/main/java/com/yami/shop/config/SMConstants.java

@@ -8,6 +8,7 @@ package com.yami.shop.config;
  */
 public class SMConstants {
 
-    public static final String SM_BASE_URL = "http://47.109.84.152:8081/smqjh-oms";
+//    public static final String SM_BASE_URL = "http://47.109.84.152:8081/smqjh-oms";
+    public static final String SM_BASE_URL = "http://192.168.0.157:8080/smqjh-oms";
 
 }