记得上下班打卡 | git大法好,push需谨慎

Commit b525285a authored by 张国柄's avatar 张国柄

fix:提供kylin调用API;

parent 27002eed
...@@ -30,7 +30,7 @@ import java.util.List; ...@@ -30,7 +30,7 @@ import java.util.List;
* @since 2021-05-10 * @since 2021-05-10
*/ */
@ApiSupport(order = 10050) @ApiSupport(order = 10050)
@Api(tags = "收地址") @Api(tags = "收地址")
@Slf4j @Slf4j
@Validated @Validated
@RestController @RestController
...@@ -42,14 +42,14 @@ public class AdamAddressesController { ...@@ -42,14 +42,14 @@ public class AdamAddressesController {
IAdamAddressesService adamAddressesService; IAdamAddressesService adamAddressesService;
@ApiOperationSupport(order = 1) @ApiOperationSupport(order = 1)
@ApiOperation(value = "添加收地址") @ApiOperation(value = "添加收地址")
@PostMapping("add") @PostMapping("add")
public ResponseDto<Object> add(@Valid @RequestBody AdamAddressesParam parameter) { public ResponseDto<Object> add(@Valid @RequestBody AdamAddressesParam parameter) {
return ResponseDto.success(adamAddressesService.add(parameter)); return ResponseDto.success(adamAddressesService.add(parameter));
} }
@ApiOperationSupport(order = 2) @ApiOperationSupport(order = 2)
@ApiOperation(value = "收地址列表") @ApiOperation(value = "收地址列表")
@GetMapping("list") @GetMapping("list")
public ResponseDto<List<AdamAddressesVo>> list() { public ResponseDto<List<AdamAddressesVo>> list() {
return ResponseDto.success(adamRdmService.getAddressesVoByUid(CurrentUtil.getCurrentUid())); return ResponseDto.success(adamRdmService.getAddressesVoByUid(CurrentUtil.getCurrentUid()));
...@@ -70,7 +70,7 @@ public class AdamAddressesController { ...@@ -70,7 +70,7 @@ public class AdamAddressesController {
} }
@ApiOperationSupport(order = 4) @ApiOperationSupport(order = 4)
@ApiOperation(value = "编辑收地址") @ApiOperation(value = "编辑收地址")
@PostMapping("edit") @PostMapping("edit")
public ResponseDto<Object> edit(@RequestBody @Valid AdamAddressesParam parameter) { public ResponseDto<Object> edit(@RequestBody @Valid AdamAddressesParam parameter) {
if (StringUtils.isBlank(parameter.getAddressesId())) { if (StringUtils.isBlank(parameter.getAddressesId())) {
...@@ -86,7 +86,7 @@ public class AdamAddressesController { ...@@ -86,7 +86,7 @@ public class AdamAddressesController {
} }
@ApiOperationSupport(order = 5) @ApiOperationSupport(order = 5)
@ApiOperation(value = "删除收地址") @ApiOperation(value = "删除收地址")
@PostMapping("del/{addrId}") @PostMapping("del/{addrId}")
public ResponseDto<Object> del(@NotBlank @PathVariable String addrId) { public ResponseDto<Object> del(@NotBlank @PathVariable String addrId) {
String currentUid = CurrentUtil.getCurrentUid(); String currentUid = CurrentUtil.getCurrentUid();
...@@ -108,7 +108,7 @@ public class AdamAddressesController { ...@@ -108,7 +108,7 @@ public class AdamAddressesController {
} }
@ApiOperationSupport(order = 7) @ApiOperationSupport(order = 7)
@ApiOperation(value = "获取默认收地址") @ApiOperation(value = "获取默认收地址")
@PostMapping("query/def") @PostMapping("query/def")
public ResponseDto<AdamAddressesVo> queryDef() { public ResponseDto<AdamAddressesVo> queryDef() {
return ResponseDto.success(adamAddressesService.queryDefault(CurrentUtil.getCurrentUid())); return ResponseDto.success(adamAddressesService.queryDefault(CurrentUtil.getCurrentUid()));
......
...@@ -121,8 +121,8 @@ public class AdamEntersController { ...@@ -121,8 +121,8 @@ public class AdamEntersController {
} }
@GetMapping("query/depth") @GetMapping("query/depth")
public ResponseDto<AdamEntersVo> queryForDepth(@NotBlank @PathVariable String entersId, public ResponseDto<AdamEntersVo> queryForDepth(@NotBlank @RequestParam String entersId,
@NotBlank @RequestParam(required = false) String uid) { @NotBlank @RequestParam String uid) {
AdamEntersVo vo = adamRdmService.getEntersVoByUidEntersId(uid, entersId); AdamEntersVo vo = adamRdmService.getEntersVoByUidEntersId(uid, entersId);
return null == vo ? ResponseDto.failure(ErrorMapping.get("10105")) : ResponseDto.success(vo); return null == vo ? ResponseDto.failure(ErrorMapping.get("10105")) : ResponseDto.success(vo);
} }
......
...@@ -11,8 +11,6 @@ import com.liquidnet.service.adam.service.IAdamRdmService; ...@@ -11,8 +11,6 @@ import com.liquidnet.service.adam.service.IAdamRdmService;
import com.liquidnet.service.adam.service.IAdamUserMemberService; import com.liquidnet.service.adam.service.IAdamUserMemberService;
import com.liquidnet.service.base.ResponseDto; import com.liquidnet.service.base.ResponseDto;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -65,7 +63,7 @@ public class AdamMemberController { ...@@ -65,7 +63,7 @@ public class AdamMemberController {
return ResponseDto.success(adamRdmService.getMemberAgreement()); return ResponseDto.success(adamRdmService.getMemberAgreement());
} }
@GetMapping("check") @GetMapping("check/depth")
public ResponseDto<Boolean> isMember(@NotBlank @RequestParam String uid) { public ResponseDto<Boolean> isMember(@NotBlank @RequestParam String uid) {
AdamUserMemberVo userMemberInfo = adamRdmService.getUserMemberVoByUid(uid); AdamUserMemberVo userMemberInfo = adamRdmService.getUserMemberVoByUid(uid);
return ResponseDto.success(null != userMemberInfo && userMemberInfo.isActive()); return ResponseDto.success(null != userMemberInfo && userMemberInfo.isActive());
......
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