Merge branch 'refs/heads/feat/sku-count' into test

src/main/java/com/sqx/modules/order/controller/query/GoodsSkuQuery.java

@@ -18,6 +18,9 @@ public class GoodsSkuQuery extends PageQuery {
     @ApiModelProperty(value = "店铺id")
     private Long shopId;
 
+    @ApiModelProperty(value = "店铺名称")
+    private String shopName;
+
     @ApiModelProperty(value = "sku信息 模糊查询")
     private String skuName;
 

src/main/resources/mapper/order/OrderMapper.xml

@@ -781,6 +781,9 @@
             <if test="query.shopId != null">
                 AND t.shop_id = #{query.shopId}
             </if>
+            <if test="query.shopName != null and query.shopName != ''">
+                AND gs.shop_name like concat('%', #{query.shopName}, '%')
+            </if>
             <if test="query.skuName != null and query.skuName != ''">
                 AND (og.sku_message like concat('%',#{query.skuName},'%') or og.goods_name like concat('%',#{query.skuName},'%'))
             </if>