Commit 9c09ad30 by chenmingyang

modify account service dto name and api config

parent 9ea91eeb
......@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestParam;
*
* @author better create in 2019-05-07 15:15
*/
@FeignClient(value = "https://ad.toutiao.com/open_api/2", url = "/majordomo")
@FeignClient(value = "${toutiao.api.advertiser-url}", url = "/majordomo")
public interface AccountApi {
/**
......
package io.better.toutiao.api.account;
import io.better.toutiao.dto.TouTiaoRespDTO;
import io.better.toutiao.dto.account.AdvertiserInfoDTO;
import io.better.toutiao.dto.account.AdvertiserQualificationDTO;
import io.better.toutiao.dto.account.AdvertiserInfoReqRespDTO;
import io.better.toutiao.dto.account.AdvertiserQualificationReqRespDTO;
import org.springframework.cloud.netflix.feign.FeignClient;
import org.springframework.web.bind.annotation.*;
......@@ -23,9 +23,9 @@ public interface AdvertiserApi {
* @return the advertiser info
*/
@GetMapping(value = "/info")
TouTiaoRespDTO<AdvertiserInfoDTO> getAdvertiserInfo(@RequestHeader("Access-Token") String accessToken,
@RequestParam("advertiser_ids") Long[] advertiserIds,
@RequestParam("fields") String[] fields
TouTiaoRespDTO<AdvertiserInfoReqRespDTO> getAdvertiserInfo(@RequestHeader("Access-Token") String accessToken,
@RequestParam("advertiser_ids") Long[] advertiserIds,
@RequestParam("fields") String[] fields
);
/**
......@@ -36,8 +36,8 @@ public interface AdvertiserApi {
* @return advertiser qualification
*/
@GetMapping(value = "/qualification/get/")
TouTiaoRespDTO<AdvertiserQualificationDTO> getAdvertiserQualification(@RequestHeader("Access-Token") String accessToken,
@RequestParam("advertiser_id") Integer advertiserId
TouTiaoRespDTO<AdvertiserQualificationReqRespDTO> getAdvertiserQualification(@RequestHeader("Access-Token") String accessToken,
@RequestParam("advertiser_id") Integer advertiserId
);
......@@ -50,7 +50,7 @@ public interface AdvertiserApi {
*/
@PostMapping(value = "qualification/submit/")
TouTiaoRespDTO<?> submitAdvertiserQualification(@RequestHeader("Access-Token") String accessToken,
@RequestBody AdvertiserQualificationDTO advertiserQualification
@RequestBody AdvertiserQualificationReqRespDTO advertiserQualification
);
......@@ -62,8 +62,8 @@ public interface AdvertiserApi {
* @return the advertiser public info
*/
@GetMapping(value = "/public_info")
TouTiaoRespDTO<AdvertiserInfoDTO> getAdvertiserPublicInfo(@RequestHeader("Access-Token") String accessToken,
@RequestParam("advertiser_ids") Long[] advertiserIds
TouTiaoRespDTO<AdvertiserInfoReqRespDTO> getAdvertiserPublicInfo(@RequestHeader("Access-Token") String accessToken,
@RequestParam("advertiser_ids") Long[] advertiserIds
);
}
package io.better.toutiao.api.account;
import io.better.toutiao.dto.TouTiaoRespDTO;
import io.better.toutiao.dto.account.AdvertiserInfoDTO;
import io.better.toutiao.dto.account.AdvertiserDTO;
import io.better.toutiao.dto.account.AdvertiserInfoReqRespDTO;
import io.better.toutiao.dto.account.AdvertiserRespDTO;
import org.springframework.cloud.netflix.feign.FeignClient;
import org.springframework.web.bind.annotation.*;
......@@ -24,10 +24,10 @@ public interface AgentApi {
* @return advertiser by agent id
*/
@GetMapping(value = "/advertiser/select")
TouTiaoRespDTO<AdvertiserDTO> getAdvertiserByAgentId(@RequestHeader("Access-Token") String accessToken,
@RequestParam("advertiser_id") Long advertiserId,
@RequestParam(value = "page", defaultValue = "1", required = false) String page,
@RequestParam(value = "page_size", defaultValue = "100", required = false) String pageSize);
TouTiaoRespDTO<AdvertiserRespDTO> getAdvertiserByAgentId(@RequestHeader("Access-Token") String accessToken,
@RequestParam("advertiser_id") Long advertiserId,
@RequestParam(value = "page", defaultValue = "1", required = false) String page,
@RequestParam(value = "page_size", defaultValue = "100", required = false) String pageSize);
/**
* 账号服务-代理商账号-创建广告主信息
......@@ -37,8 +37,8 @@ public interface AgentApi {
* @return the list
*/
@PostMapping(value = "/advertiser/create")
TouTiaoRespDTO<AdvertiserInfoDTO> createAdvertiserByAgent(@RequestHeader("Access-Token") String accessToken,
@RequestBody AdvertiserInfoDTO advertiserInfo);
TouTiaoRespDTO<AdvertiserInfoReqRespDTO> createAdvertiserByAgent(@RequestHeader("Access-Token") String accessToken,
@RequestBody AdvertiserInfoReqRespDTO advertiserInfo);
/**
* 账号服务-代理商账号-更新广告主信息
......@@ -48,8 +48,8 @@ public interface AgentApi {
* @return the list
*/
@PostMapping(value = "/advertiser/update")
TouTiaoRespDTO<AdvertiserInfoDTO> updateAdvertiserByAgent(@RequestHeader("Access-Token") String accessToken,
@RequestBody AdvertiserInfoDTO advertiserInfo);
TouTiaoRespDTO<AdvertiserInfoReqRespDTO> updateAdvertiserByAgent(@RequestHeader("Access-Token") String accessToken,
@RequestBody AdvertiserInfoReqRespDTO advertiserInfo);
/**
......@@ -61,7 +61,7 @@ public interface AgentApi {
* @return the second agent
*/
@GetMapping(value = "/child_agent/select/")
TouTiaoRespDTO<AdvertiserDTO> getSecondAgent(@RequestHeader("Access-Token") String accessToken,
@RequestParam(value = "page", defaultValue = "1", required = false) String page,
@RequestParam(value = "page_size", defaultValue = "100", required = false) String pageSize);
TouTiaoRespDTO<AdvertiserRespDTO> getSecondAgent(@RequestHeader("Access-Token") String accessToken,
@RequestParam(value = "page", defaultValue = "1", required = false) String page,
@RequestParam(value = "page_size", defaultValue = "100", required = false) String pageSize);
}
package io.better.toutiao.api.account;
import io.better.toutiao.dto.TouTiaoRespDTO;
import io.better.toutiao.dto.account.AccountBalanceDTO;
import io.better.toutiao.dto.account.AccountDayFundFlowDTO;
import io.better.toutiao.dto.account.FundFlowCallBackDTO;
import io.better.toutiao.dto.account.AccountBalanceRespDTO;
import io.better.toutiao.dto.account.AccountDayFundFlowRespDTO;
import io.better.toutiao.dto.account.FundFlowRespDTO;
import org.springframework.cloud.netflix.feign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestHeader;
......@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestParam;
*
* @author better create in 2019-05-07 16:45
*/
@FeignClient(value = "https://ad.toutiao.com/open_api/2", url = "/advertiser/fund")
@FeignClient(value = "${toutiao.api.advertiser-url}", url = "/advertiser/fund")
public interface FundFlowApi {
/**
......@@ -25,8 +25,8 @@ public interface FundFlowApi {
* @return the account balance
*/
@GetMapping(value = "/get")
TouTiaoRespDTO<AccountBalanceDTO> getAccountBalance(@RequestHeader("Access-Token") String accessToken,
@RequestParam("advertiser_id") Long advertiserId);
TouTiaoRespDTO<AccountBalanceRespDTO> getAccountBalance(@RequestHeader("Access-Token") String accessToken,
@RequestParam("advertiser_id") Long advertiserId);
/**
......@@ -41,12 +41,12 @@ public interface FundFlowApi {
* @return the account balance
*/
@GetMapping(value = "/daily_stat")
TouTiaoRespDTO<AccountDayFundFlowDTO> getAccountDayFundFlow(@RequestHeader("Access-Token") String accessToken,
@RequestParam("advertiser_id") Long advertiserId,
@RequestParam(value = "start_date", required = false) String startDate,
@RequestParam(value = "end_date", required = false) String endDate,
@RequestParam(value = "page", required = false, defaultValue = "1") Integer page,
@RequestParam(value = "page_size", required = false, defaultValue = "10") Integer pageSize
TouTiaoRespDTO<AccountDayFundFlowRespDTO> getAccountDayFundFlow(@RequestHeader("Access-Token") String accessToken,
@RequestParam("advertiser_id") Long advertiserId,
@RequestParam(value = "start_date", required = false) String startDate,
@RequestParam(value = "end_date", required = false) String endDate,
@RequestParam(value = "page", required = false, defaultValue = "1") Integer page,
@RequestParam(value = "page_size", required = false, defaultValue = "10") Integer pageSize
);
/**
......@@ -63,12 +63,12 @@ public interface FundFlowApi {
* @see io.better.toutiao.enums.FlowType 查看流水类型取值
*/
@GetMapping(value = "/transaction/get")
TouTiaoRespDTO<FundFlowCallBackDTO> getAccountFundFlowDetail(@RequestHeader("Access-Token") String accessToken,
@RequestParam("advertiser_id") Long advertiserId,
@RequestParam(value = "start_date") String startDate,
@RequestParam(value = "end_date") String endDate,
@RequestParam(value = "transaction_type") String transactionType,
@RequestParam(value = "page", required = false, defaultValue = "1") Integer page,
@RequestParam(value = "page_size", required = false, defaultValue = "10") Integer pageSize
TouTiaoRespDTO<FundFlowRespDTO> getAccountFundFlowDetail(@RequestHeader("Access-Token") String accessToken,
@RequestParam("advertiser_id") Long advertiserId,
@RequestParam(value = "start_date") String startDate,
@RequestParam(value = "end_date") String endDate,
@RequestParam(value = "transaction_type") String transactionType,
@RequestParam(value = "page", required = false, defaultValue = "1") Integer page,
@RequestParam(value = "page_size", required = false, defaultValue = "10") Integer pageSize
);
}
......@@ -11,7 +11,7 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class AccountBalanceDTO extends BaseDTO {
public class AccountBalanceRespDTO extends BaseDTO {
/**
* 账户名
......
......@@ -11,7 +11,7 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class AccountDayFundFlowDTO extends BaseDTO {
public class AccountDayFundFlowRespDTO extends BaseDTO {
/**
* 日期
......
......@@ -11,7 +11,7 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class AccountFundFlowDetailDTO extends BaseDTO {
public class AccountFundFlowDetailRespDTO extends BaseDTO {
/**
* 流水类型
......
......@@ -8,7 +8,7 @@ import lombok.Data;
* @author better create in 2019-05-07 15:17
*/
@Data
public class AdvertiserInfoDTO {
public class AdvertiserInfoReqRespDTO {
/**
* 账户ID
......
......@@ -13,7 +13,7 @@ import java.util.List;
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class AdvertiserQualificationDTO extends BaseDTO {
public class AdvertiserQualificationReqRespDTO extends BaseDTO {
/**
* 状态
......
......@@ -12,7 +12,7 @@ import java.util.List;
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class AdvertiserDTO extends BaseDTO {
public class AdvertiserRespDTO extends BaseDTO {
/**
* 广告主ID列表
......
......@@ -10,10 +10,10 @@ import java.util.List;
* @author better create in 2019-05-07 17:21
*/
@Data
public class FundFlowCallBackDTO {
public class FundFlowRespDTO {
/**
* 账号资金流水明细信息集合
*/
private List<AccountFundFlowDetailDTO> list;
private List<AccountFundFlowDetailRespDTO> list;
}
toutiao:
api:
advertiser-url: ad.toutiao.com/open_api/2
advertiser-url: https://ad.toutiao.com/open_api/2
oauth-url: ad.toutiao.com/open_api/2
server:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment