diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/vo/ProductVO.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/vo/ProductVO.java index ad9128139..a1d1db1e1 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/vo/ProductVO.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/vo/ProductVO.java @@ -124,8 +124,8 @@ public class ProductVO extends BaseAudit { @Schema(description = "商品类型 1.团购;->2.拼团;3->秒杀") private Integer type; - @Schema(description = "配送方式 1->到店核销;2->自提;3->配送;") - private Integer distribution; +// @Schema(description = "配送方式 1->到店核销;2->自提;3->配送;") +// private Integer distribution; @Schema(description = "描述") private String describe; diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/impl/ProductServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/impl/ProductServiceImpl.java index 615c9d48e..abec44cc1 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/impl/ProductServiceImpl.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/impl/ProductServiceImpl.java @@ -45,7 +45,8 @@ public class ProductServiceImpl extends ServiceImpl impl public IPage getList(ProductBo query, Page page) { Long tenantId = Long.valueOf(LoginHelper.getTenantId()); - return productMapper.getlist(page,query,tenantId); + IPage getlist = productMapper.getlist(page, query, tenantId); + return getlist; } diff --git a/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/ProductMapper.xml b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/ProductMapper.xml index 8bf5bf781..bb171879b 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/ProductMapper.xml +++ b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/ProductMapper.xml @@ -63,7 +63,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" b.logo AS brandLogo, t.store_name AS contactUserName, t.contact_phone AS contactPhone, - o.distribution AS distribution, pc.name AS productCategoryName, s.id AS sku_id, s.out_sku_id, @@ -76,8 +75,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" pms_product p LEFT JOIN pms_brand b ON p.brand_id = b.id LEFT JOIN sys_tenant t ON p.tenant_id = t.tenant_id - LEFT JOIN oms_order_item oi ON p.id = oi.product_id - LEFT JOIN oms_order o ON oi.order_id = o.id LEFT JOIN pms_product_category pc ON p.category_id = pc.id LEFT JOIN pms_sku s ON p.id = s.product_id WHERE 1=1 diff --git a/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/SkuMapper.xml b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/SkuMapper.xml index 36ddb8588..1f12f4cb7 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/SkuMapper.xml +++ b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/SkuMapper.xml @@ -60,6 +60,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND p.name LIKE CONCAT('%', #{query.productName}, '%') + + AND p.id = #{query.productId} + AND s.out_sku_id LIKE CONCAT('%', #{query.outSkuId}, '%')