feat: 商品和套餐添加所属公司

fs-admin/src/main/java/com/fs/store/controller/FsStoreProductController.java

@@ -6,6 +6,7 @@ import java.util.Date;
 import java.util.List;
 
 import com.fs.common.core.domain.R;
+import com.fs.statis.dto.ModifyMoreDTO;
 import com.fs.store.domain.FsStoreProductAttr;
 import com.fs.store.domain.FsStoreProductPackage;
 import com.fs.store.param.FsProductAttrValueParam;
@@ -59,6 +60,18 @@ public class FsStoreProductController extends BaseController
     private IFsStoreProductAttrValueService attrValueService;
 
 
+    /**
+     * 批量修改商品
+     * @param modifyMoreDTO
+     * @return
+     */
+    @PreAuthorize("@ss.hasPermi('store:storeProduct:list')")
+    @PostMapping("/batchModify")
+    public R batchModify(@RequestBody ModifyMoreDTO modifyMoreDTO){
+        fsStoreProductService.batchModify(modifyMoreDTO);
+        return R.ok();
+    }
+
     /**
      * 查询商品列表
      */

fs-admin/src/main/java/com/fs/store/controller/FsStoreProductPackageController.java

@@ -149,7 +149,7 @@ public class FsStoreProductPackageController extends BaseController
     @Log(title = "商品组合套餐", businessType = BusinessType.UPDATE)
     @PostMapping("/modifyMore")
     public AjaxResult modifyMore(@RequestBody FsStoreProductPackageModifyParam param) {
-        return toAjax(fsStoreProductPackageService.updateFsStoreProductPackages(param.getPackageIds(),param.getStatus()));
+        return toAjax(fsStoreProductPackageService.updateFsStoreProductPackages(param.getPackageIds(),param.getStatus(),param.getCompanyId()));
     }
 
     /**

fs-service-system/src/main/java/com/fs/statis/dto/ModifyMoreDTO.java

@@ -0,0 +1,29 @@
+package com.fs.statis.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 批量修改商品
+ */
+@Data
+public class ModifyMoreDTO implements Serializable {
+    /**
+     * 产品id
+     */
+    private List<Long> productId;
+    /**
+     * 产品状态
+     */
+    private Integer goodsStatus;
+    /**
+     * 是否显示
+     */
+    private Integer goodsIsShow;
+    /**
+     * 公司id
+     */
+    private String companyIds;
+}

fs-service-system/src/main/java/com/fs/store/mapper/FsStoreProductMapper.java

@@ -1,6 +1,8 @@
 package com.fs.store.mapper;
 
 import java.util.List;
+
+import com.fs.statis.dto.ModifyMoreDTO;
 import com.fs.store.domain.FsStoreProduct;
 import com.fs.store.param.FsStoreProductQueryParam;
 import com.fs.store.vo.*;
@@ -201,4 +203,5 @@ public interface FsStoreProductMapper
     List<FsStoreProductExportVO> selectFsStoreProductExportList(@Param("maps")FsStoreProduct fsStoreProduct);
 
 
+    void batchModify(ModifyMoreDTO modifyMoreDTO);
 }

fs-service-system/src/main/java/com/fs/store/mapper/FsStoreProductPackageMapper.java

@@ -74,7 +74,7 @@ public interface FsStoreProductPackageMapper
             "and p.cate_id =#{maps.cateId} " +
             "</if>" +
             "<if test = 'maps.companyId != null      '> " +
-            "and (p.company_id =#{maps.companyId} or p.company_id=0) " +
+            "and (p.company_id =#{maps.companyId}) " +
             "</if>" +
             "<if test = 'maps.status != null      '> " +
             "and p.status =#{maps.status} " +
@@ -113,7 +113,8 @@ public interface FsStoreProductPackageMapper
      * 批量修改商品组合套餐
      *
      * @param packageIds 需要修改的数据ID
+     * @param companyId
      * @return 结果
      */
-    public int updateFsStoreProductPackages(@Param("packageIds")Long[] orderIds,@Param("status")Long status);
+    public int updateFsStoreProductPackages(@Param("packageIds")Long[] orderIds, @Param("status")Long status, @Param("companyId") Long companyId);
 }

fs-service-system/src/main/java/com/fs/store/param/FsStoreProductPackageModifyParam.java

@@ -10,4 +10,5 @@ import java.io.Serializable;
 public class FsStoreProductPackageModifyParam  implements Serializable {
     private Long[] packageIds;
     private Long status;
+    private Long companyId;
 }

fs-service-system/src/main/java/com/fs/store/service/IFsStoreProductPackageService.java

@@ -72,6 +72,6 @@ public interface IFsStoreProductPackageService
      * @param packageIds 需要修改的数据ID
      * @return 结果
      */
-    public int updateFsStoreProductPackages(Long[] orderIds,Long status);
+    public int updateFsStoreProductPackages(Long[] orderIds,Long status,Long companyId);
 
 }

fs-service-system/src/main/java/com/fs/store/service/IFsStoreProductService.java

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.fs.common.core.domain.R;
+import com.fs.statis.dto.ModifyMoreDTO;
 import com.fs.store.domain.FsStoreProduct;
 import com.fs.store.param.FsStoreProductAddEditParam;
 import com.fs.store.param.FsStoreProductQueryParam;
@@ -105,4 +106,7 @@ public interface IFsStoreProductService
     List<FsStoreProductExportVO> selectFsStoreProductExportList(FsStoreProduct fsStoreProduct);
 
     String importStoreProduct(List<FsStoreProductExportVO> list, boolean updateSupport);
+
+    void batchModify(ModifyMoreDTO modifyMoreDTO);
+
 }

fs-service-system/src/main/java/com/fs/store/service/impl/FsStoreProductPackageServiceImpl.java

@@ -148,8 +148,8 @@ public class FsStoreProductPackageServiceImpl implements IFsStoreProductPackageS
     }
 
     @Override
-    public int updateFsStoreProductPackages(Long[] orderIds, Long status) {
-        return fsStoreProductPackageMapper.updateFsStoreProductPackages(orderIds,status);
+    public int updateFsStoreProductPackages(Long[] orderIds, Long status,Long companyId) {
+        return fsStoreProductPackageMapper.updateFsStoreProductPackages(orderIds,status,companyId);
     }
 
 }

fs-service-system/src/main/java/com/fs/store/service/impl/FsStoreProductServiceImpl.java

@@ -15,6 +15,7 @@ import com.fs.common.core.domain.R;
 import com.fs.common.exception.CustomException;
 import com.fs.common.utils.DateUtils;
 import com.fs.company.cache.ICompanyCacheService;
+import com.fs.statis.dto.ModifyMoreDTO;
 import com.fs.store.domain.*;
 import com.fs.store.dto.ProductArrtDTO;
 import com.fs.store.dto.ProductAttrCountDto;
@@ -135,9 +136,10 @@ public class FsStoreProductServiceImpl implements IFsStoreProductService
     @Override
     public List<FsStoreProductListVO> selectFsStoreProductListVO(FsStoreProduct fsStoreProduct) {
         List<FsStoreProductListVO> fsStoreProductListVOS = fsStoreProductMapper.selectFsStoreProductListVO(fsStoreProduct);
-        List<String> companyNameList = new ArrayList<>();
+
         for (FsStoreProductListVO item : fsStoreProductListVOS) {
             if(StringUtils.isNotBlank(item.getCompanyIds())){
+                List<String> companyNameList = new ArrayList<>();
                 String[] split = item.getCompanyIds().split(",");
 
                 for (String companyId : split) {
@@ -153,9 +155,10 @@ public class FsStoreProductServiceImpl implements IFsStoreProductService
     @Override
     public List<FsStoreProductListVO> selectFsStoreProductBarCodeListVO(FsStoreProduct fsStoreProduct) {
         List<FsStoreProductListVO> fsStoreProductListVOS = fsStoreProductMapper.selectFsStoreProductBarCodeListVO(fsStoreProduct);
-        List<String> companyNameList = new ArrayList<>();
+
         for (FsStoreProductListVO item : fsStoreProductListVOS) {
             if(StringUtils.isNotBlank(item.getCompanyIds())){
+                List<String> companyNameList = new ArrayList<>();
                 String[] split = item.getCompanyIds().split(",");
 
                 for (String companyId : split) {
@@ -757,4 +760,9 @@ public class FsStoreProductServiceImpl implements IFsStoreProductService
         }
         return successMsg.toString();
     }
+
+    @Override
+    public void batchModify(ModifyMoreDTO modifyMoreDTO) {
+        fsStoreProductMapper.batchModify(modifyMoreDTO);
+    }
 }

fs-service-system/src/main/resources/mapper/store/FsStoreProductMapper.xml

@@ -249,6 +249,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </trim>
         where product_id = #{productId}
     </update>
+    <update id="batchModify">
+        <foreach collection="productId" separator=";" item="item">
+            update fs_store_product set
+                    <if test="goodsStatus != null">
+                        is_show = #{goodsStatus},
+                    </if>
+                    <if test="goodsIsShow != null">
+                        is_display = #{goodsIsShow},
+                    </if>
+                    <if test="companyIds != null and companyIds != ''">
+                        company_ids = #{companyIds}
+                    </if>
+            where product_id = #{item}
+        </foreach>
+    </update>
 
     <delete id="deleteFsStoreProductById" parameterType="Long">
         delete from fs_store_product where product_id = #{productId}

fs-service-system/src/main/resources/mapper/store/FsStoreProductPackageMapper.xml

@@ -125,7 +125,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <update id="updateFsStoreProductPackages">
-        update  fs_store_product_package set status = #{status} where package_id in
+        update  fs_store_product_package set
+                                            <if test="status != null">
+                                                status = #{status},
+                                            </if>
+                                             <if test="company_id !=null">
+                                                 company_id = #{companyId},
+                                                 products = null
+                                             </if>
+                                         where package_id in
         <foreach item="packageId" collection="packageIds" open="(" separator="," close=")">
             #{packageId}
         </foreach>