特殊供应商

src/main/java/com/caimei365/order/model/vo/CartShopVo.java

@@ -14,6 +14,7 @@ import java.util.List;
 @Data
 public class CartShopVo implements Serializable {
     private static final long serialVersionUID = 1L;
+    private Integer shopType;
     /**
      * 供应商Id
      */

src/main/java/com/caimei365/order/model/vo/ShopOrderVo.java

@@ -15,6 +15,8 @@ import java.util.List;
 @Data
 public class ShopOrderVo implements Serializable {
     private static final long serialVersionUID = 1L;
+
+    private Integer shopType;
     /**
      * 子订单ID
      */

src/main/resources/mapper/CartClubMapper.xml

@@ -6,7 +6,8 @@
         SELECT DISTINCT
             c.shopID AS shopId,
             s.name AS shopName,
-            s.logo AS shopLogo
+            s.logo AS shopLogo,
+            s.shopType as shopType
         FROM cm_cart c
         LEFT JOIN shop s ON c.shopID = s.shopID
         WHERE c.userID = #{userId}
@@ -17,7 +18,8 @@
         SELECT DISTINCT
             c.shopID AS shopId,
             s.name AS shopName,
-            s.logo AS shopLogo
+            s.logo AS shopLogo,
+            s.shopType as shopType
         FROM cm_cart c
         LEFT JOIN shop s ON c.shopID = s.shopID
         WHERE c.userID = #{userId}

src/main/resources/mapper/OrderCommonMapper.xml

@@ -33,7 +33,8 @@
         cso.splitFlag,
         cso.sendOutStatus,
         s.name AS shopName,
-        s.logo AS shopLogo
+        s.logo AS shopLogo,
+        s.shopType as shopType
         FROM cm_shop_order cso
         LEFT JOIN shop s ON cso.shopID = s.shopID
         WHERE cso.delFlag = 0