Merge remote-tracking branch 'origin/feature/lc_volunteerBanner' into feature/syp_special_user

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/EpdcActBannerController.java

@@ -79,7 +79,7 @@ public class EpdcActBannerController {
      */
     @GetMapping("detail/{id}")
     public Result<ActBannerDTO> getBannerDetail(@PathVariable("id") String id){
-        ActBannerDTO data = actBannerService.get(id);
+        ActBannerDTO data = actBannerService.getBannerDetail(id);
         return new Result<ActBannerDTO>().ok(data);
     }
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActBannerService.java

@@ -164,4 +164,14 @@ public interface ActBannerService extends BaseService<ActBannerEntity> {
      * @since 2020/11/5 10:22
      */
     List<ActBannerDTO> listBanners(EpdcAppBannerFormDTO formDto);
+
+    /**
+     * 志愿者banner详情
+     *
+     * @param id
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.activity.ActBannerDTO>
+     * @author Liuchuang
+     * @since 2020/11/5 10:33
+     */
+    ActBannerDTO getBannerDetail(String id);
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java

@@ -33,7 +33,6 @@ import com.elink.esua.epdc.constant.ActStateConstant;
 import com.elink.esua.epdc.dto.SysSimpleDictDTO;
 import com.elink.esua.epdc.modules.activity.dao.ActBannerDao;
 import com.elink.esua.epdc.modules.activity.entity.ActBannerEntity;
-import com.elink.esua.epdc.modules.activity.redis.ActBannerRedis;
 import com.elink.esua.epdc.modules.activity.service.ActBannerService;
 import com.elink.esua.epdc.modules.feign.AdminFeignClient;
 import org.apache.commons.lang3.StringUtils;
@@ -55,9 +54,6 @@ import java.util.Map;
 @Service
 public class ActBannerServiceImpl extends BaseServiceImpl<ActBannerDao, ActBannerEntity> implements ActBannerService {
 
-    @Autowired
-    private ActBannerRedis actBannerRedis;
-
     @Autowired
     private AdminFeignClient adminFeignClient;
 
@@ -189,4 +185,19 @@ public class ActBannerServiceImpl extends BaseServiceImpl<ActBannerDao, ActBanne
     public List<ActBannerDTO> listBanners(EpdcAppBannerFormDTO formDto) {
         return baseDao.selectListBanners(formDto);
     }
+
+    @Override
+    public ActBannerDTO getBannerDetail(String id) {
+        ActBannerEntity entity = baseDao.selectById(id);
+        ActBannerDTO dto = ConvertUtils.sourceToTarget(entity, ActBannerDTO.class);
+        // 浏览数+1
+        if (null != entity) {
+            int browseNum = null == entity.getBrowseNum() ? 1:entity.getBrowseNum()+1;
+            ActBannerEntity bannerEntity = new ActBannerEntity();
+            bannerEntity.setId(id);
+            bannerEntity.setBrowseNum(browseNum);
+            updateById(bannerEntity);
+        }
+        return dto;
+    }
 }