3 Commit-ok 32693e2f28 ... 2ef59ee84c

Szerző SHA1 Üzenet Dátum
  wangming 2ef59ee84c Merge remote-tracking branch 'origin/dev' into dev 1 hónapja
  wangming 1deb5c782e sm order 1 hónapja
  wangming f987c15d1c sm order 1 hónapja

+ 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;

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

@@ -12,6 +12,8 @@ public class SMOrderPo implements Serializable {
 
     private static final long serialVersionUID = 6222259729062826852L;
 
+    private Long shopId;
+
     /**
      * 订购流水号
      */
@@ -58,6 +60,10 @@ public class SMOrderPo implements Serializable {
 
     private String consigneeAddress;
 
+    private Double latitude;
+
+    private Double longitude;
+
     private List<SMOrderItemPo> orderItems;
 
 }

+ 1 - 0
yami-shop-security/yami-shop-security-platform/src/main/java/com/yami/shop/security/platform/config/ResourceServerConfiguration.java

@@ -67,6 +67,7 @@ public class ResourceServerConfiguration extends ResourceServerConfigurerAdapter
                     "/admin/enterprise/export",
                     "/platform/sku/**",
                     "/sm/order/**",
+                    "/platform/order/deliverList",
                     "/captcha.jpg").permitAll()
             .and()
             .authorizeRequests()

+ 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(0L);
+        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());