diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java index 31d670148a..aa77bd8eae 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java @@ -367,9 +367,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService if (StringUtils.isBlank(partyUserId)) { throw new RenException("addUserPartyBadge,用户Id不能为空"); } - AddUserPartyBadgeFormDTO badgeFormDTO = new AddUserPartyBadgeFormDTO(); - badgeFormDTO.setUserId(partyUserId); - Result result = epmetUserOpenFeignClient.initBadge(badgeFormDTO); + Result result = epmetUserOpenFeignClient.initBadge(partyUserId); if (result == null || !result.success()) { throw new RenException("初始化党员徽章信息失败"); } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index ea35e420c0..b385738d82 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -10,10 +10,7 @@ import com.epmet.dto.result.*; import com.epmet.feign.fallback.EpmetUserOpenFeignClientFallback; 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 org.springframework.web.bind.annotation.*; import java.util.List; import java.util.Map; @@ -445,11 +442,11 @@ public interface EpmetUserOpenFeignClient { Result> queryGridAuditingBadgeCount(@RequestBody List gridIdList); /** - * @param formDTO + * @param userId * @author yinzuomei * @description 党员认证成功后 添加userBadge记录到数据库 * @Date 2020/11/12 15:41 **/ @PostMapping(value = "/epmetuser/more/badge/initbadge") - Result initBadge(@RequestBody AddUserPartyBadgeFormDTO formDTO); + Result initBadge(@RequestParam String userId); } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java index 2bbc2a83e4..6ac75b91e1 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java @@ -313,7 +313,7 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien } @Override - public Result initBadge(AddUserPartyBadgeFormDTO formDTO) { - return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "initBadge", formDTO); + public Result initBadge(String partyUserId) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "initBadge", partyUserId); } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBadgeController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBadgeController.java index 7524ffa1be..3cfab36c41 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBadgeController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBadgeController.java @@ -11,10 +11,7 @@ import com.epmet.dto.result.UserBadgeListResultDTO; import com.epmet.dto.result.UserOperListResultDTO; import com.epmet.service.UserBadgeService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -119,8 +116,8 @@ public class UserBadgeController { * @date 2020/11/18 下午3:03 */ @PostMapping("initbadge") - public Result initPartyMemberBadge(@RequestBody AddUserPartyBadgeFormDTO formDTO) { - userBadgeService.initPartyMemberBadge(formDTO.getUserId()); + public Result initPartyMemberBadge(@RequestParam(required = false) String userId) { + userBadgeService.initPartyMemberBadge(userId); return new Result(); } }