新增”获取品牌详细信息“是否关注字段

benyun-core/src/main/java/com/benyun/core/controller/BrandController.java

@@ -44,7 +44,8 @@ public class BrandController extends BaseController {
 //    获取品牌详细信息
     @GetMapping("/info")
     public R info(String brandId){
-        return R.ok(brandService.searchByBrandId(brandId));
+        String userId = "1";
+        return R.ok(brandService.searchByBrandId(brandId,userId));
     }
 
 //    获取品牌物业信息

benyun-core/src/main/java/com/benyun/core/entity/bo/BrandInfo.java

@@ -26,4 +26,5 @@ public class BrandInfo {
     @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)
     private LocalDateTime updateTime;
+    private Integer attention;
 }

benyun-core/src/main/java/com/benyun/core/service/BrandService.java

@@ -8,7 +8,7 @@ import java.util.List;
 
 public interface BrandService {
     List<BrandSearch> searchByLikeName(String text);
-    BrandInfo searchByBrandId(String brandId);
+    BrandInfo searchByBrandId(String brandId, String userId);
     BrandProperty searchPropertyByBrandId(String brandId);
     List<BrandSimilar> searchSimilarByBrandId(String brandId);
     List<BrandStatus> searchStatusByBrandId(String brandId);

benyun-core/src/main/java/com/benyun/core/service/impl/BrandServiceImpl.java

@@ -58,7 +58,7 @@ public class BrandServiceImpl implements BrandService {
     }
 
     @Override
-    public BrandInfo searchByBrandId(String brandId) {
+    public BrandInfo searchByBrandId(String brandId, String userId) {
         Brand brand = brandMapper.searchById(brandId);
         BrandInfo info = new BrandInfo();
         if (brand != null){
@@ -74,6 +74,14 @@ public class BrandServiceImpl implements BrandService {
                 info.setAddrInfo(enterprise.getAddrInfo());
             }
             info.setUpdateTime(brand.getUpdateTime());
+            QueryWrapper<AttentionPool> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("brand_id",brandId);
+            queryWrapper.eq("wd_id","");
+            AttentionPool pool = attentionPoolDao.selectOne(queryWrapper);
+            if (pool == null)
+                info.setAttention(0);
+            else
+                info.setAttention(1);
         }else return null;
         return info;
     }

benyun-core/src/test/java/com/benyun/core/service/BrandServiceImplTest.java

@@ -27,9 +27,9 @@ public class BrandServiceImplTest {
     @Test
     public void searchInfoByBrandIdTest(){
         String brandId1 = "0b793eea1b4d414ca163a1151e730daa";
-        System.out.println(brandService.searchByBrandId(brandId1));
+        System.out.println(brandService.searchByBrandId(brandId1,null));
         String brandId2 = "0b793eea1b4d4";
-        System.out.println(brandService.searchByBrandId(brandId2));
+        System.out.println(brandService.searchByBrandId(brandId2,null));
     }
 
     @Test