add product merchantId when search

rankin-cms-web/src/main/java/cn/rankin/cmsweb/controller/product/GoodsController.java

@@ -1,5 +1,7 @@
 package cn.rankin.cmsweb.controller.product;
 
+import cn.rankin.cmsweb.assist.resolver.NeedUser;
+import cn.rankin.cmsweb.entity.UserDetails;
 import cn.rankin.cmsweb.service.product.GoodsService;
 import cn.rankin.common.utils.api.model.APIResult;
 import cn.rankin.data.api.product.dto.GoodsDTO;
@@ -15,7 +17,7 @@ public class GoodsController {
     private GoodsService goodsService;
 
     @RequestMapping(method = RequestMethod.POST)
-    public APIResult<GoodsVo> create(@RequestBody GoodsDTO goodsDTO) {
+    public APIResult<GoodsVo> create(@NeedUser UserDetails user, @RequestBody GoodsDTO goodsDTO) {
         return goodsService.create(goodsDTO);
     }
 

rankin-cms-web/src/main/java/cn/rankin/cmsweb/controller/product/GroupController.java

@@ -1,5 +1,7 @@
 package cn.rankin.cmsweb.controller.product;
 
+import cn.rankin.cmsweb.assist.resolver.NeedUser;
+import cn.rankin.cmsweb.entity.UserDetails;
 import cn.rankin.cmsweb.service.product.GroupService;
 import cn.rankin.cmsweb.service.user.MerchantInfoSetService;
 import cn.rankin.common.utils.api.model.APIResult;
@@ -26,7 +28,10 @@ public class GroupController {
     private MerchantInfoSetService<GroupVo> merchantInfoSetService;
 
     @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public APIResult<Page<GroupVo>> search(GroupSearchDTO searchDTO) {
+    public APIResult<Page<GroupVo>> search(@NeedUser UserDetails user, GroupSearchDTO searchDTO) {
+        if (!user.isPlatForm()) {
+            searchDTO.setMerchantId(user.getMerchantId());
+        }
         APIResult<Page<GroupVo>> pageAPIResult = groupService.search(BeanUtil.convertToMap(searchDTO));
         if (pageAPIResult.getSuccess()) {
             merchantInfoSetService.setMerchantInfo(pageAPIResult.getData().getList());

rankin-cms-web/src/main/java/cn/rankin/cmsweb/controller/product/MerchantProductController.java

@@ -1,5 +1,7 @@
 package cn.rankin.cmsweb.controller.product;
 
+import cn.rankin.cmsweb.assist.resolver.NeedUser;
+import cn.rankin.cmsweb.entity.UserDetails;
 import cn.rankin.cmsweb.service.product.MerchantProductService;
 import cn.rankin.cmsweb.service.user.MerchantInfoSetService;
 import cn.rankin.common.utils.api.model.APIResult;
@@ -24,7 +26,10 @@ public class MerchantProductController {
     private MerchantInfoSetService merchantInfoSetService;
 
     @RequestMapping(method = RequestMethod.GET)
-    public APIResult<Page<MerchantProductVo>> search(MerchantProductSearchDTO searchDTO) {
+    public APIResult<Page<MerchantProductVo>> search(@NeedUser UserDetails user, MerchantProductSearchDTO searchDTO) {
+        if (!user.isPlatForm()) {
+            searchDTO.setMerchantId(user.getMerchantId());
+        }
         APIResult<Page<MerchantProductVo>> apiResult = merchantProductService.search(BeanUtil.convertToMap(searchDTO));
         if (apiResult.getSuccess()) {
             List<MerchantProductVo> merchantProductVoList = apiResult.getData().getList();

rankin-cms-web/src/main/java/cn/rankin/cmsweb/controller/product/TagController.java

@@ -1,5 +1,7 @@
 package cn.rankin.cmsweb.controller.product;
 
+import cn.rankin.cmsweb.assist.resolver.NeedUser;
+import cn.rankin.cmsweb.entity.UserDetails;
 import cn.rankin.cmsweb.service.product.TagService;
 import cn.rankin.cmsweb.service.user.MerchantInfoSetService;
 import cn.rankin.common.utils.api.model.APIResult;
@@ -22,7 +24,10 @@ public class TagController {
     private MerchantInfoSetService<TagVo> merchantInfoSetService;
 
     @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public APIResult<Page<TagVo>> search(TagSearchDTO searchDTO) {
+    public APIResult<Page<TagVo>> search(@NeedUser UserDetails user, TagSearchDTO searchDTO) {
+        if (!user.isPlatForm()) {
+            searchDTO.setMerchantId(user.getMerchantId());
+        }
         APIResult<Page<TagVo>> apiResult = tagService.search(BeanUtil.convertToMap(searchDTO));
         if (apiResult.getSuccess()) {
             merchantInfoSetService.setMerchantInfo(apiResult.getData().getList());

rankin-data-api/src/main/java/cn/rankin/data/api/product/vo/TagVo.java

@@ -2,9 +2,11 @@ package cn.rankin.data.api.product.vo;
 
 import cn.rankin.common.utils.enums.BaseStatusEnum;
 import cn.rankin.common.utils.enums.TagTypeEnum;
+import cn.rankin.data.api.product.entity.MerchantProduct;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 @Data
 public class TagVo implements Serializable {
@@ -28,4 +30,6 @@ public class TagVo implements Serializable {
     private Integer sort;
 
     private BaseStatusEnum status;
+
+    private List<MerchantProduct> products;
 }

rankin-product-service/src/main/java/cn/rankin/productservice/repository/PackageRepository.java

@@ -2,8 +2,14 @@ package cn.rankin.productservice.repository;
 
 import cn.rankin.common.utils.jpa.BasicJpaRepository;
 import cn.rankin.data.api.product.entity.Package;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 
 public interface PackageRepository extends BasicJpaRepository<Package, String> {
 
     Long countByCode(String code);
+
+    @Modifying
+    @Query(value = "update Package p set p.status = 1 where p.id = ?1")
+    Integer deleteById(String id);
 }

rankin-product-service/src/main/java/cn/rankin/productservice/service/PackageService.java

@@ -140,6 +140,12 @@ public class PackageService {
     }
 
     @Transactional
+    public Boolean deletePackage(String pkgId) {
+        Integer count = packageRepository.deleteById(pkgId);
+        return count > 0;
+    }
+
+    @Transactional
     public Boolean updateRelation(String pkgId, List<PackageProductDTO> packageProductDTOList) {
         if (packageProductDTOList == null) {
             return true;

rankin-product-service/src/main/java/cn/rankin/productservice/service/ProductService.java

@@ -93,6 +93,8 @@ public class ProductService {
             courseService.delete(productId);
         }else if (type.equals(ProductTypeEnum.SUPPORT)) {
             supportService.delete(productId);
+        }else if (type.equals(ProductTypeEnum.PACKAGE)){
+            packageService.deletePackage(productId);
         }else {
         }
 

rankin-user-service/src/main/java/cn/rankin/userservice/service/CmsUserService.java

@@ -80,7 +80,7 @@ public class CmsUserService {
     @Transactional
     public APIResult<Boolean> delete(String id) {
         Integer count = cmsUserRepository.updateStatusById(id, BaseStatusEnum.DISABLE);
-        if (count > 0) {
+        if (count == 0) {
             return APIResult.error(UserServiceAPICode.NOT_EXISTS);
         }