From 8f2abbbda6c87c59d0c2c5da9979e78ea38e74db Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期二, 21 一月 2025 18:15:00 +0800 Subject: [PATCH] 合并代码 --- cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/IntroduceRewardsClient.java | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/IntroduceRewardsClient.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/IntroduceRewardsClient.java index a12ecfd..25c534e 100644 --- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/IntroduceRewardsClient.java +++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/IntroduceRewardsClient.java @@ -1,12 +1,13 @@ package com.dsh.account.feignclient.activity; +import com.dsh.account.entity.IntroduceRewards; +import com.dsh.account.feignclient.activity.model.IntrduceOfUserRequest; import com.dsh.account.feignclient.competition.model.PurchaseRecordVo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RequestBody; -import java.util.Date; import java.util.List; @FeignClient(value = "mb-cloud-activity") @@ -14,10 +15,10 @@ @PostMapping("/base/introduce/useOfRewards") - public List<PurchaseRecordVo> queryAppUsersofIntroduce(@RequestParam("startTime") Date startTime, - @RequestParam("endTime") Date endTime, - @RequestParam("userIds") List<Integer> userIds); + public List<PurchaseRecordVo> queryAppUsersofIntroduce(@RequestBody IntrduceOfUserRequest request); + @PostMapping("/base/introduce/getGiftList") + List<IntroduceRewards> getGiftList(@RequestBody String cityCode); } -- Gitblit v1.7.1