小程序获取商品关联商品和店铺的审核状态

fs-service/src/main/java/com/fs/hisStore/mapper/FsStoreCartScrmMapper.java

@@ -66,7 +66,15 @@ public interface FsStoreCartScrmMapper
      */
     public int deleteFsStoreCartByIds(Long[] ids);
 
-    @Select("select c.*,p.product_type,p.product_name,p.image as product_image,v.price,v.sku as product_attr_name,v.image as product_attr_image,v.stock from fs_store_cart_scrm c inner join fs_store_product_scrm p on p.product_id=c.product_id inner join fs_store_product_attr_value_scrm v on v.id=c.product_attr_value_id where c.is_pay=0 and c.is_del=0 and c.is_buy=0 and p.is_show=1 and p.is_del=0 and c.user_id= #{uid}")
+    @Select("select c.*,p.product_type,p.product_name,p.image as product_image," +
+            "v.price,v.sku as product_attr_name,v.image as product_attr_image,v.stock " +
+            "from fs_store_cart_scrm c " +
+            "inner join fs_store_product_scrm p on p.product_id=c.product_id " +
+            "inner join fs_store_scrm fs on fs.store_id = p.store_id and fs.is_audit = 1 " +
+            "inner join fs_store_product_attr_value_scrm v on v.id=c.product_attr_value_id " +
+            "where c.is_pay=0 and c.is_del=0 and c.is_buy=0 " +
+            "and p.is_del=0 and p.is_show=1  and p.is_audit = '1'" +
+            "and c.user_id= #{uid}")
     List<FsStoreCartVO> selectFsStoreCartListByUid(long uid);
     @Delete({"<script>"+
             "delete from fs_store_cart_scrm where id in"+

fs-service/src/main/java/com/fs/hisStore/mapper/FsStoreProductAttrValueScrmMapper.java

@@ -106,7 +106,9 @@ public interface FsStoreProductAttrValueScrmMapper
             "</script>"})
     List<FsStoreProductAttrValueVO> selectFsStoreProductAttrValueListVO(@Param("maps")FsProductAttrValueParam param);
     @Select({"<script> " +
-            "select v.*,p.product_name from fs_store_product_attr_value_scrm v inner join fs_store_product_scrm p on p.product_id=v.product_id    " +
+            "select v.*,p.product_name from fs_store_product_attr_value_scrm v " +
+            "inner join fs_store_product_scrm p on p.product_id=v.product_id    " +
+            "inner join fs_store_scrm fs on fs.store_id = p.store_id and fs.is_audit = 1 " +
             "where p.is_show=1 and p.is_display=1 and (v.brokerage &gt;0 || v.brokerage_two &gt;0) " +
             "<if test = 'maps.productName != null and  maps.productName !=\"\"    '> " +
             "and p.product_name like CONCAT('%',#{maps.productName},'%') " +

fs-service/src/main/java/com/fs/hisStore/mapper/FsStoreProductScrmMapper.java

@@ -134,7 +134,9 @@ public interface FsStoreProductScrmMapper
     List<FsStoreProductListQueryVO> selectFsStoreProductByCateIdQuery(Long cateId);
     @Select({"<script> " +
             "select p.* from fs_store_product_scrm p  " +
-            "where is_del=0 and is_show=1  " +
+            //新增审核状态及所属店铺审核状态
+            "inner join fs_store_scrm fs on fs.store_id = p.store_id and fs.is_audit = 1 " +
+            "where p.is_del=0 and p.is_show=1  and p.is_audit = '1'" +
             "<if test = 'maps.productName != null and  maps.productName !=\"\"    '> " +
             "and (p.product_name like CONCAT('%',#{maps.productName},'%')  or p.keyword like concat('%',#{maps.productName},'%') ) " +
             "</if>" +
@@ -169,7 +171,10 @@ public interface FsStoreProductScrmMapper
     List<FsStoreProductListQueryVO> selectFsStoreProductListQuery(@Param("maps")FsStoreProductQueryParam param);
     @Select({"<script> " +
             "select p.* from fs_store_product_scrm p  " +
-            "where is_del=0 and is_show=1 and product_id=#{productId} " +
+            //新增审核状态及所属店铺审核状态
+            "inner join fs_store_scrm fs on fs.store_id = p.store_id and fs.is_audit = 1 " +
+            "where p.is_del=0 and p.is_show=1  and p.is_audit = '1'" +
+            "and p.product_id=#{productId} " +
             "</script>"})
     FsStoreProductQueryVO selectFsStoreProductByIdQuery(Long productId);
     @Update("update fs_store_product_scrm set stock=stock-#{num}, sales=sales+#{num}" +
@@ -178,15 +183,25 @@ public interface FsStoreProductScrmMapper
     @Update("update fs_store_product_scrm set stock=stock+#{num}, sales=sales-#{num}" +
             " where product_id=#{productId}")
     int incStockDecSales( @Param("num")Long num, @Param("productId")Long productId);
-    @Select("select * from fs_store_product_scrm where is_del=0 and is_show=1 and  is_new=1 and is_display=1 order by sort desc limit #{count}")
+    @Select("select p.* from fs_store_product_scrm p " +
+            "inner join fs_store_scrm fs on fs.store_id = p.store_id and fs.is_audit = 1 " +
+            "where p.is_del=0 and p.is_show=1 and p.is_audit = '1'  and  p.is_new=1 and p.is_display=1 order by p.sort desc limit #{count}")
     List<FsStoreProductListQueryVO> selectFsStoreProductNewQuery(int count);
-    @Select("select * from fs_store_product_scrm where is_del=0 and is_show=1 and  is_hot=1 and is_display=1 order by sort desc limit #{count}")
+    @Select("select p.* from fs_store_product_scrm p " +
+            "inner join fs_store_scrm fs on fs.store_id = p.store_id and fs.is_audit = 1 " +
+            "where p.is_del=0 and p.is_show=1 and p.is_audit = '1'  and  p.is_hot=1 and p.is_display=1 order by p.sort desc limit #{count}")
     List<FsStoreProductListQueryVO> selectFsStoreProductHotQuery(int count);
-    @Select("select * from fs_store_product_scrm where is_del=0 and is_show=1 and  is_good=1 and is_display=1 order by sort desc limit #{count}")
+    @Select("select p.* from fs_store_product_scrm p " +
+            "inner join fs_store_scrm fs on fs.store_id = p.store_id and fs.is_audit = 1 " +
+            "where p.is_del=0 and p.is_show=1 and p.is_audit = '1' and  p.is_good=1 and p.is_display=1 order by p.sort desc limit #{count}")
     List<FsStoreProductListQueryVO> selectFsStoreProductGoodQuery(int count);
-    @Select("select * from fs_store_product_scrm where is_del=0 and is_show=1 and  is_best=1 and is_display=1 order by sort desc,product_id desc")
+    @Select("select p.* from fs_store_product_scrm p " +
+            "inner join fs_store_scrm fs on fs.store_id = p.store_id and fs.is_audit = 1 " +
+            "where p.is_del=0 and p.is_show=1 and p.is_audit = '1'  and  p.is_best=1 and p.is_display=1 order by p.sort desc,p.product_id desc")
     List<FsStoreProductListQueryVO> selectFsStoreProductTuiListQuery();
-    @Select("select * from fs_store_product_scrm where is_del=0 and is_show=1 and  is_good=1 and is_display=1 order by sort desc")
+    @Select("select p.* from fs_store_product_scrm p " +
+            "inner join fs_store_scrm fs on fs.store_id = p.store_id and fs.is_audit = 1 " +
+            "where p.is_del=0 and p.is_show=1 and p.is_audit = '1'  and  p.is_good=1 and p.is_display=1 order by p.sort desc")
     List<FsStoreProductListQueryVO> selectFsStoreProductGoodListQuery();
     @Select({"<script> " +
             "select count(1) from fs_store_product_scrm  " +
@@ -287,4 +302,13 @@ public interface FsStoreProductScrmMapper
     List<FsStoreProductRuleScrm> selectFsStoreProductRuleList();
 
     void batchAudit(ProductAuditDTO auditDTO);
+
+    FsStoreProductScrm selectFsStoreProductByIdAudit(Long productId);
+
+    @Select({"<script> " +
+            "select p.* from fs_store_product_scrm p " +
+            "inner join fs_store_scrm fs on fs.store_id = p.store_id and fs.is_audit = 1 " +
+            "where find_in_set(p.product_id,#{ids})  " +
+            "</script>"})
+    List<FsStoreProductActivityListVO> selectFsStoreProductByIdsAudit(String productIds);
 }

fs-service/src/main/java/com/fs/hisStore/service/IFsStoreProductScrmService.java

@@ -131,4 +131,8 @@ public interface IFsStoreProductScrmService
 
 
     void batchAudit(ProductAuditDTO auditDTO);
+
+    FsStoreProductScrm selectFsStoreProductByIdAudit(Long productId);
+
+    List<FsStoreProductActivityListVO> selectFsStoreProductByIdsAudit(String productIds);
 }

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreProductPackageScrmServiceImpl.java

@@ -126,7 +126,7 @@ public class FsStoreProductPackageScrmServiceImpl implements IFsStoreProductPack
                 StoreOrderProductDTO productDTO=new StoreOrderProductDTO();
                 FsStoreProductAttrValueScrm attrValue=fsStoreProductAttrValueMapper.selectFsStoreProductAttrValueById(dto.getId());
                 if(attrValue!=null){
-                    FsStoreProductScrm product=fsStoreProductMapper.selectFsStoreProductById(attrValue.getProductId());
+                    FsStoreProductScrm product=fsStoreProductMapper.selectFsStoreProductByIdAudit(attrValue.getProductId());
                     if(product!=null){
                         productDTO.setProductId(product.getProductId());
                         productDTO.setId(dto.getId());

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreProductScrmServiceImpl.java

@@ -1004,4 +1004,14 @@ public class FsStoreProductScrmServiceImpl implements IFsStoreProductScrmService
         fsStoreProductMapper.batchAudit(auditDTO);
         storeAuditLogUtil.addBatchAuditList(auditDTO.getProductIds(),auditDTO.getReason(),auditDTO.getAttachImage());
     }
+
+    @Override
+    public FsStoreProductScrm selectFsStoreProductByIdAudit(Long productId) {
+        return fsStoreProductMapper.selectFsStoreProductByIdAudit(productId);
+    }
+
+    @Override
+    public List<FsStoreProductActivityListVO> selectFsStoreProductByIdsAudit(String productIds) {
+        return fsStoreProductMapper.selectFsStoreProductByIdsAudit(productIds);
+    }
 }

fs-service/src/main/resources/mapper/hisStore/FsStoreProductScrmMapper.xml

@@ -152,6 +152,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectFsStoreProductVo"/>
         where product_id = #{productId}
     </select>
+
+    <select id="selectFsStoreProductByIdAudit" parameterType="Long" resultMap="FsStoreProductResult">
+        <include refid="selectFsStoreProductPVo"/>
+        <!-- 增加审核判断 -->
+        inner join fs_store_scrm fs on fs.store_id = p.store_id and fs.is_audit = 1
+        where p.product_id = #{productId}
+    </select>
+
+
+
+
     <select id="selectFsStoreProductCompanyCount" resultType="java.lang.Long">
         select count(1) from fs_store_product_scrm
         <where>

fs-user-app/src/main/java/com/fs/app/controller/store/StoreActivityScrmController.java

@@ -39,7 +39,7 @@ public class StoreActivityScrmController extends AppBaseController {
     @GetMapping("/getStoreActivityDetails")
     public R getStoreActivityDetails(@RequestParam(value = "activityId")Long activityId, HttpServletRequest request){
         FsStoreActivityScrm activity=activityService.selectFsStoreActivityById(activityId);
-        List<FsStoreProductActivityListVO> products=productService.selectFsStoreProductByIds(activity.getProductIds());
+        List<FsStoreProductActivityListVO> products=productService.selectFsStoreProductByIdsAudit(activity.getProductIds());
         return R.ok().put("activity",activity).put("products",products);
     }
     @ApiOperation("分享")

fs-user-app/src/main/java/com/fs/app/controller/store/StoreProductPackageScrmController.java

@@ -63,7 +63,7 @@ public class StoreProductPackageScrmController extends AppBaseController {
             StoreOrderProductDTO productDTO=new StoreOrderProductDTO();
             FsStoreProductAttrValueScrm attrValue=attrValueService.selectFsStoreProductAttrValueById(dto.getId());
             if(attrValue!=null){
-                FsStoreProductScrm product=storeProductService.selectFsStoreProductById(attrValue.getProductId());
+                FsStoreProductScrm product=storeProductService.selectFsStoreProductByIdAudit(attrValue.getProductId());
                 if(product!=null){
                     productDTO.setProductId(attrValue.getProductId());
                     productDTO.setId(dto.getId());