wangming 1 өдөр өмнө
parent
commit
1deb5c782e

+ 4 - 0
yami-shop-bean/src/main/java/com/yami/shop/bean/model/Order.java

@@ -157,6 +157,10 @@ public class Order implements Serializable {
 
     private String consigneeAddress;
 
+    private Double latitude;
+
+    private Double longitude;
+
     @TableField(exist = false)
     @ApiModelProperty("拆单操作人名称")
     private String splitUserName;

+ 4 - 0
yami-shop-bean/src/main/java/com/yami/shop/bean/po/SMOrderPo.java

@@ -60,6 +60,10 @@ public class SMOrderPo implements Serializable {
 
     private String consigneeAddress;
 
+    private Double latitude;
+
+    private Double longitude;
+
     private List<SMOrderItemPo> orderItems;
 
 }

+ 3 - 1
yami-shop-service/src/main/java/com/yami/shop/service/impl/OrderServiceImpl.java

@@ -2502,7 +2502,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     @Transactional(rollbackFor = Exception.class)
     public String addSMOrder(SMOrderPo orderPo) {
         Order order = new Order();
-        order.setShopId(orderPo.getShopId());
+        order.setShopId(orderPo.getShopId() == null ? 0L : orderPo.getShopId());
         order.setChannelId(0L);
         order.setUserId("");
         order.setOrderNumber(orderPo.getOrderNumber());
@@ -2524,6 +2524,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         order.setConsigneeName(orderPo.getConsigneeName());
         order.setConsigneeMobile(orderPo.getConsigneeMobile());
         order.setConsigneeAddress(orderPo.getConsigneeAddress());
+        order.setLatitude(orderPo.getLatitude());
+        order.setLongitude(orderPo.getLongitude());
         order.setOffsetPoints(orderPo.getOffsetPoints());
         List<SMOrderItemPo> orderItems = orderPo.getOrderItems();
         List<String> list = orderItems.stream().map(SMOrderItemPo::getSkuName).collect(Collectors.toList());