sm order

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;
+
     /**
      * 订购流水号
      */

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()

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());
         order.setChannelId(0L);
         order.setUserId("");
         order.setOrderNumber(orderPo.getOrderNumber());