From 6caf9aca115a2bef6953936d140267e4ca3649d2 Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Tue, 20 Jul 2021 16:33:29 +0800 Subject: [PATCH 01/10] =?UTF-8?q?Revert=20"=E5=B1=85=E6=B0=91=E7=AB=AF-?= =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E9=93=B6=E8=A1=8C-=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=85=AC=E7=9B=8A=E7=A7=AF=E5=88=86=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20init"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 651af2be --- .../form/VolunteerPointsRecordsFormDTO.java | 34 -------------- .../VolunteerPointsRecordsResultDTO.java | 5 --- .../VolunteerPointsAnalysisCotroller.java | 23 ++-------- .../user/dao/VolunteerPointsAnalysisDao.java | 11 ----- .../VolunteerPointsAnalysisService.java | 12 ----- .../VolunteerPointsAnalysisServiceImpl.java | 9 ---- .../user/VolunteerPointsAnalysisDao.xml | 22 ---------- .../ApiVolunteerPointsRecordsFormDTO.java | 34 -------------- .../ApiVolunteerPointsRecordsResultDTO.java | 44 ------------------- .../epdc/controller/ApiPointsController.java | 17 ------- .../esua/epdc/feign/AnalysisFeignClient.java | 15 ------- .../fallback/AnalysisFeignClientFallback.java | 9 ---- .../esua/epdc/service/PointsService.java | 13 ------ .../epdc/service/impl/PointsServiceImpl.java | 11 ----- 14 files changed, 4 insertions(+), 255 deletions(-) delete mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/VolunteerPointsRecordsFormDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/ApiVolunteerPointsRecordsFormDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/ApiVolunteerPointsRecordsResultDTO.java diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/VolunteerPointsRecordsFormDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/VolunteerPointsRecordsFormDTO.java deleted file mode 100644 index e461dd25..00000000 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/VolunteerPointsRecordsFormDTO.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.elink.esua.epdc.dto.user.form; - -import lombok.Data; - -import javax.validation.constraints.Min; -import javax.validation.constraints.NotBlank; -import java.io.Serializable; - -/** - * @Author：liuchuang - * @Date：2021/7/19 16:07 - */ -@Data -public class VolunteerPointsRecordsFormDTO implements Serializable { - private static final long serialVersionUID = 1625467226873432125L; - - /** - * 页码 - */ - @Min(value = 1, message = "页码必须大于0") - private Integer pageIndex; - - /** - * 页容量 - */ - @Min(value = 1, message = "每页条数必须大于0") - private Integer pageSize; - - /** - * 用户ID - */ - @NotBlank(message = "获取用户信息失败") - private String userId; -} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/VolunteerPointsRecordsResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/VolunteerPointsRecordsResultDTO.java index dd5a12ce..b3b70183 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/VolunteerPointsRecordsResultDTO.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/VolunteerPointsRecordsResultDTO.java @@ -36,9 +36,4 @@ public class VolunteerPointsRecordsResultDTO implements Serializable { * 积分 */ private Integer volunteerPoints; - - /** - * 积分操作类型 0-减积分，1-加积分 - */ - private String operationType; } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/VolunteerPointsAnalysisCotroller.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/VolunteerPointsAnalysisCotroller.java index d319fbb3..a880e9f3 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/VolunteerPointsAnalysisCotroller.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/VolunteerPointsAnalysisCotroller.java @@ -2,16 +2,16 @@ package com.elink.esua.epdc.modules.user.controller; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; -import com.elink.esua.epdc.dto.user.form.VolunteerPointsRecordsFormDTO; import com.elink.esua.epdc.dto.user.result.DeptVolunteerResultDTO; import com.elink.esua.epdc.dto.user.result.VolunteerPointsRecordsResultDTO; import com.elink.esua.epdc.dto.user.result.VolunteerPointsStaticResultDTO; import com.elink.esua.epdc.modules.user.service.VolunteerPointsAnalysisService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; -import java.util.List; import java.util.Map; /** @@ -68,19 +68,4 @@ public class VolunteerPointsAnalysisCotroller { PageData data = volunteerPointsAnalysisService.volunteerPointsRecords(params); return new Result>().ok(data); } - - /** - * 居民端-志愿者银行-用户公益积分记录 - * - * @param formDto - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @author liuchuang - * @since 2021/7/19 16:13 - */ - @GetMapping("charityPoints") - public Result> charityPoints(@RequestBody VolunteerPointsRecordsFormDTO formDto) { - ValidatorUtils.validateEntity(formDto); - List data = volunteerPointsAnalysisService.charityPoints(formDto); - return new Result>().ok(data); - } } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/VolunteerPointsAnalysisDao.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/VolunteerPointsAnalysisDao.java index 120f7a28..5e763e0d 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/VolunteerPointsAnalysisDao.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/VolunteerPointsAnalysisDao.java @@ -1,7 +1,6 @@ package com.elink.esua.epdc.modules.user.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.elink.esua.epdc.dto.user.form.VolunteerPointsRecordsFormDTO; import com.elink.esua.epdc.dto.user.result.DeptVolunteerResultDTO; import com.elink.esua.epdc.dto.user.result.VolunteerPointsRecordsResultDTO; import com.elink.esua.epdc.dto.user.result.VolunteerPointsStaticResultDTO; @@ -45,14 +44,4 @@ public interface VolunteerPointsAnalysisDao extends BaseMapper volunteerPointsRecords(Map params); - - /** - * 居民端-志愿者银行-用户公益积分记录 - * - * @param formDto - * @return java.util.List - * @author liuchuang - * @since 2021/7/19 16:14 - */ - List charityPoints(VolunteerPointsRecordsFormDTO formDto); } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/VolunteerPointsAnalysisService.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/VolunteerPointsAnalysisService.java index dead2c9f..fb408d22 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/VolunteerPointsAnalysisService.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/VolunteerPointsAnalysisService.java @@ -1,12 +1,10 @@ package com.elink.esua.epdc.modules.user.service; import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.dto.user.form.VolunteerPointsRecordsFormDTO; import com.elink.esua.epdc.dto.user.result.DeptVolunteerResultDTO; import com.elink.esua.epdc.dto.user.result.VolunteerPointsRecordsResultDTO; import com.elink.esua.epdc.dto.user.result.VolunteerPointsStaticResultDTO; -import java.util.List; import java.util.Map; /** @@ -44,14 +42,4 @@ public interface VolunteerPointsAnalysisService { * @since 2021/7/15 14:48 */ PageData volunteerPointsRecords(Map params); - - /** - * 居民端-志愿者银行-用户公益积分记录 - * - * @param formDto - * @return java.util.List - * @author liuchuang - * @since 2021/7/19 16:14 - */ - List charityPoints(VolunteerPointsRecordsFormDTO formDto); } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/VolunteerPointsAnalysisServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/VolunteerPointsAnalysisServiceImpl.java index 5f421ef5..bd6f7f44 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/VolunteerPointsAnalysisServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/VolunteerPointsAnalysisServiceImpl.java @@ -2,9 +2,7 @@ package com.elink.esua.epdc.modules.user.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; -import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.dto.user.form.VolunteerPointsRecordsFormDTO; import com.elink.esua.epdc.dto.user.result.DeptVolunteerResultDTO; import com.elink.esua.epdc.dto.user.result.VolunteerPointsRecordsResultDTO; import com.elink.esua.epdc.dto.user.result.VolunteerPointsStaticResultDTO; @@ -42,11 +40,4 @@ public class VolunteerPointsAnalysisServiceImpl extends BaseServiceImpl list = baseDao.volunteerPointsRecords(params); return new PageData<>(list, iPage.getTotal()); } - - @Override - public List charityPoints(VolunteerPointsRecordsFormDTO formDto) { - int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize(); - formDto.setPageIndex(pageIndex); - return baseDao.charityPoints(formDto); - } } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/VolunteerPointsAnalysisDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/VolunteerPointsAnalysisDao.xml index 45addcd5..a4e18b02 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/VolunteerPointsAnalysisDao.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/VolunteerPointsAnalysisDao.xml @@ -121,26 +121,4 @@ ORDER BY l.`OPERATION_TIME` DESC - - diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/ApiVolunteerPointsRecordsFormDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/ApiVolunteerPointsRecordsFormDTO.java deleted file mode 100644 index bfb2f829..00000000 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/ApiVolunteerPointsRecordsFormDTO.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.elink.esua.epdc.dto.form; - -import lombok.Data; - -import javax.validation.constraints.Min; -import javax.validation.constraints.NotBlank; -import java.io.Serializable; - -/** - * @Author：liuchuang - * @Date：2021/7/19 16:07 - */ -@Data -public class ApiVolunteerPointsRecordsFormDTO implements Serializable { - private static final long serialVersionUID = 1625467226873432125L; - - /** - * 页码 - */ - @Min(value = 1, message = "页码必须大于0") - private Integer pageIndex; - - /** - * 页容量 - */ - @Min(value = 1, message = "每页条数必须大于0") - private Integer pageSize; - - /** - * 用户ID - */ - @NotBlank(message = "获取用户信息失败") - private String userId; -} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/ApiVolunteerPointsRecordsResultDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/ApiVolunteerPointsRecordsResultDTO.java deleted file mode 100644 index 8b2a86d0..00000000 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/ApiVolunteerPointsRecordsResultDTO.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.elink.esua.epdc.dto.result; - -import lombok.Data; - -import java.io.Serializable; - -/** - * @Author：liuchuang - * @Date：2021/7/15 14:45 - */ -@Data -public class ApiVolunteerPointsRecordsResultDTO implements Serializable { - private static final long serialVersionUID = -286937478420813680L; - - /** - * 积分记录ID - */ - private String id; - - /** - * 昵称 - */ - private String nickname; - - /** - * 活动名称 - */ - private String actName; - - /** - * 积分记录时间 - */ - private String operationTime; - - /** - * 积分 - */ - private Integer volunteerPoints; - - /** - * 积分操作类型 0-减积分，1-加积分 - */ - private String operationType; -} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiPointsController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiPointsController.java index 8f1e5c2c..681ce6fe 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiPointsController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiPointsController.java @@ -4,16 +4,13 @@ import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.annotation.LoginUser; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; -import com.elink.esua.epdc.dto.form.ApiVolunteerPointsRecordsFormDTO; import com.elink.esua.epdc.dto.form.EpdcAppPointsRankingFormDTO; import com.elink.esua.epdc.dto.form.EpdcAppPointsRecordFormDTO; -import com.elink.esua.epdc.dto.result.ApiVolunteerPointsRecordsResultDTO; import com.elink.esua.epdc.dto.result.EpdcAppPointsRankingResultDTO; import com.elink.esua.epdc.dto.result.EpdcAppPointsRecordResultDTO; import com.elink.esua.epdc.service.PointsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -58,18 +55,4 @@ public class ApiPointsController { ValidatorUtils.validateEntity(formDto); return pointsService.listPointsRanking(userDetail, formDto); } - - /** - * 居民端-志愿者银行-用户公益积分记录 - * - * @param userDetail - * @param formDto - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @author liuchuang - * @since 2021/7/19 16:32 - */ - @GetMapping("charityPoints") - public Result> charityPoints(@LoginUser TokenDto userDetail, ApiVolunteerPointsRecordsFormDTO formDto) { - return pointsService.charityPoints(userDetail, formDto); - } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java index 284adeb6..c206e8ad 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java @@ -2,15 +2,10 @@ package com.elink.esua.epdc.feign; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.form.ApiVolunteerPointsRecordsFormDTO; -import com.elink.esua.epdc.dto.result.ApiVolunteerPointsRecordsResultDTO; import com.elink.esua.epdc.feign.fallback.AnalysisFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestBody; - -import java.util.List; /** * 数据分析模块调用 @@ -31,15 +26,5 @@ public interface AnalysisFeignClient { @GetMapping(value = "analysis/workLog/getCustomId", consumes = MediaType.APPLICATION_JSON_VALUE) Result getCustomId(); - /** - * 居民端-志愿者银行-用户公益积分记录 - * - * @param formDto - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @author liuchuang - * @since 2021/7/19 16:36 - */ - @GetMapping(value = "analysis/volunteer/charityPoints", consumes = MediaType.APPLICATION_JSON_VALUE) - Result> charityPoints(ApiVolunteerPointsRecordsFormDTO formDto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java index 491f7558..bb6072e5 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java @@ -3,13 +3,9 @@ package com.elink.esua.epdc.feign.fallback; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.form.ApiVolunteerPointsRecordsFormDTO; -import com.elink.esua.epdc.dto.result.ApiVolunteerPointsRecordsResultDTO; import com.elink.esua.epdc.feign.AnalysisFeignClient; import org.springframework.stereotype.Component; -import java.util.List; - /** * @Author：songyunpeg * @Date：2020/9/9 15:42 @@ -21,9 +17,4 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient { public Result getCustomId() { return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getCustomId"); } - - @Override - public Result> charityPoints(ApiVolunteerPointsRecordsFormDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "charityPoints", "formDto"); - } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/PointsService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/PointsService.java index a782b960..313a5934 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/PointsService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/PointsService.java @@ -2,10 +2,8 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.form.ApiVolunteerPointsRecordsFormDTO; import com.elink.esua.epdc.dto.form.EpdcAppPointsRankingFormDTO; import com.elink.esua.epdc.dto.form.EpdcAppPointsRecordFormDTO; -import com.elink.esua.epdc.dto.result.ApiVolunteerPointsRecordsResultDTO; import com.elink.esua.epdc.dto.result.EpdcAppPointsRankingResultDTO; import com.elink.esua.epdc.dto.result.EpdcAppPointsRecordResultDTO; @@ -44,15 +42,4 @@ public interface PointsService { * @Date: 2020-04-30 */ Result listPointsRanking(TokenDto userDetail, EpdcAppPointsRankingFormDTO formDto); - - /** - * 居民端-志愿者银行-用户公益积分记录 - * - * @param userDetail - * @param formDto - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @author liuchuang - * @since 2021/7/19 16:34 - */ - Result> charityPoints(TokenDto userDetail, ApiVolunteerPointsRecordsFormDTO formDto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/PointsServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/PointsServiceImpl.java index 3c66fc6c..61e3e36c 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/PointsServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/PointsServiceImpl.java @@ -2,13 +2,10 @@ package com.elink.esua.epdc.service.impl; import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.form.ApiVolunteerPointsRecordsFormDTO; import com.elink.esua.epdc.dto.form.EpdcAppPointsRankingFormDTO; import com.elink.esua.epdc.dto.form.EpdcAppPointsRecordFormDTO; -import com.elink.esua.epdc.dto.result.ApiVolunteerPointsRecordsResultDTO; import com.elink.esua.epdc.dto.result.EpdcAppPointsRankingResultDTO; import com.elink.esua.epdc.dto.result.EpdcAppPointsRecordResultDTO; -import com.elink.esua.epdc.feign.AnalysisFeignClient; import com.elink.esua.epdc.feign.PointsFeignClient; import com.elink.esua.epdc.service.PointsService; import org.springframework.beans.factory.annotation.Autowired; @@ -26,8 +23,6 @@ public class PointsServiceImpl implements PointsService { @Autowired private PointsFeignClient pointsFeignClient; - @Autowired - private AnalysisFeignClient analysisFeignClient; @Override public Result> listPointsRecord(TokenDto userDetail, EpdcAppPointsRecordFormDTO formDto) { @@ -41,10 +36,4 @@ public class PointsServiceImpl implements PointsService { formDto.setNickName(userDetail.getNickname()); return pointsFeignClient.listPointsRankingFeignClient(formDto); } - - @Override - public Result> charityPoints(TokenDto userDetail, ApiVolunteerPointsRecordsFormDTO formDto) { - formDto.setUserId(userDetail.getUserId()); - return analysisFeignClient.charityPoints(formDto); - } } From 45ab1ee91876bfc3c88130e8ef97a2c6c9a20072 Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Tue, 20 Jul 2021 16:34:19 +0800 Subject: [PATCH 02/10] =?UTF-8?q?Revert=20"=E5=8E=BB=E9=99=A4=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E6=95=B0=E6=8D=AE=E5=BA=93=E5=89=8D=E7=BC=80"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 290b1613 --- .../user/VolunteerPointsAnalysisDao.xml | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/VolunteerPointsAnalysisDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/VolunteerPointsAnalysisDao.xml index a4e18b02..3863f027 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/VolunteerPointsAnalysisDao.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/VolunteerPointsAnalysisDao.xml @@ -10,8 +10,8 @@ IFNULL(COUNT( DISTINCT v.ID ), 0) AS volunteerNum, IFNULL(SUM( l.POINTS ), 0) AS volunteerPoints FROM - esua_epdc_user.epdc_volunteer_dept d - LEFT JOIN esua_epdc_user.epdc_volunteer_info v ON v.VOLUNTEER_DEPT_ID = d.ID + js_esua_epdc_user.epdc_volunteer_dept d + LEFT JOIN js_esua_epdc_user.epdc_volunteer_info v ON v.VOLUNTEER_DEPT_ID = d.ID AND v.DEL_FLAG = '0' AND v.AUDIT_STATUS IN ( '0', '1' ) @@ -20,7 +20,7 @@ and DATE_FORMAT( v.REGIST_TIME, '%Y-%m-%d' ) <=#{endTime} - LEFT JOIN esua_epdc_points.epdc_points_logs l ON l.USER_ID = v.USER_ID + LEFT JOIN js_esua_epdc_points.epdc_points_logs l ON l.USER_ID = v.USER_ID AND l.DEL_FLAG = '0' AND l.BEHAVIOR_CODE = 'join_act' @@ -65,10 +65,10 @@ v.VOLUNTEER_SIGNATURE, v.ADDRESS FROM - esua_epdc_user.epdc_volunteer_info v - LEFT JOIN esua_epdc_user.epdc_volunteer_tag_relation r ON r.VOLUNTEER_ID = v.ID + js_esua_epdc_user.epdc_volunteer_info v + LEFT JOIN js_esua_epdc_user.epdc_volunteer_tag_relation r ON r.VOLUNTEER_ID = v.ID AND r.DEL_FLAG = '0' - LEFT JOIN esua_epdc_user.epdc_volunteer_tag t ON t.ID = r.TAG_ID + LEFT JOIN js_esua_epdc_user.epdc_volunteer_tag t ON t.ID = r.TAG_ID WHERE v.DEL_FLAG = '0' AND v.AUDIT_STATUS IN ( '0', '1' ) @@ -80,7 +80,7 @@ and DATE_FORMAT( v.REGIST_TIME, '%Y-%m-%d' ) <=#{endTime} ) tmp - LEFT JOIN esua_epdc_points.epdc_points_logs l ON l.USER_ID = tmp.USER_ID + LEFT JOIN js_esua_epdc_points.epdc_points_logs l ON l.USER_ID = tmp.USER_ID AND l.DEL_FLAG = '0' AND l.BEHAVIOR_CODE = 'join_act' @@ -105,10 +105,10 @@ ELSE ai.`TITLE` END AS actName, l.`OPERATION_TIME` - FROM `esua_epdc_points`.`epdc_points_logs` l - LEFT JOIN `esua_epdc_mutuality`.`epdc_act_user_points_log` aup on aup.`ID`= l.`REFERENCE_ID` - LEFT JOIN `esua_epdc_mutuality`.`epdc_act_user_relation` aur on aur.`ID`= aup.`ACT_USER_ID` - LEFT JOIN `esua_epdc_mutuality`.`epdc_act_info` ai on ai.`ID`= aur.`ACT_ID` + FROM `js_esua_epdc_points`.`epdc_points_logs` l + LEFT JOIN `js_esua_epdc_mutuality`.`epdc_act_user_points_log` aup on aup.`ID`= l.`REFERENCE_ID` + LEFT JOIN `js_esua_epdc_mutuality`.`epdc_act_user_relation` aur on aur.`ID`= aup.`ACT_USER_ID` + LEFT JOIN `js_esua_epdc_mutuality`.`epdc_act_info` ai on ai.`ID`= aur.`ACT_ID` WHERE l.`DEL_FLAG`= '0' AND l.`BEHAVIOR_CODE`= 'join_act' AND l.USER_ID = #{userId} From 869914474325c50f66c44394938a2af5f5afe576 Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Tue, 20 Jul 2021 16:35:48 +0800 Subject: [PATCH 03/10] =?UTF-8?q?Revert=20"=E5=BF=97=E6=84=BF=E8=80=85?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=20bug=E4=BF=AE=E6=94=B9"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 719cc9f7 --- .../epdc/dto/result/EpdcAppVolunteerRankDTO.java | 15 +-------------- .../epdc/service/impl/AppUserServiceImpl.java | 1 - .../epdc/modules/feign/UserInfoFeignClient.java | 2 +- .../modules/volunteer/dao/VolunteerRankDao.java | 3 ++- .../mapper/volunteer/VolunteerRankDao.xml | 2 +- .../v2/EpdcCompleteVolunteerInfoV2FormDTO.java | 2 +- 6 files changed, 6 insertions(+), 19 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppVolunteerRankDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppVolunteerRankDTO.java index fdc0f5d9..d589c4f9 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppVolunteerRankDTO.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppVolunteerRankDTO.java @@ -63,19 +63,6 @@ public class EpdcAppVolunteerRankDTO implements Serializable { */ private Integer participationNum; - /** - * 志愿者部门ID - */ - private String volunteerDeptId; - /** - * 志愿者公益积分 - */ - private Integer volunteerPoints; - /** - * 志愿公益累计积分 - */ - private Integer volunteerPointsTotal; - -} +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java index ee7c3441..ea660c1b 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java @@ -948,7 +948,6 @@ public class AppUserServiceImpl implements AppUserService { dto.setVolunteerSignature(volunteerInfoDTO.getData().getVolunteerSignature()); dto.setIntroduce(volunteerInfoDTO.getData().getIntroduce()); dto.setVolunteerTagId(volunteerInfoDTO.getData().getTagId()); - dto.setVolunteerDeptId(volunteerInfoDTO.getData().getVolunteerDeptId()); // 如果用户表的身份证号为空，则尝试使用志愿者表中的身份证 if (null == dto.getIdentityNo() || "".equals(dto.getIdentityNo())) { dto.setIdentityNo(volunteerInfoDTO.getData().getIdentityNo()); diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/UserInfoFeignClient.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/UserInfoFeignClient.java index 2d0d21b1..7ac953bb 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/UserInfoFeignClient.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/UserInfoFeignClient.java @@ -107,7 +107,7 @@ public interface UserInfoFeignClient { * @Param [formDTO] * @return com.elink.esua.epdc.commons.tools.utils.Result **/ - @PostMapping(value = "app-user/volunteerinfo/handleVolunteerPoints", consumes = MediaType.APPLICATION_JSON_VALUE) + @PostMapping(value = "app-user/user/handleVolunteerPoints", consumes = MediaType.APPLICATION_JSON_VALUE) Result handleVolunteerPoints(EpdcVolunteerPointsFormDTO formDTO); } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/dao/VolunteerRankDao.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/dao/VolunteerRankDao.java index 19dd1499..d1b41fad 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/dao/VolunteerRankDao.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/dao/VolunteerRankDao.java @@ -22,6 +22,7 @@ import com.elink.esua.epdc.dto.form.EpdcAppVolunteerRankFormDTO; import com.elink.esua.epdc.modules.volunteer.entity.VolunteerRankEntity; import com.elink.esua.epdc.volunteer.EpdcVolunteerRankDTO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -38,7 +39,7 @@ public interface VolunteerRankDao extends BaseDao { * @Author wanggongfeng * @return */ - List leaderboard(EpdcAppVolunteerRankFormDTO formDto); + List leaderboard(@Param("formDto") EpdcAppVolunteerRankFormDTO formDto); /** * @Description 清空排行榜数据 * @Author songyunpeng diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/volunteer/VolunteerRankDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/volunteer/VolunteerRankDao.xml index 5757e5da..722af5f7 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/volunteer/VolunteerRankDao.xml +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/volunteer/VolunteerRankDao.xml @@ -37,7 +37,7 @@ order by VOLUNTEER_POINTS desc - LIMIT #{pageIndex},#{pageSize} + LIMIT #{formDto.pageIndex},#{formDto.pageSize} delete from epdc_volunteer_rank diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/v2/EpdcCompleteVolunteerInfoV2FormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/v2/EpdcCompleteVolunteerInfoV2FormDTO.java index 51a92554..c9e9b274 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/v2/EpdcCompleteVolunteerInfoV2FormDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/v2/EpdcCompleteVolunteerInfoV2FormDTO.java @@ -127,7 +127,7 @@ public class EpdcCompleteVolunteerInfoV2FormDTO implements Serializable { /** * 志愿者部门 */ - private String volunteerDeptId; + private String volunteerDept; } From 5b53f5503aaf209429350ccc66da4b5e704badd8 Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Tue, 20 Jul 2021 16:37:15 +0800 Subject: [PATCH 04/10] =?UTF-8?q?Revert=20"=E5=BF=97=E6=84=BF=E8=80=85?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E8=B0=83=E6=95=B4"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 3f38fd32 --- .../commons/tools/enums/BehaviorEnum.java | 7 +- .../dto/form/EpdcAppVolunteerRankFormDTO.java | 5 -- .../dto/result/EpdcCompleteUserInfoDTO.java | 5 -- .../epdc/volunteer/EpdcVolunteerRankDTO.java | 15 +--- .../volunteer/entity/VolunteerRankEntity.java | 14 +--- .../impl/VolunteerRankServiceImpl.java | 3 - .../mapper/volunteer/VolunteerRankDao.xml | 13 +--- .../epdc-party-group-server/pom.xml | 2 - .../esua/epdc/feign/PointsFeignClient.java | 25 ------ .../fallback/PointsFeignClientFallback.java | 23 ------ .../service/impl/PartyTopicServiceImpl.java | 6 -- .../epdc-points/epdc-points-server/pom.xml | 2 - .../epdc/controller/PointsLogsController.java | 12 --- .../esua/epdc/feign/UsersFeignClient.java | 17 +--- .../fallback/UsersFeignClientFallback.java | 7 -- .../esua/epdc/service/PointsLogsService.java | 8 -- .../service/impl/PointsLogsServiceImpl.java | 77 ------------------- .../main/resources/mapper/PointsLogsDao.xml | 2 +- .../epdc/result/EpdcGetVolunteerRankDTO.java | 15 +--- .../esua/epdc/controller/UserController.java | 12 --- .../java/com/elink/esua/epdc/dao/UserDao.java | 8 -- .../elink/esua/epdc/service/UserService.java | 8 -- .../epdc/service/impl/UserServiceImpl.java | 5 -- .../src/main/resources/mapper/UserDao.xml | 17 ---- .../resources/mapper/VolunteerInfoDao.xml | 5 +- 25 files changed, 10 insertions(+), 303 deletions(-) delete mode 100644 esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/feign/PointsFeignClient.java delete mode 100644 esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/feign/fallback/PointsFeignClientFallback.java diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/BehaviorEnum.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/BehaviorEnum.java index 0e8a49cc..c4e80bc8 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/BehaviorEnum.java +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/BehaviorEnum.java @@ -310,12 +310,7 @@ public enum BehaviorEnum { /** * 内容评论的点踩 */ - NOTICE_COMMENT_OPPOSITION("notice_comment_opposition"), - - /** - * 话题违规，积分扣除 - */ - TOPIC_VIOLATIONS("topic_violations"); + NOTICE_COMMENT_OPPOSITION("notice_comment_opposition"); private String value; diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppVolunteerRankFormDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppVolunteerRankFormDTO.java index 0a765e3e..76fbac22 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppVolunteerRankFormDTO.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppVolunteerRankFormDTO.java @@ -24,9 +24,4 @@ public class EpdcAppVolunteerRankFormDTO implements Serializable { */ @Min(value = 1, message = "页容量必须大于0") private Integer pageSize; - - /** - * 排序字段 0 ：爱心时长 1：参与次数 2：公益积分 - */ - private String type; } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcCompleteUserInfoDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcCompleteUserInfoDTO.java index a380c7dd..469cfea3 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcCompleteUserInfoDTO.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcCompleteUserInfoDTO.java @@ -98,9 +98,4 @@ public class EpdcCompleteUserInfoDTO implements Serializable { * 志愿者标签 */ private String volunteerTagId; - - /** - * 志愿者所属部门 - */ - private String volunteerDeptId; } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/volunteer/EpdcVolunteerRankDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/volunteer/EpdcVolunteerRankDTO.java index 2205f6b6..c847ccd6 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/volunteer/EpdcVolunteerRankDTO.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/volunteer/EpdcVolunteerRankDTO.java @@ -63,17 +63,6 @@ public class EpdcVolunteerRankDTO implements Serializable { */ private Integer participationNum; - /** - * 志愿者部门ID - */ - private String volunteerDeptId; - /** - * 志愿者公益积分 - */ - private Integer volunteerPoints; - /** - * 志愿公益累计积分 - */ - private Integer volunteerPointsTotal; -} + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/entity/VolunteerRankEntity.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/entity/VolunteerRankEntity.java index 41873d93..6f95006f 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/entity/VolunteerRankEntity.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/entity/VolunteerRankEntity.java @@ -87,17 +87,5 @@ public class VolunteerRankEntity extends BaseEpdcEntity { * 是否显示(0-不显示，1-显示) */ private String showFlag; - /** - * 志愿者部门ID - */ - private String volunteerDeptId; - /** - * 志愿者公益积分 - */ - private Integer volunteerPoints; - /** - * 志愿公益累计积分 - */ - private Integer volunteerPointsTotal; -} +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerRankServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerRankServiceImpl.java index 1b91f67c..569ac3d6 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerRankServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerRankServiceImpl.java @@ -115,9 +115,6 @@ public class VolunteerRankServiceImpl extends BaseServiceImpl leaderboard(EpdcAppVolunteerRankFormDTO formDto){ int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize(); formDto.setPageIndex(pageIndex); - if(StringUtils.isBlank(formDto.getType())){ - formDto.setType("0"); - } return baseDao.leaderboard(formDto); } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/volunteer/VolunteerRankDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/volunteer/VolunteerRankDao.xml index 722af5f7..52d48209 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/volunteer/VolunteerRankDao.xml +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/volunteer/VolunteerRankDao.xml @@ -24,19 +24,10 @@ diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/pom.xml b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/pom.xml index d780c08d..53f53d21 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/pom.xml @@ -150,7 +150,6 @@ jinshui_epdc_test jinshui@833066 - false 115.29.142.202:8848 @@ -181,7 +180,6 @@ jinshui_epdc_test jinshui@833066 - true 115.29.142.202:8848 47.104.94.220 diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/feign/PointsFeignClient.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/feign/PointsFeignClient.java deleted file mode 100644 index bc4d875f..00000000 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/feign/PointsFeignClient.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.elink.esua.epdc.feign; - -import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.feign.fallback.PointsFeignClientFallback; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.http.MediaType; -import org.springframework.web.bind.annotation.PostMapping; - -import java.util.List; - -/** - * 积分管理模块 - * - * @author work@yujt.net.cn - * @date 2019/9/18 15:37 - */ -@FeignClient(name = ServiceConstant.EPDC_POINTS_SERVER, fallback = PointsFeignClientFallback.class) -public interface PointsFeignClient { - - - @PostMapping(value = "points/pointslogs/deletePointsByReferenceId", consumes = MediaType.APPLICATION_JSON_VALUE) - Result deletePointsByTopic(List topicIdList); - -} diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/feign/fallback/PointsFeignClientFallback.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/feign/fallback/PointsFeignClientFallback.java deleted file mode 100644 index 37b827a5..00000000 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/feign/fallback/PointsFeignClientFallback.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.elink.esua.epdc.feign.fallback; - -import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; -import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.PointsLogsBindUnIdDTO; -import com.elink.esua.epdc.feign.PointsFeignClient; -import org.springframework.stereotype.Component; - -import java.util.List; - -/** - * @author work@yujt.net.cn - * @date 2019/9/18 15:38 - */ -@Component -public class PointsFeignClientFallback implements PointsFeignClient { - - @Override - public Result deletePointsByTopic(List topicIdList) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_POINTS_SERVER, "deletePointsByTopic", topicIdList); - } -} diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTopicServiceImpl.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTopicServiceImpl.java index e713aabe..13e8440c 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTopicServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTopicServiceImpl.java @@ -47,7 +47,6 @@ import com.elink.esua.epdc.entity.PartyTopicEntity; import com.elink.esua.epdc.entity.PartyTopicUserAttitudeEntity; import com.elink.esua.epdc.feign.AdminFeignClient; import com.elink.esua.epdc.feign.ContentSecurityFeignClient; -import com.elink.esua.epdc.feign.PointsFeignClient; import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO; import com.elink.esua.epdc.rocketmq.dto.RejectRecordDTO; import com.elink.esua.epdc.service.PartyTopicImgService; @@ -91,10 +90,6 @@ public class PartyTopicServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -167,7 +162,6 @@ public class PartyTopicServiceImpl extends BaseServiceImpljinshui_epdc_test jinshui@833066 - false 115.29.142.202:8848 @@ -181,7 +180,6 @@ jinshui_epdc_test jinshui@833066 - true 115.29.142.202:8848 47.104.94.220 diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/PointsLogsController.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/PointsLogsController.java index f61ae76f..dda59d3b 100755 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/PointsLogsController.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/PointsLogsController.java @@ -181,16 +181,4 @@ public class PointsLogsController { return pointsLogsService.maBindUnIdLogs(formDto); } - /** - * @Description 话题积分恶意刷分 积分调整 - * @Author songyunpeng - * @Date 2021/7/15 - * @Param [idList] - * @return com.elink.esua.epdc.commons.tools.utils.Result - **/ - @PostMapping("deletePointsByReferenceId") - public Result deletePointsByTopic(@RequestBody List idList) { - return pointsLogsService.deletePointsByTopic(idList); - } - } diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/UsersFeignClient.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/UsersFeignClient.java index eee0e501..47d41623 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/UsersFeignClient.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/UsersFeignClient.java @@ -8,12 +8,7 @@ import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsFormDTO; import com.elink.esua.epdc.feign.fallback.UsersFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; - -import java.util.List; +import org.springframework.web.bind.annotation.*; /** @@ -43,16 +38,6 @@ public interface UsersFeignClient { @PostMapping(value = "app-user/user/updateUserPoints", consumes = MediaType.APPLICATION_JSON_VALUE) Result updateUserPoints(@RequestBody EpdcUserPointsFormDTO epdcUserPointsFormDTO); - /** - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @Description 批量更新用户积分信息 - * @Author songyunpeng - * @Date 2020/4/29 - * @Param [dto] - **/ - @PostMapping(value = "app-user/user/updateBatchUserPoints", consumes = MediaType.APPLICATION_JSON_VALUE) - Result updateBatchUserPoints(@RequestBody List epdcUserPointsFormDTO); - /** * @param formDTO * @return com.elink.esua.epdc.dto.UserDTO diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/fallback/UsersFeignClientFallback.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/fallback/UsersFeignClientFallback.java index 190bd604..ef21e6da 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/fallback/UsersFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/fallback/UsersFeignClientFallback.java @@ -9,8 +9,6 @@ import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsFormDTO; import com.elink.esua.epdc.feign.UsersFeignClient; import org.springframework.stereotype.Component; -import java.util.List; - /** * @author songyunpeng * @date 2020/4/28 9:30 @@ -28,11 +26,6 @@ public class UsersFeignClientFallback implements UsersFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "updateUserPoints", epdcUserPointsFormDTO); } - @Override - public Result updateBatchUserPoints(List epdcUserPointsFormDTO) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "updateBatchUserPoints", epdcUserPointsFormDTO); - } - @Override public Result handleUserPoints(EpdcUserPointsFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "handleUserPoints", formDTO); diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/PointsLogsService.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/PointsLogsService.java index 05e6a16a..2e8dc356 100755 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/PointsLogsService.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/PointsLogsService.java @@ -245,12 +245,4 @@ public interface PointsLogsService extends BaseService { Result maBindUnIdLogs(PointsLogsBindUnIdDTO formDto); Result test(); - /** - * @Description 话题积分恶意刷分 积分调整 - * @Author songyunpeng - * @Date 2021/7/15 - * @Param [idList] - * @return com.elink.esua.epdc.commons.tools.utils.Result - **/ - Result deletePointsByTopic(List idList); } diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java index 1b815ac6..1d577fa1 100755 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java @@ -24,7 +24,6 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.constant.PointsConstant; -import com.elink.esua.epdc.commons.tools.enums.BehaviorEnum; import com.elink.esua.epdc.commons.tools.enums.pointsenum.PointsOperationEnum; import com.elink.esua.epdc.commons.tools.enums.pointsenum.PointsOperationModeEnum; import com.elink.esua.epdc.commons.tools.exception.RenException; @@ -56,7 +55,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.*; -import java.util.stream.Collectors; /** * 积分记录表 积分记录表 @@ -564,81 +562,6 @@ public class PointsLogsServiceImpl extends BaseServiceImpl idList) { - if(idList.size() == 0){ - return new Result().error(); - } - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("REFERENCE_ID",idList); - List pointsLogsEntities = baseDao.selectList(queryWrapper); - if(pointsLogsEntities.size() == 0) { - return new Result(); - } - //组装 用户 - 扣减积分 - List epdcUserPointsFormDTOList = new ArrayList<>(); - //整理epdcUserPointsFormDTOList为 用户ID - 用户扣除的总分 - Map collect = pointsLogsEntities.stream().collect(Collectors.groupingBy(PointsLogsEntity::getUserId, Collectors.summarizingInt(PointsLogsEntity::getPoints))); - collect.forEach((k, v) -> { - EpdcUserPointsFormDTO epdcUserPointsFormDTO = new EpdcUserPointsFormDTO(); - epdcUserPointsFormDTO.setUserId(k); - epdcUserPointsFormDTO.setPoints(-Integer.parseInt(String.valueOf(v.getSum()))); - epdcUserPointsFormDTOList.add(epdcUserPointsFormDTO); - }); - //新增扣除积分记录： - insertTopicPointsLog(epdcUserPointsFormDTOList); - //扣除用户表相应积分 - usersFeignClient.updateBatchUserPoints(epdcUserPointsFormDTOList); - return new Result(); - } - /** - * @Description 新增扣除积分记录 - * @Author songyunpeng - * @Date 2021/7/15 - * @Param [epdcUserPointsFormDTOList] - * @return void - **/ - private void insertTopicPointsLog(List formDTOS) { - for (EpdcUserPointsFormDTO formDto : formDTOS) { - //根据动作编码获取动作信息 - Result behaviorCodeInfoByBehaviorCode = pointsBehaviorService.getBehaviorCodeInfoByBehaviorCode(BehaviorEnum.TOPIC_VIOLATIONS.getValue()); - Result userById = usersFeignClient.getUserById(formDto.getUserId()); - if(!userById.success()){ - throw new RenException("扣除话题积分记录 - 获取用户信息失败"); - } - UserDTO userDto = userById.getData(); - PointsLogsEntity pointsLogsEntity = new PointsLogsEntity(); - pointsLogsEntity.setUserId(formDto.getUserId()); - pointsLogsEntity.setNickname(userDto.getNickname()); - pointsLogsEntity.setFaceImg(userDto.getFaceImg()); - pointsLogsEntity.setOperationTime(new Date()); - pointsLogsEntity.setOperationMode(PointsOperationModeEnum.OPERATION_MODE_ADMIN.getOperationMode()); - pointsLogsEntity.setRuleCode(PointsConstant.behaviorCodeCode); - pointsLogsEntity.setBehaviorCode(BehaviorEnum.TOPIC_VIOLATIONS.getValue()); - pointsLogsEntity.setOperationDesc(behaviorCodeInfoByBehaviorCode.getData().getBehaviorDesc()); - pointsLogsEntity.setPoints(-formDto.getPoints()); - pointsLogsEntity.setOperationType("0"); - pointsLogsEntity.setReferenceId(formDto.getUserId()); - pointsLogsEntity.setLavePoints(userDto.getPoints() + formDto.getPoints()); - pointsLogsEntity.setRemark(""); - pointsLogsEntity.setRealName(userDto.getRealName()); - - // 赋值积分所属部门 - Result userGridIdByUserId = usersFeignClient.getUserGridIdByUserId(formDto.getUserId()); - Result parentAndAllDept = adminFeignClient.getParentAndAllDept(userGridIdByUserId.getData()); - ParentAndAllDeptDTO parentAndAllDeptDTO = parentAndAllDept.getData(); - pointsLogsEntity.setGrid(parentAndAllDeptDTO.getGrid()); - pointsLogsEntity.setGridId(parentAndAllDeptDTO.getGridId()); - pointsLogsEntity.setAllDeptIds(parentAndAllDeptDTO.getAllDeptIds()); - pointsLogsEntity.setAllDeptNames(parentAndAllDeptDTO.getAllDeptNames()); - pointsLogsEntity.setParentDeptIds(parentAndAllDeptDTO.getParentDeptIds()); - pointsLogsEntity.setParentDeptNames(parentAndAllDeptDTO.getParentDeptNames()); - - insert(pointsLogsEntity); - } - - } - private void insertLogs() { PointsLogsEntity entity = new PointsLogsEntity(); entity.setUserId("f093eaa6b6ace23b631e2e61e02b9e58"); diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/PointsLogsDao.xml b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/PointsLogsDao.xml index 89f51559..2ad48004 100755 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/PointsLogsDao.xml +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/PointsLogsDao.xml @@ -33,7 +33,7 @@ FROM epdc_points_logs l WHERE l.DEL_FLAG = 0 - AND l.USER_ID = #{userId} and BEHAVIOR_CODE != 'join_act' + AND l.USER_ID = #{userId} ORDER BY l.OPERATION_TIME DESC LIMIT #{pageIndex}, #{pageSize} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcGetVolunteerRankDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcGetVolunteerRankDTO.java index 88ffc3f7..5de780bd 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcGetVolunteerRankDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcGetVolunteerRankDTO.java @@ -119,17 +119,4 @@ public class EpdcGetVolunteerRankDTO implements Serializable { */ private String delFlag; - /** - * 志愿者部门ID - */ - private String volunteerDeptId; - /** - * 志愿者公益积分 - */ - private Integer volunteerPoints; - /** - * 志愿公益累计积分 - */ - private Integer volunteerPointsTotal; - -} +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java index 6f3d7439..f7071d69 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java @@ -340,18 +340,6 @@ public class UserController { return userService.updateUserPoints(epdcUserPointsFormDTO); } - /** - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @Description 更新用户积分信息 - * @Author songyunpeng - * @Date 2020/4/29 - * @Param [dto] - **/ - @PostMapping(value = "updateBatchUserPoints") - public Result updateBatchUserPoints(@RequestBody List epdcUserPointsFormDTO){ - return userService.updateBatchUserPoints(epdcUserPointsFormDTO); - } - /** * @return com.elink.esua.epdc.commons.tools.utils.Result * @Description 更新用户积分信息 diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java index 0452dbd2..0172f545 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java @@ -297,14 +297,6 @@ public interface UserDao extends BaseDao { * @return void **/ void updateUserPoints(EpdcUserPointsFormDTO epdcUserPointsFormDTO); - /** - * @Description 批量更新用户积分 - * @Author songyunpeng - * @Date 2020/12/11 - * @Param [epdcUserPointsFormDTO] - * @return void - **/ - void updateBatchUserPoints(@Param("list") List list); /** * @Description 获取用户绑定网格接口 - 未绑定 获取第一次扫码网格 * @Author songyunpeng diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java index 96de755a..6cd23a99 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java @@ -401,14 +401,6 @@ public interface UserService extends BaseService { * @return com.elink.esua.epdc.commons.tools.utils.Result **/ Result updateUserPoints(EpdcUserPointsFormDTO epdcUserPointsFormDTO); - /** - * @Description 批量更新用户积分信息 - * @Author songyunpeng - * @Date 2020/12/11 - * @Param [epdcUserPointsFormDTO] - * @return com.elink.esua.epdc.commons.tools.utils.Result - **/ - Result updateBatchUserPoints(List epdcUserPointsFormDTO); /** * @Description 获取用户积分接口 * @Author songyunpeng diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index edb0184e..670bff76 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java @@ -1482,11 +1482,6 @@ public class UserServiceImpl extends BaseServiceImpl implem baseDao.updateUserPoints(epdcUserPointsFormDTO); return new Result(); } - @Override - public Result updateBatchUserPoints(List epdcUserPointsFormDTO) { - baseDao.updateBatchUserPoints(epdcUserPointsFormDTO); - return new Result(); - } @Override public Result getPointsByUserId(String userId) { diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml index 5d236b13..29648194 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml @@ -16,23 +16,6 @@ update epdc_user set points = 0 where DEL_FLAG = '0' and UPDATED_TIME = now() - - update epdc_user - - - - - when id=#{item.userId} - then points + #{item.points} - - - - - where id in - - #{item.userId} - - DELETE FROM epdc_user WHERE WX_OPEN_ID = #{wxOpenId} AND STATE = '2' diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml index 89e51f09..76288ab7 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml @@ -199,10 +199,7 @@ vi.VOLUNTEER_NICKNAME as NICKNAME, eu.PARTY_FLAG, vi.KINDNESS_TIME, - vi.PARTICIPATION_NUM, - vi.VOLUNTEER_DEPT_ID, - vi.VOLUNTEER_POINTS, - vi.VOLUNTEER_POINTS_TOTAL + vi.PARTICIPATION_NUM from epdc_volunteer_info vi left join epdc_user eu on eu.id = vi.USER_ID WHERE vi.DEL_FLAG = '0' AND vi.AUDIT_STATUS IN ('0', '1') From 0eb5c7a4147f9a24a768bdf95475eb2507406382 Mon Sep 17 00:00:00 2001 From: liuchuang Date: Tue, 20 Jul 2021 16:46:26 +0800 Subject: [PATCH 05/10] =?UTF-8?q?Revert=20"Revert=20"=E5=BF=97=E6=84=BF?= =?UTF-8?q?=E8=80=85=E5=8A=9F=E8=83=BD=E8=B0=83=E6=95=B4""?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 5b53f550 --- .../commons/tools/enums/BehaviorEnum.java | 7 +- .../dto/form/EpdcAppVolunteerRankFormDTO.java | 5 ++ .../dto/result/EpdcCompleteUserInfoDTO.java | 5 ++ .../epdc/volunteer/EpdcVolunteerRankDTO.java | 15 +++- .../volunteer/entity/VolunteerRankEntity.java | 14 +++- .../impl/VolunteerRankServiceImpl.java | 3 + .../mapper/volunteer/VolunteerRankDao.xml | 13 +++- .../epdc-party-group-server/pom.xml | 2 + .../esua/epdc/feign/PointsFeignClient.java | 25 ++++++ .../fallback/PointsFeignClientFallback.java | 23 ++++++ .../service/impl/PartyTopicServiceImpl.java | 6 ++ .../epdc-points/epdc-points-server/pom.xml | 2 + .../epdc/controller/PointsLogsController.java | 12 +++ .../esua/epdc/feign/UsersFeignClient.java | 17 +++- .../fallback/UsersFeignClientFallback.java | 7 ++ .../esua/epdc/service/PointsLogsService.java | 8 ++ .../service/impl/PointsLogsServiceImpl.java | 77 +++++++++++++++++++ .../main/resources/mapper/PointsLogsDao.xml | 2 +- .../epdc/result/EpdcGetVolunteerRankDTO.java | 15 +++- .../esua/epdc/controller/UserController.java | 12 +++ .../java/com/elink/esua/epdc/dao/UserDao.java | 8 ++ .../elink/esua/epdc/service/UserService.java | 8 ++ .../epdc/service/impl/UserServiceImpl.java | 5 ++ .../src/main/resources/mapper/UserDao.xml | 17 ++++ .../resources/mapper/VolunteerInfoDao.xml | 5 +- 25 files changed, 303 insertions(+), 10 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/feign/PointsFeignClient.java create mode 100644 esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/feign/fallback/PointsFeignClientFallback.java diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/BehaviorEnum.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/BehaviorEnum.java index c4e80bc8..0e8a49cc 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/BehaviorEnum.java +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/BehaviorEnum.java @@ -310,7 +310,12 @@ public enum BehaviorEnum { /** * 内容评论的点踩 */ - NOTICE_COMMENT_OPPOSITION("notice_comment_opposition"); + NOTICE_COMMENT_OPPOSITION("notice_comment_opposition"), + + /** + * 话题违规，积分扣除 + */ + TOPIC_VIOLATIONS("topic_violations"); private String value; diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppVolunteerRankFormDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppVolunteerRankFormDTO.java index 76fbac22..0a765e3e 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppVolunteerRankFormDTO.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppVolunteerRankFormDTO.java @@ -24,4 +24,9 @@ public class EpdcAppVolunteerRankFormDTO implements Serializable { */ @Min(value = 1, message = "页容量必须大于0") private Integer pageSize; + + /** + * 排序字段 0 ：爱心时长 1：参与次数 2：公益积分 + */ + private String type; } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcCompleteUserInfoDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcCompleteUserInfoDTO.java index 469cfea3..a380c7dd 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcCompleteUserInfoDTO.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcCompleteUserInfoDTO.java @@ -98,4 +98,9 @@ public class EpdcCompleteUserInfoDTO implements Serializable { * 志愿者标签 */ private String volunteerTagId; + + /** + * 志愿者所属部门 + */ + private String volunteerDeptId; } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/volunteer/EpdcVolunteerRankDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/volunteer/EpdcVolunteerRankDTO.java index c847ccd6..2205f6b6 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/volunteer/EpdcVolunteerRankDTO.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/volunteer/EpdcVolunteerRankDTO.java @@ -63,6 +63,17 @@ public class EpdcVolunteerRankDTO implements Serializable { */ private Integer participationNum; + /** + * 志愿者部门ID + */ + private String volunteerDeptId; + /** + * 志愿者公益积分 + */ + private Integer volunteerPoints; + /** + * 志愿公益累计积分 + */ + private Integer volunteerPointsTotal; - -} \ No newline at end of file +} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/entity/VolunteerRankEntity.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/entity/VolunteerRankEntity.java index 6f95006f..41873d93 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/entity/VolunteerRankEntity.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/entity/VolunteerRankEntity.java @@ -87,5 +87,17 @@ public class VolunteerRankEntity extends BaseEpdcEntity { * 是否显示(0-不显示，1-显示) */ private String showFlag; + /** + * 志愿者部门ID + */ + private String volunteerDeptId; + /** + * 志愿者公益积分 + */ + private Integer volunteerPoints; + /** + * 志愿公益累计积分 + */ + private Integer volunteerPointsTotal; -} \ No newline at end of file +} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerRankServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerRankServiceImpl.java index 569ac3d6..1b91f67c 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerRankServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerRankServiceImpl.java @@ -115,6 +115,9 @@ public class VolunteerRankServiceImpl extends BaseServiceImpl leaderboard(EpdcAppVolunteerRankFormDTO formDto){ int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize(); formDto.setPageIndex(pageIndex); + if(StringUtils.isBlank(formDto.getType())){ + formDto.setType("0"); + } return baseDao.leaderboard(formDto); } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/volunteer/VolunteerRankDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/volunteer/VolunteerRankDao.xml index 52d48209..722af5f7 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/volunteer/VolunteerRankDao.xml +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/volunteer/VolunteerRankDao.xml @@ -24,10 +24,19 @@ diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/pom.xml b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/pom.xml index 53f53d21..d780c08d 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/pom.xml @@ -150,6 +150,7 @@ jinshui_epdc_test jinshui@833066 + false 115.29.142.202:8848 @@ -180,6 +181,7 @@ jinshui_epdc_test jinshui@833066 + true 115.29.142.202:8848 47.104.94.220 diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/feign/PointsFeignClient.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/feign/PointsFeignClient.java new file mode 100644 index 00000000..bc4d875f --- /dev/null +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/feign/PointsFeignClient.java @@ -0,0 +1,25 @@ +package com.elink.esua.epdc.feign; + +import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.feign.fallback.PointsFeignClientFallback; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.PostMapping; + +import java.util.List; + +/** + * 积分管理模块 + * + * @author work@yujt.net.cn + * @date 2019/9/18 15:37 + */ +@FeignClient(name = ServiceConstant.EPDC_POINTS_SERVER, fallback = PointsFeignClientFallback.class) +public interface PointsFeignClient { + + + @PostMapping(value = "points/pointslogs/deletePointsByReferenceId", consumes = MediaType.APPLICATION_JSON_VALUE) + Result deletePointsByTopic(List topicIdList); + +} diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/feign/fallback/PointsFeignClientFallback.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/feign/fallback/PointsFeignClientFallback.java new file mode 100644 index 00000000..37b827a5 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/feign/fallback/PointsFeignClientFallback.java @@ -0,0 +1,23 @@ +package com.elink.esua.epdc.feign.fallback; + +import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; +import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.PointsLogsBindUnIdDTO; +import com.elink.esua.epdc.feign.PointsFeignClient; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * @author work@yujt.net.cn + * @date 2019/9/18 15:38 + */ +@Component +public class PointsFeignClientFallback implements PointsFeignClient { + + @Override + public Result deletePointsByTopic(List topicIdList) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_POINTS_SERVER, "deletePointsByTopic", topicIdList); + } +} diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTopicServiceImpl.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTopicServiceImpl.java index 13e8440c..e713aabe 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTopicServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTopicServiceImpl.java @@ -47,6 +47,7 @@ import com.elink.esua.epdc.entity.PartyTopicEntity; import com.elink.esua.epdc.entity.PartyTopicUserAttitudeEntity; import com.elink.esua.epdc.feign.AdminFeignClient; import com.elink.esua.epdc.feign.ContentSecurityFeignClient; +import com.elink.esua.epdc.feign.PointsFeignClient; import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO; import com.elink.esua.epdc.rocketmq.dto.RejectRecordDTO; import com.elink.esua.epdc.service.PartyTopicImgService; @@ -90,6 +91,10 @@ public class PartyTopicServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -162,6 +167,7 @@ public class PartyTopicServiceImpl extends BaseServiceImpljinshui_epdc_test jinshui@833066 + false 115.29.142.202:8848 @@ -180,6 +181,7 @@ jinshui_epdc_test jinshui@833066 + true 115.29.142.202:8848 47.104.94.220 diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/PointsLogsController.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/PointsLogsController.java index dda59d3b..f61ae76f 100755 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/PointsLogsController.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/PointsLogsController.java @@ -181,4 +181,16 @@ public class PointsLogsController { return pointsLogsService.maBindUnIdLogs(formDto); } + /** + * @Description 话题积分恶意刷分 积分调整 + * @Author songyunpeng + * @Date 2021/7/15 + * @Param [idList] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + @PostMapping("deletePointsByReferenceId") + public Result deletePointsByTopic(@RequestBody List idList) { + return pointsLogsService.deletePointsByTopic(idList); + } + } diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/UsersFeignClient.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/UsersFeignClient.java index 47d41623..eee0e501 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/UsersFeignClient.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/UsersFeignClient.java @@ -8,7 +8,12 @@ import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsFormDTO; import com.elink.esua.epdc.feign.fallback.UsersFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; /** @@ -38,6 +43,16 @@ public interface UsersFeignClient { @PostMapping(value = "app-user/user/updateUserPoints", consumes = MediaType.APPLICATION_JSON_VALUE) Result updateUserPoints(@RequestBody EpdcUserPointsFormDTO epdcUserPointsFormDTO); + /** + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Description 批量更新用户积分信息 + * @Author songyunpeng + * @Date 2020/4/29 + * @Param [dto] + **/ + @PostMapping(value = "app-user/user/updateBatchUserPoints", consumes = MediaType.APPLICATION_JSON_VALUE) + Result updateBatchUserPoints(@RequestBody List epdcUserPointsFormDTO); + /** * @param formDTO * @return com.elink.esua.epdc.dto.UserDTO diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/fallback/UsersFeignClientFallback.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/fallback/UsersFeignClientFallback.java index ef21e6da..190bd604 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/fallback/UsersFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/fallback/UsersFeignClientFallback.java @@ -9,6 +9,8 @@ import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsFormDTO; import com.elink.esua.epdc.feign.UsersFeignClient; import org.springframework.stereotype.Component; +import java.util.List; + /** * @author songyunpeng * @date 2020/4/28 9:30 @@ -26,6 +28,11 @@ public class UsersFeignClientFallback implements UsersFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "updateUserPoints", epdcUserPointsFormDTO); } + @Override + public Result updateBatchUserPoints(List epdcUserPointsFormDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "updateBatchUserPoints", epdcUserPointsFormDTO); + } + @Override public Result handleUserPoints(EpdcUserPointsFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "handleUserPoints", formDTO); diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/PointsLogsService.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/PointsLogsService.java index 2e8dc356..05e6a16a 100755 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/PointsLogsService.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/PointsLogsService.java @@ -245,4 +245,12 @@ public interface PointsLogsService extends BaseService { Result maBindUnIdLogs(PointsLogsBindUnIdDTO formDto); Result test(); + /** + * @Description 话题积分恶意刷分 积分调整 + * @Author songyunpeng + * @Date 2021/7/15 + * @Param [idList] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + Result deletePointsByTopic(List idList); } diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java index 1d577fa1..1b815ac6 100755 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java @@ -24,6 +24,7 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.constant.PointsConstant; +import com.elink.esua.epdc.commons.tools.enums.BehaviorEnum; import com.elink.esua.epdc.commons.tools.enums.pointsenum.PointsOperationEnum; import com.elink.esua.epdc.commons.tools.enums.pointsenum.PointsOperationModeEnum; import com.elink.esua.epdc.commons.tools.exception.RenException; @@ -55,6 +56,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.*; +import java.util.stream.Collectors; /** * 积分记录表 积分记录表 @@ -562,6 +564,81 @@ public class PointsLogsServiceImpl extends BaseServiceImpl idList) { + if(idList.size() == 0){ + return new Result().error(); + } + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("REFERENCE_ID",idList); + List pointsLogsEntities = baseDao.selectList(queryWrapper); + if(pointsLogsEntities.size() == 0) { + return new Result(); + } + //组装 用户 - 扣减积分 + List epdcUserPointsFormDTOList = new ArrayList<>(); + //整理epdcUserPointsFormDTOList为 用户ID - 用户扣除的总分 + Map collect = pointsLogsEntities.stream().collect(Collectors.groupingBy(PointsLogsEntity::getUserId, Collectors.summarizingInt(PointsLogsEntity::getPoints))); + collect.forEach((k, v) -> { + EpdcUserPointsFormDTO epdcUserPointsFormDTO = new EpdcUserPointsFormDTO(); + epdcUserPointsFormDTO.setUserId(k); + epdcUserPointsFormDTO.setPoints(-Integer.parseInt(String.valueOf(v.getSum()))); + epdcUserPointsFormDTOList.add(epdcUserPointsFormDTO); + }); + //新增扣除积分记录： + insertTopicPointsLog(epdcUserPointsFormDTOList); + //扣除用户表相应积分 + usersFeignClient.updateBatchUserPoints(epdcUserPointsFormDTOList); + return new Result(); + } + /** + * @Description 新增扣除积分记录 + * @Author songyunpeng + * @Date 2021/7/15 + * @Param [epdcUserPointsFormDTOList] + * @return void + **/ + private void insertTopicPointsLog(List formDTOS) { + for (EpdcUserPointsFormDTO formDto : formDTOS) { + //根据动作编码获取动作信息 + Result behaviorCodeInfoByBehaviorCode = pointsBehaviorService.getBehaviorCodeInfoByBehaviorCode(BehaviorEnum.TOPIC_VIOLATIONS.getValue()); + Result userById = usersFeignClient.getUserById(formDto.getUserId()); + if(!userById.success()){ + throw new RenException("扣除话题积分记录 - 获取用户信息失败"); + } + UserDTO userDto = userById.getData(); + PointsLogsEntity pointsLogsEntity = new PointsLogsEntity(); + pointsLogsEntity.setUserId(formDto.getUserId()); + pointsLogsEntity.setNickname(userDto.getNickname()); + pointsLogsEntity.setFaceImg(userDto.getFaceImg()); + pointsLogsEntity.setOperationTime(new Date()); + pointsLogsEntity.setOperationMode(PointsOperationModeEnum.OPERATION_MODE_ADMIN.getOperationMode()); + pointsLogsEntity.setRuleCode(PointsConstant.behaviorCodeCode); + pointsLogsEntity.setBehaviorCode(BehaviorEnum.TOPIC_VIOLATIONS.getValue()); + pointsLogsEntity.setOperationDesc(behaviorCodeInfoByBehaviorCode.getData().getBehaviorDesc()); + pointsLogsEntity.setPoints(-formDto.getPoints()); + pointsLogsEntity.setOperationType("0"); + pointsLogsEntity.setReferenceId(formDto.getUserId()); + pointsLogsEntity.setLavePoints(userDto.getPoints() + formDto.getPoints()); + pointsLogsEntity.setRemark(""); + pointsLogsEntity.setRealName(userDto.getRealName()); + + // 赋值积分所属部门 + Result userGridIdByUserId = usersFeignClient.getUserGridIdByUserId(formDto.getUserId()); + Result parentAndAllDept = adminFeignClient.getParentAndAllDept(userGridIdByUserId.getData()); + ParentAndAllDeptDTO parentAndAllDeptDTO = parentAndAllDept.getData(); + pointsLogsEntity.setGrid(parentAndAllDeptDTO.getGrid()); + pointsLogsEntity.setGridId(parentAndAllDeptDTO.getGridId()); + pointsLogsEntity.setAllDeptIds(parentAndAllDeptDTO.getAllDeptIds()); + pointsLogsEntity.setAllDeptNames(parentAndAllDeptDTO.getAllDeptNames()); + pointsLogsEntity.setParentDeptIds(parentAndAllDeptDTO.getParentDeptIds()); + pointsLogsEntity.setParentDeptNames(parentAndAllDeptDTO.getParentDeptNames()); + + insert(pointsLogsEntity); + } + + } + private void insertLogs() { PointsLogsEntity entity = new PointsLogsEntity(); entity.setUserId("f093eaa6b6ace23b631e2e61e02b9e58"); diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/PointsLogsDao.xml b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/PointsLogsDao.xml index 2ad48004..89f51559 100755 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/PointsLogsDao.xml +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/PointsLogsDao.xml @@ -33,7 +33,7 @@ FROM epdc_points_logs l WHERE l.DEL_FLAG = 0 - AND l.USER_ID = #{userId} + AND l.USER_ID = #{userId} and BEHAVIOR_CODE != 'join_act' ORDER BY l.OPERATION_TIME DESC LIMIT #{pageIndex}, #{pageSize} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcGetVolunteerRankDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcGetVolunteerRankDTO.java index 5de780bd..88ffc3f7 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcGetVolunteerRankDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcGetVolunteerRankDTO.java @@ -119,4 +119,17 @@ public class EpdcGetVolunteerRankDTO implements Serializable { */ private String delFlag; -} \ No newline at end of file + /** + * 志愿者部门ID + */ + private String volunteerDeptId; + /** + * 志愿者公益积分 + */ + private Integer volunteerPoints; + /** + * 志愿公益累计积分 + */ + private Integer volunteerPointsTotal; + +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java index f7071d69..6f3d7439 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java @@ -340,6 +340,18 @@ public class UserController { return userService.updateUserPoints(epdcUserPointsFormDTO); } + /** + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Description 更新用户积分信息 + * @Author songyunpeng + * @Date 2020/4/29 + * @Param [dto] + **/ + @PostMapping(value = "updateBatchUserPoints") + public Result updateBatchUserPoints(@RequestBody List epdcUserPointsFormDTO){ + return userService.updateBatchUserPoints(epdcUserPointsFormDTO); + } + /** * @return com.elink.esua.epdc.commons.tools.utils.Result * @Description 更新用户积分信息 diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java index 0172f545..0452dbd2 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java @@ -297,6 +297,14 @@ public interface UserDao extends BaseDao { * @return void **/ void updateUserPoints(EpdcUserPointsFormDTO epdcUserPointsFormDTO); + /** + * @Description 批量更新用户积分 + * @Author songyunpeng + * @Date 2020/12/11 + * @Param [epdcUserPointsFormDTO] + * @return void + **/ + void updateBatchUserPoints(@Param("list") List list); /** * @Description 获取用户绑定网格接口 - 未绑定 获取第一次扫码网格 * @Author songyunpeng diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java index 6cd23a99..96de755a 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java @@ -401,6 +401,14 @@ public interface UserService extends BaseService { * @return com.elink.esua.epdc.commons.tools.utils.Result **/ Result updateUserPoints(EpdcUserPointsFormDTO epdcUserPointsFormDTO); + /** + * @Description 批量更新用户积分信息 + * @Author songyunpeng + * @Date 2020/12/11 + * @Param [epdcUserPointsFormDTO] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + Result updateBatchUserPoints(List epdcUserPointsFormDTO); /** * @Description 获取用户积分接口 * @Author songyunpeng diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index 670bff76..edb0184e 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java @@ -1482,6 +1482,11 @@ public class UserServiceImpl extends BaseServiceImpl implem baseDao.updateUserPoints(epdcUserPointsFormDTO); return new Result(); } + @Override + public Result updateBatchUserPoints(List epdcUserPointsFormDTO) { + baseDao.updateBatchUserPoints(epdcUserPointsFormDTO); + return new Result(); + } @Override public Result getPointsByUserId(String userId) { diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml index 29648194..5d236b13 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml @@ -16,6 +16,23 @@ update epdc_user set points = 0 where DEL_FLAG = '0' and UPDATED_TIME = now() + + update epdc_user + + + + + when id=#{item.userId} + then points + #{item.points} + + + + + where id in + + #{item.userId} + + DELETE FROM epdc_user WHERE WX_OPEN_ID = #{wxOpenId} AND STATE = '2' diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml index 76288ab7..89e51f09 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml @@ -199,7 +199,10 @@ vi.VOLUNTEER_NICKNAME as NICKNAME, eu.PARTY_FLAG, vi.KINDNESS_TIME, - vi.PARTICIPATION_NUM + vi.PARTICIPATION_NUM, + vi.VOLUNTEER_DEPT_ID, + vi.VOLUNTEER_POINTS, + vi.VOLUNTEER_POINTS_TOTAL from epdc_volunteer_info vi left join epdc_user eu on eu.id = vi.USER_ID WHERE vi.DEL_FLAG = '0' AND vi.AUDIT_STATUS IN ('0', '1') From 2978d1d023050e78c2ebeb8965c02535e49c7fe9 Mon Sep 17 00:00:00 2001 From: liuchuang Date: Tue, 20 Jul 2021 16:46:49 +0800 Subject: [PATCH 06/10] =?UTF-8?q?Revert=20"Revert=20"=E5=BF=97=E6=84=BF?= =?UTF-8?q?=E8=80=85=E5=8A=9F=E8=83=BD=20bug=E4=BF=AE=E6=94=B9""?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 86991447 --- .../epdc/dto/result/EpdcAppVolunteerRankDTO.java | 15 ++++++++++++++- .../epdc/service/impl/AppUserServiceImpl.java | 1 + .../epdc/modules/feign/UserInfoFeignClient.java | 2 +- .../modules/volunteer/dao/VolunteerRankDao.java | 3 +-- .../mapper/volunteer/VolunteerRankDao.xml | 2 +- .../v2/EpdcCompleteVolunteerInfoV2FormDTO.java | 2 +- 6 files changed, 19 insertions(+), 6 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppVolunteerRankDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppVolunteerRankDTO.java index d589c4f9..fdc0f5d9 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppVolunteerRankDTO.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppVolunteerRankDTO.java @@ -63,6 +63,19 @@ public class EpdcAppVolunteerRankDTO implements Serializable { */ private Integer participationNum; + /** + * 志愿者部门ID + */ + private String volunteerDeptId; + /** + * 志愿者公益积分 + */ + private Integer volunteerPoints; + /** + * 志愿公益累计积分 + */ + private Integer volunteerPointsTotal; + -} \ No newline at end of file +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java index ea660c1b..ee7c3441 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java @@ -948,6 +948,7 @@ public class AppUserServiceImpl implements AppUserService { dto.setVolunteerSignature(volunteerInfoDTO.getData().getVolunteerSignature()); dto.setIntroduce(volunteerInfoDTO.getData().getIntroduce()); dto.setVolunteerTagId(volunteerInfoDTO.getData().getTagId()); + dto.setVolunteerDeptId(volunteerInfoDTO.getData().getVolunteerDeptId()); // 如果用户表的身份证号为空，则尝试使用志愿者表中的身份证 if (null == dto.getIdentityNo() || "".equals(dto.getIdentityNo())) { dto.setIdentityNo(volunteerInfoDTO.getData().getIdentityNo()); diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/UserInfoFeignClient.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/UserInfoFeignClient.java index 7ac953bb..2d0d21b1 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/UserInfoFeignClient.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/UserInfoFeignClient.java @@ -107,7 +107,7 @@ public interface UserInfoFeignClient { * @Param [formDTO] * @return com.elink.esua.epdc.commons.tools.utils.Result **/ - @PostMapping(value = "app-user/user/handleVolunteerPoints", consumes = MediaType.APPLICATION_JSON_VALUE) + @PostMapping(value = "app-user/volunteerinfo/handleVolunteerPoints", consumes = MediaType.APPLICATION_JSON_VALUE) Result handleVolunteerPoints(EpdcVolunteerPointsFormDTO formDTO); } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/dao/VolunteerRankDao.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/dao/VolunteerRankDao.java index d1b41fad..19dd1499 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/dao/VolunteerRankDao.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/dao/VolunteerRankDao.java @@ -22,7 +22,6 @@ import com.elink.esua.epdc.dto.form.EpdcAppVolunteerRankFormDTO; import com.elink.esua.epdc.modules.volunteer.entity.VolunteerRankEntity; import com.elink.esua.epdc.volunteer.EpdcVolunteerRankDTO; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; import java.util.List; @@ -39,7 +38,7 @@ public interface VolunteerRankDao extends BaseDao { * @Author wanggongfeng * @return */ - List leaderboard(@Param("formDto") EpdcAppVolunteerRankFormDTO formDto); + List leaderboard(EpdcAppVolunteerRankFormDTO formDto); /** * @Description 清空排行榜数据 * @Author songyunpeng diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/volunteer/VolunteerRankDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/volunteer/VolunteerRankDao.xml index 722af5f7..5757e5da 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/volunteer/VolunteerRankDao.xml +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/volunteer/VolunteerRankDao.xml @@ -37,7 +37,7 @@ order by VOLUNTEER_POINTS desc - LIMIT #{formDto.pageIndex},#{formDto.pageSize} + LIMIT #{pageIndex},#{pageSize} delete from epdc_volunteer_rank diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/v2/EpdcCompleteVolunteerInfoV2FormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/v2/EpdcCompleteVolunteerInfoV2FormDTO.java index c9e9b274..51a92554 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/v2/EpdcCompleteVolunteerInfoV2FormDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/v2/EpdcCompleteVolunteerInfoV2FormDTO.java @@ -127,7 +127,7 @@ public class EpdcCompleteVolunteerInfoV2FormDTO implements Serializable { /** * 志愿者部门 */ - private String volunteerDept; + private String volunteerDeptId; } From feac651e4b6def2d159c9574378b44d8c3b0cb03 Mon Sep 17 00:00:00 2001 From: liuchuang Date: Tue, 20 Jul 2021 16:47:05 +0800 Subject: [PATCH 07/10] =?UTF-8?q?Revert=20"Revert=20"=E5=8E=BB=E9=99=A4?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=95=B0=E6=8D=AE=E5=BA=93=E5=89=8D=E7=BC=80?= =?UTF-8?q?""?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 45ab1ee9 --- .../user/VolunteerPointsAnalysisDao.xml | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/VolunteerPointsAnalysisDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/VolunteerPointsAnalysisDao.xml index 3863f027..a4e18b02 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/VolunteerPointsAnalysisDao.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/VolunteerPointsAnalysisDao.xml @@ -10,8 +10,8 @@ IFNULL(COUNT( DISTINCT v.ID ), 0) AS volunteerNum, IFNULL(SUM( l.POINTS ), 0) AS volunteerPoints FROM - js_esua_epdc_user.epdc_volunteer_dept d - LEFT JOIN js_esua_epdc_user.epdc_volunteer_info v ON v.VOLUNTEER_DEPT_ID = d.ID + esua_epdc_user.epdc_volunteer_dept d + LEFT JOIN esua_epdc_user.epdc_volunteer_info v ON v.VOLUNTEER_DEPT_ID = d.ID AND v.DEL_FLAG = '0' AND v.AUDIT_STATUS IN ( '0', '1' ) @@ -20,7 +20,7 @@ and DATE_FORMAT( v.REGIST_TIME, '%Y-%m-%d' ) <=#{endTime} - LEFT JOIN js_esua_epdc_points.epdc_points_logs l ON l.USER_ID = v.USER_ID + LEFT JOIN esua_epdc_points.epdc_points_logs l ON l.USER_ID = v.USER_ID AND l.DEL_FLAG = '0' AND l.BEHAVIOR_CODE = 'join_act' @@ -65,10 +65,10 @@ v.VOLUNTEER_SIGNATURE, v.ADDRESS FROM - js_esua_epdc_user.epdc_volunteer_info v - LEFT JOIN js_esua_epdc_user.epdc_volunteer_tag_relation r ON r.VOLUNTEER_ID = v.ID + esua_epdc_user.epdc_volunteer_info v + LEFT JOIN esua_epdc_user.epdc_volunteer_tag_relation r ON r.VOLUNTEER_ID = v.ID AND r.DEL_FLAG = '0' - LEFT JOIN js_esua_epdc_user.epdc_volunteer_tag t ON t.ID = r.TAG_ID + LEFT JOIN esua_epdc_user.epdc_volunteer_tag t ON t.ID = r.TAG_ID WHERE v.DEL_FLAG = '0' AND v.AUDIT_STATUS IN ( '0', '1' ) @@ -80,7 +80,7 @@ and DATE_FORMAT( v.REGIST_TIME, '%Y-%m-%d' ) <=#{endTime} ) tmp - LEFT JOIN js_esua_epdc_points.epdc_points_logs l ON l.USER_ID = tmp.USER_ID + LEFT JOIN esua_epdc_points.epdc_points_logs l ON l.USER_ID = tmp.USER_ID AND l.DEL_FLAG = '0' AND l.BEHAVIOR_CODE = 'join_act' @@ -105,10 +105,10 @@ ELSE ai.`TITLE` END AS actName, l.`OPERATION_TIME` - FROM `js_esua_epdc_points`.`epdc_points_logs` l - LEFT JOIN `js_esua_epdc_mutuality`.`epdc_act_user_points_log` aup on aup.`ID`= l.`REFERENCE_ID` - LEFT JOIN `js_esua_epdc_mutuality`.`epdc_act_user_relation` aur on aur.`ID`= aup.`ACT_USER_ID` - LEFT JOIN `js_esua_epdc_mutuality`.`epdc_act_info` ai on ai.`ID`= aur.`ACT_ID` + FROM `esua_epdc_points`.`epdc_points_logs` l + LEFT JOIN `esua_epdc_mutuality`.`epdc_act_user_points_log` aup on aup.`ID`= l.`REFERENCE_ID` + LEFT JOIN `esua_epdc_mutuality`.`epdc_act_user_relation` aur on aur.`ID`= aup.`ACT_USER_ID` + LEFT JOIN `esua_epdc_mutuality`.`epdc_act_info` ai on ai.`ID`= aur.`ACT_ID` WHERE l.`DEL_FLAG`= '0' AND l.`BEHAVIOR_CODE`= 'join_act' AND l.USER_ID = #{userId} From f38665475cbea6889c946dd4a3fb22c0ad0d6aa1 Mon Sep 17 00:00:00 2001 From: liuchuang Date: Tue, 20 Jul 2021 16:47:21 +0800 Subject: [PATCH 08/10] =?UTF-8?q?Revert=20"Revert=20"=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E7=AB=AF-=E5=BF=97=E6=84=BF=E8=80=85=E9=93=B6=E8=A1=8C-?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=85=AC=E7=9B=8A=E7=A7=AF=E5=88=86=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E6=8E=A5=E5=8F=A3=20init""?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 6caf9aca --- .../form/VolunteerPointsRecordsFormDTO.java | 34 ++++++++++++++ .../VolunteerPointsRecordsResultDTO.java | 5 +++ .../VolunteerPointsAnalysisCotroller.java | 23 ++++++++-- .../user/dao/VolunteerPointsAnalysisDao.java | 11 +++++ .../VolunteerPointsAnalysisService.java | 12 +++++ .../VolunteerPointsAnalysisServiceImpl.java | 9 ++++ .../user/VolunteerPointsAnalysisDao.xml | 22 ++++++++++ .../ApiVolunteerPointsRecordsFormDTO.java | 34 ++++++++++++++ .../ApiVolunteerPointsRecordsResultDTO.java | 44 +++++++++++++++++++ .../epdc/controller/ApiPointsController.java | 17 +++++++ .../esua/epdc/feign/AnalysisFeignClient.java | 15 +++++++ .../fallback/AnalysisFeignClientFallback.java | 9 ++++ .../esua/epdc/service/PointsService.java | 13 ++++++ .../epdc/service/impl/PointsServiceImpl.java | 11 +++++ 14 files changed, 255 insertions(+), 4 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/VolunteerPointsRecordsFormDTO.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/ApiVolunteerPointsRecordsFormDTO.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/ApiVolunteerPointsRecordsResultDTO.java diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/VolunteerPointsRecordsFormDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/VolunteerPointsRecordsFormDTO.java new file mode 100644 index 00000000..e461dd25 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/VolunteerPointsRecordsFormDTO.java @@ -0,0 +1,34 @@ +package com.elink.esua.epdc.dto.user.form; + +import lombok.Data; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Author：liuchuang + * @Date：2021/7/19 16:07 + */ +@Data +public class VolunteerPointsRecordsFormDTO implements Serializable { + private static final long serialVersionUID = 1625467226873432125L; + + /** + * 页码 + */ + @Min(value = 1, message = "页码必须大于0") + private Integer pageIndex; + + /** + * 页容量 + */ + @Min(value = 1, message = "每页条数必须大于0") + private Integer pageSize; + + /** + * 用户ID + */ + @NotBlank(message = "获取用户信息失败") + private String userId; +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/VolunteerPointsRecordsResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/VolunteerPointsRecordsResultDTO.java index b3b70183..dd5a12ce 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/VolunteerPointsRecordsResultDTO.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/VolunteerPointsRecordsResultDTO.java @@ -36,4 +36,9 @@ public class VolunteerPointsRecordsResultDTO implements Serializable { * 积分 */ private Integer volunteerPoints; + + /** + * 积分操作类型 0-减积分，1-加积分 + */ + private String operationType; } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/VolunteerPointsAnalysisCotroller.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/VolunteerPointsAnalysisCotroller.java index a880e9f3..d319fbb3 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/VolunteerPointsAnalysisCotroller.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/VolunteerPointsAnalysisCotroller.java @@ -2,16 +2,16 @@ package com.elink.esua.epdc.modules.user.controller; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +import com.elink.esua.epdc.dto.user.form.VolunteerPointsRecordsFormDTO; import com.elink.esua.epdc.dto.user.result.DeptVolunteerResultDTO; import com.elink.esua.epdc.dto.user.result.VolunteerPointsRecordsResultDTO; import com.elink.esua.epdc.dto.user.result.VolunteerPointsStaticResultDTO; import com.elink.esua.epdc.modules.user.service.VolunteerPointsAnalysisService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; +import java.util.List; import java.util.Map; /** @@ -68,4 +68,19 @@ public class VolunteerPointsAnalysisCotroller { PageData data = volunteerPointsAnalysisService.volunteerPointsRecords(params); return new Result>().ok(data); } + + /** + * 居民端-志愿者银行-用户公益积分记录 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author liuchuang + * @since 2021/7/19 16:13 + */ + @GetMapping("charityPoints") + public Result> charityPoints(@RequestBody VolunteerPointsRecordsFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + List data = volunteerPointsAnalysisService.charityPoints(formDto); + return new Result>().ok(data); + } } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/VolunteerPointsAnalysisDao.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/VolunteerPointsAnalysisDao.java index 5e763e0d..120f7a28 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/VolunteerPointsAnalysisDao.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/VolunteerPointsAnalysisDao.java @@ -1,6 +1,7 @@ package com.elink.esua.epdc.modules.user.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.elink.esua.epdc.dto.user.form.VolunteerPointsRecordsFormDTO; import com.elink.esua.epdc.dto.user.result.DeptVolunteerResultDTO; import com.elink.esua.epdc.dto.user.result.VolunteerPointsRecordsResultDTO; import com.elink.esua.epdc.dto.user.result.VolunteerPointsStaticResultDTO; @@ -44,4 +45,14 @@ public interface VolunteerPointsAnalysisDao extends BaseMapper volunteerPointsRecords(Map params); + + /** + * 居民端-志愿者银行-用户公益积分记录 + * + * @param formDto + * @return java.util.List + * @author liuchuang + * @since 2021/7/19 16:14 + */ + List charityPoints(VolunteerPointsRecordsFormDTO formDto); } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/VolunteerPointsAnalysisService.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/VolunteerPointsAnalysisService.java index fb408d22..dead2c9f 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/VolunteerPointsAnalysisService.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/VolunteerPointsAnalysisService.java @@ -1,10 +1,12 @@ package com.elink.esua.epdc.modules.user.service; import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.dto.user.form.VolunteerPointsRecordsFormDTO; import com.elink.esua.epdc.dto.user.result.DeptVolunteerResultDTO; import com.elink.esua.epdc.dto.user.result.VolunteerPointsRecordsResultDTO; import com.elink.esua.epdc.dto.user.result.VolunteerPointsStaticResultDTO; +import java.util.List; import java.util.Map; /** @@ -42,4 +44,14 @@ public interface VolunteerPointsAnalysisService { * @since 2021/7/15 14:48 */ PageData volunteerPointsRecords(Map params); + + /** + * 居民端-志愿者银行-用户公益积分记录 + * + * @param formDto + * @return java.util.List + * @author liuchuang + * @since 2021/7/19 16:14 + */ + List charityPoints(VolunteerPointsRecordsFormDTO formDto); } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/VolunteerPointsAnalysisServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/VolunteerPointsAnalysisServiceImpl.java index bd6f7f44..5f421ef5 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/VolunteerPointsAnalysisServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/VolunteerPointsAnalysisServiceImpl.java @@ -2,7 +2,9 @@ package com.elink.esua.epdc.modules.user.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; +import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.dto.user.form.VolunteerPointsRecordsFormDTO; import com.elink.esua.epdc.dto.user.result.DeptVolunteerResultDTO; import com.elink.esua.epdc.dto.user.result.VolunteerPointsRecordsResultDTO; import com.elink.esua.epdc.dto.user.result.VolunteerPointsStaticResultDTO; @@ -40,4 +42,11 @@ public class VolunteerPointsAnalysisServiceImpl extends BaseServiceImpl list = baseDao.volunteerPointsRecords(params); return new PageData<>(list, iPage.getTotal()); } + + @Override + public List charityPoints(VolunteerPointsRecordsFormDTO formDto) { + int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize(); + formDto.setPageIndex(pageIndex); + return baseDao.charityPoints(formDto); + } } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/VolunteerPointsAnalysisDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/VolunteerPointsAnalysisDao.xml index a4e18b02..45addcd5 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/VolunteerPointsAnalysisDao.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/VolunteerPointsAnalysisDao.xml @@ -121,4 +121,26 @@ ORDER BY l.`OPERATION_TIME` DESC + + diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/ApiVolunteerPointsRecordsFormDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/ApiVolunteerPointsRecordsFormDTO.java new file mode 100644 index 00000000..bfb2f829 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/ApiVolunteerPointsRecordsFormDTO.java @@ -0,0 +1,34 @@ +package com.elink.esua.epdc.dto.form; + +import lombok.Data; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Author：liuchuang + * @Date：2021/7/19 16:07 + */ +@Data +public class ApiVolunteerPointsRecordsFormDTO implements Serializable { + private static final long serialVersionUID = 1625467226873432125L; + + /** + * 页码 + */ + @Min(value = 1, message = "页码必须大于0") + private Integer pageIndex; + + /** + * 页容量 + */ + @Min(value = 1, message = "每页条数必须大于0") + private Integer pageSize; + + /** + * 用户ID + */ + @NotBlank(message = "获取用户信息失败") + private String userId; +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/ApiVolunteerPointsRecordsResultDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/ApiVolunteerPointsRecordsResultDTO.java new file mode 100644 index 00000000..8b2a86d0 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/ApiVolunteerPointsRecordsResultDTO.java @@ -0,0 +1,44 @@ +package com.elink.esua.epdc.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author：liuchuang + * @Date：2021/7/15 14:45 + */ +@Data +public class ApiVolunteerPointsRecordsResultDTO implements Serializable { + private static final long serialVersionUID = -286937478420813680L; + + /** + * 积分记录ID + */ + private String id; + + /** + * 昵称 + */ + private String nickname; + + /** + * 活动名称 + */ + private String actName; + + /** + * 积分记录时间 + */ + private String operationTime; + + /** + * 积分 + */ + private Integer volunteerPoints; + + /** + * 积分操作类型 0-减积分，1-加积分 + */ + private String operationType; +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiPointsController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiPointsController.java index 681ce6fe..8f1e5c2c 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiPointsController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiPointsController.java @@ -4,13 +4,16 @@ import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.annotation.LoginUser; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +import com.elink.esua.epdc.dto.form.ApiVolunteerPointsRecordsFormDTO; import com.elink.esua.epdc.dto.form.EpdcAppPointsRankingFormDTO; import com.elink.esua.epdc.dto.form.EpdcAppPointsRecordFormDTO; +import com.elink.esua.epdc.dto.result.ApiVolunteerPointsRecordsResultDTO; import com.elink.esua.epdc.dto.result.EpdcAppPointsRankingResultDTO; import com.elink.esua.epdc.dto.result.EpdcAppPointsRecordResultDTO; import com.elink.esua.epdc.service.PointsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -55,4 +58,18 @@ public class ApiPointsController { ValidatorUtils.validateEntity(formDto); return pointsService.listPointsRanking(userDetail, formDto); } + + /** + * 居民端-志愿者银行-用户公益积分记录 + * + * @param userDetail + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author liuchuang + * @since 2021/7/19 16:32 + */ + @GetMapping("charityPoints") + public Result> charityPoints(@LoginUser TokenDto userDetail, ApiVolunteerPointsRecordsFormDTO formDto) { + return pointsService.charityPoints(userDetail, formDto); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java index c206e8ad..284adeb6 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java @@ -2,10 +2,15 @@ package com.elink.esua.epdc.feign; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.form.ApiVolunteerPointsRecordsFormDTO; +import com.elink.esua.epdc.dto.result.ApiVolunteerPointsRecordsResultDTO; import com.elink.esua.epdc.feign.fallback.AnalysisFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; /** * 数据分析模块调用 @@ -26,5 +31,15 @@ public interface AnalysisFeignClient { @GetMapping(value = "analysis/workLog/getCustomId", consumes = MediaType.APPLICATION_JSON_VALUE) Result getCustomId(); + /** + * 居民端-志愿者银行-用户公益积分记录 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author liuchuang + * @since 2021/7/19 16:36 + */ + @GetMapping(value = "analysis/volunteer/charityPoints", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> charityPoints(ApiVolunteerPointsRecordsFormDTO formDto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java index bb6072e5..491f7558 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java @@ -3,9 +3,13 @@ package com.elink.esua.epdc.feign.fallback; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.form.ApiVolunteerPointsRecordsFormDTO; +import com.elink.esua.epdc.dto.result.ApiVolunteerPointsRecordsResultDTO; import com.elink.esua.epdc.feign.AnalysisFeignClient; import org.springframework.stereotype.Component; +import java.util.List; + /** * @Author：songyunpeg * @Date：2020/9/9 15:42 @@ -17,4 +21,9 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient { public Result getCustomId() { return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getCustomId"); } + + @Override + public Result> charityPoints(ApiVolunteerPointsRecordsFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "charityPoints", "formDto"); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/PointsService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/PointsService.java index 313a5934..a782b960 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/PointsService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/PointsService.java @@ -2,8 +2,10 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.form.ApiVolunteerPointsRecordsFormDTO; import com.elink.esua.epdc.dto.form.EpdcAppPointsRankingFormDTO; import com.elink.esua.epdc.dto.form.EpdcAppPointsRecordFormDTO; +import com.elink.esua.epdc.dto.result.ApiVolunteerPointsRecordsResultDTO; import com.elink.esua.epdc.dto.result.EpdcAppPointsRankingResultDTO; import com.elink.esua.epdc.dto.result.EpdcAppPointsRecordResultDTO; @@ -42,4 +44,15 @@ public interface PointsService { * @Date: 2020-04-30 */ Result listPointsRanking(TokenDto userDetail, EpdcAppPointsRankingFormDTO formDto); + + /** + * 居民端-志愿者银行-用户公益积分记录 + * + * @param userDetail + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author liuchuang + * @since 2021/7/19 16:34 + */ + Result> charityPoints(TokenDto userDetail, ApiVolunteerPointsRecordsFormDTO formDto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/PointsServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/PointsServiceImpl.java index 61e3e36c..3c66fc6c 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/PointsServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/PointsServiceImpl.java @@ -2,10 +2,13 @@ package com.elink.esua.epdc.service.impl; import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.form.ApiVolunteerPointsRecordsFormDTO; import com.elink.esua.epdc.dto.form.EpdcAppPointsRankingFormDTO; import com.elink.esua.epdc.dto.form.EpdcAppPointsRecordFormDTO; +import com.elink.esua.epdc.dto.result.ApiVolunteerPointsRecordsResultDTO; import com.elink.esua.epdc.dto.result.EpdcAppPointsRankingResultDTO; import com.elink.esua.epdc.dto.result.EpdcAppPointsRecordResultDTO; +import com.elink.esua.epdc.feign.AnalysisFeignClient; import com.elink.esua.epdc.feign.PointsFeignClient; import com.elink.esua.epdc.service.PointsService; import org.springframework.beans.factory.annotation.Autowired; @@ -23,6 +26,8 @@ public class PointsServiceImpl implements PointsService { @Autowired private PointsFeignClient pointsFeignClient; + @Autowired + private AnalysisFeignClient analysisFeignClient; @Override public Result> listPointsRecord(TokenDto userDetail, EpdcAppPointsRecordFormDTO formDto) { @@ -36,4 +41,10 @@ public class PointsServiceImpl implements PointsService { formDto.setNickName(userDetail.getNickname()); return pointsFeignClient.listPointsRankingFeignClient(formDto); } + + @Override + public Result> charityPoints(TokenDto userDetail, ApiVolunteerPointsRecordsFormDTO formDto) { + formDto.setUserId(userDetail.getUserId()); + return analysisFeignClient.charityPoints(formDto); + } } From 7ba2f885ef12caee8f3efa9b7594e7de5e721f4c Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Tue, 20 Jul 2021 16:47:29 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/modules/user/dao/VolunteerPointsAnalysisDao.java | 1 + 1 file changed, 1 insertion(+) diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/VolunteerPointsAnalysisDao.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/VolunteerPointsAnalysisDao.java index 120f7a28..4c00c686 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/VolunteerPointsAnalysisDao.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/VolunteerPointsAnalysisDao.java @@ -25,6 +25,7 @@ public interface VolunteerPointsAnalysisDao extends BaseMapper volunteerPointsStatic(Map params); /** From 332e5dab5df5c9fe27e8004ad5cc66a518f0a856 Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Tue, 20 Jul 2021 17:25:04 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E7=A7=AF=E5=88=86=E4=BB=A3=E7=A0=81=E5=9B=9E=E6=BB=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ActUserClockLogServiceImpl.java | 13 +++++++++++-- .../impl/ActUserRelationServiceImpl.java | 18 +++++++++++++----- .../main/resources/mapper/PointsLogsDao.xml | 2 +- 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java index 72a8f7c0..ce191c97 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java @@ -46,8 +46,8 @@ import com.elink.esua.epdc.dto.PointsLogsDTO; import com.elink.esua.epdc.dto.UserDTO; import com.elink.esua.epdc.dto.VolunteerInfoDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO; +import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcVolunteerKindnessTimeFormDTO; -import com.elink.esua.epdc.dto.epdc.form.EpdcVolunteerPointsFormDTO; import com.elink.esua.epdc.dto.result.BehaviorResultDto; import com.elink.esua.epdc.modules.activity.dao.ActUserClockLogDao; import com.elink.esua.epdc.modules.activity.entity.ActInfoEntity; @@ -278,7 +278,7 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl result = userInfoFeignClient.handleUserPoints(userPointsFormDTO); + if (!result.success()) { + throw new RenException("更新用户积分异常"); } return new Result(); } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java index 01ba9b0c..dc632685 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java @@ -44,7 +44,7 @@ import com.elink.esua.epdc.dto.PointsLogsDTO; import com.elink.esua.epdc.dto.UserDTO; import com.elink.esua.epdc.dto.VolunteerInfoDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO; -import com.elink.esua.epdc.dto.epdc.form.EpdcVolunteerPointsFormDTO; +import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsFormDTO; import com.elink.esua.epdc.dto.form.EpdcClockListV2FormDTO; import com.elink.esua.epdc.dto.result.BehaviorResultDto; import com.elink.esua.epdc.modules.activity.dao.ActInfoDao; @@ -332,8 +332,6 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl result = userInfoFeignClient.handleUserPoints(userPointsFormDTO); + if (!result.success()) { + throw new RenException("更新用户积分异常"); + } + /*EpdcVolunteerPointsFormDTO volunteerPointsFormDTO = new EpdcVolunteerPointsFormDTO(); volunteerPointsFormDTO.setVolunteerId(volunteerInfoDTOResult.getData().getId()); volunteerPointsFormDTO.setPoints(actInfoDTO.getReward()); volunteerPointsFormDTO.setOperationType(PointsOperationEnum.OPERATION_TYPE_ADD.getOperationType()); @@ -390,7 +398,7 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl