Merge remote-tracking branch 'origin/dev' into zs

src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProduct.java

@@ -135,6 +135,7 @@ public class TbProduct implements Serializable {
     private String groupCategoryId;
 
     private Integer stockNumber;
+    private Integer suit;
 
 
     public String getImages() {
@@ -663,4 +664,12 @@ public class TbProduct implements Serializable {
     public Integer getStockNumber() {
         return this.stockNumber;
     }
+
+    public Integer getSuit() {
+        return suit;
+    }
+
+    public void setSuit(Integer suit) {
+        this.suit = suit;
+    }
 }

src/main/resources/mapper/TbProductMapper.xml

@@ -920,10 +920,19 @@
   </update>
 
   <select id="selectByIdIn" resultMap="BaseResultMap">
-    select *
+    select min( sku.suit ) as suit,tb.*
-    from tb_product
+    from tb_product tb
-    where id in (${ids}) and is_show_mall =1 order by  sort asc
+           LEFT JOIN tb_product_sku sku ON tb.id = sku.product_id
-    </select>
+    where tb.id in (${ids}) and is_show_mall =1 and sku.is_del = 0
+    group by tb.id
+    order by tb.sort asc
+  </select>
+
+<!--  <select id="selectByIdIn" resultMap="BaseResultMap">-->
+<!--    select *-->
+<!--    from tb_product-->
+<!--    where id in (${ids}) and is_show_mall =1 order by  sort asc-->
+<!--    </select>-->
   <select id="selectById" resultType="com.chaozhanggui.system.cashierservice.entity.TbProduct">
     select
     <include refid="Base_Column_List" />