zl-1-12-后端

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/service/impl/ProductBaseServiceImpl.java

@@ -88,7 +88,7 @@ import java.util.stream.Collectors;
 @Slf4j
 @RequiredArgsConstructor
 @Service
-public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, ProductBase> implements IProductBaseService {
+public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, ProductBase> implements IProductBaseService,ApplicationRunner {
 
     //产品基础信息Mapper
     private final ProductBaseMapper baseMapper;

ruoyi-modules/ruoyi-product/src/main/resources/mapper/product/ProductBaseMapper.xml

@@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN product_category tc ON b.top_category_id = tc.id AND tc.del_flag = '0'
         LEFT JOIN product_category mc ON b.medium_category_id = mc.id AND mc.del_flag = '0'
         LEFT JOIN product_category bc ON b.bottom_category_id = bc.id AND bc.del_flag = '0'
-        LEFT JOIN product_gift_category_link gcl ON b.id = gcl.product_id AND gcl.del_flag = '0'
+        LEFT JOIN product_gift_category_link gcl ON b.product_no = gcl.product_no AND gcl.del_flag = '0'
         <where>
             b.del_flag = '0'
             <if test="bo.keyword != null and bo.keyword != ''">

ruoyi-modules/ruoyi-product/src/main/resources/mapper/product/ProductIndustrialFloorLinkMapper.xml

@@ -19,9 +19,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             l.tenant_id,
             p.item_name,
             p.product_image,
-            p.min_selling_price
+            pi.min_selling_price
         FROM product_industrial_floor_link l
         LEFT JOIN product_base p ON l.product_id = p.id
+        LEFT JOIN product_price_inventory pi ON p.id = pi.product_id
         <where>
             l.del_flag = '0'
             <if test="floorId != null">