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

Commit cf8ba5a1 authored by 洪全海's avatar 洪全海

提交代码,会员购买写一半了

parent 6029c94e
...@@ -16,7 +16,7 @@ public interface IAdamMemberOrderService extends IService<AdamMemberOrder> { ...@@ -16,7 +16,7 @@ public interface IAdamMemberOrderService extends IService<AdamMemberOrder> {
* *
* @param param * @param param
*/ */
AdamMemberOrderResult buyMemberOrMemberCode(AdamMemberOrderParam param); AdamMemberOrderResult buyMemberOrMemberCode(AdamMemberOrderParam param) throws Exception;
/** /**
* 使用会员码 * 使用会员码
......
...@@ -2,6 +2,7 @@ package com.liquidnet.service.adam.controller; ...@@ -2,6 +2,7 @@ package com.liquidnet.service.adam.controller;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.github.xiaoymin.knife4j.annotations.ApiSupport; import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import com.liquidnet.service.base.ErrorMapping;
import com.liquidnet.service.base.ResponseDto; import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.adam.dto.vo.AdamMemberVo; import com.liquidnet.service.adam.dto.vo.AdamMemberVo;
import com.liquidnet.service.adam.service.IAdamMemberService; import com.liquidnet.service.adam.service.IAdamMemberService;
...@@ -26,7 +27,7 @@ public class AdamMemberController { ...@@ -26,7 +27,7 @@ public class AdamMemberController {
@ApiOperationSupport(order = 0) @ApiOperationSupport(order = 0)
@ApiOperation(value = "会员信息") @ApiOperation(value = "会员信息")
@GetMapping("info") @GetMapping("info")
public ResponseDto<Object> query() { public ResponseDto<AdamMemberVo> query() {
AdamMemberVo info = adamMemberService.queryMemberInfo(); AdamMemberVo info = adamMemberService.queryMemberInfo();
return ResponseDto.success(info); return ResponseDto.success(info);
} }
......
...@@ -2,11 +2,11 @@ package com.liquidnet.service.adam.controller; ...@@ -2,11 +2,11 @@ package com.liquidnet.service.adam.controller;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.liquidnet.service.ResponseDto;
import com.liquidnet.service.adam.dto.AdamMemberOrderCodeParam; import com.liquidnet.service.adam.dto.AdamMemberOrderCodeParam;
import com.liquidnet.service.adam.dto.AdamMemberOrderParam; import com.liquidnet.service.adam.dto.AdamMemberOrderParam;
import com.liquidnet.service.adam.entity.AdamMemberOrder; import com.liquidnet.service.adam.entity.AdamMemberOrder;
import com.liquidnet.service.adam.service.IAdamMemberOrderService; import com.liquidnet.service.adam.service.IAdamMemberOrderService;
import com.liquidnet.service.base.ResponseDto;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
...@@ -30,10 +30,10 @@ public class AdamMemberOrderController { ...@@ -30,10 +30,10 @@ public class AdamMemberOrderController {
public ResponseDto<AdamMemberOrder> buyMemberOrCode(AdamMemberOrderParam param) { public ResponseDto<AdamMemberOrder> buyMemberOrCode(AdamMemberOrderParam param) {
try { try {
adamMemberOrderService.buyMemberOrMemberCode(param); adamMemberOrderService.buyMemberOrMemberCode(param);
return new ResponseDto().success(); return ResponseDto.success();
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
return new ResponseDto().failure(); return ResponseDto.failure();
} }
} }
...@@ -43,10 +43,10 @@ public class AdamMemberOrderController { ...@@ -43,10 +43,10 @@ public class AdamMemberOrderController {
public ResponseDto<AdamMemberOrder> useMemberCode(AdamMemberOrderCodeParam param) { public ResponseDto<AdamMemberOrder> useMemberCode(AdamMemberOrderCodeParam param) {
try { try {
adamMemberOrderService.useMemberCode(param); adamMemberOrderService.useMemberCode(param);
return new ResponseDto().success(); return ResponseDto.success();
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
return new ResponseDto().failure(); return ResponseDto.failure();
} }
} }
......
...@@ -42,7 +42,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe ...@@ -42,7 +42,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
IAdamMemberService adamMemberService; IAdamMemberService adamMemberService;
@Override @Override
public AdamMemberOrderResult buyMemberOrMemberCode(AdamMemberOrderParam param) { public AdamMemberOrderResult buyMemberOrMemberCode(AdamMemberOrderParam param) throws Exception {
AdamMemberOrderResult result = new AdamMemberOrderResult(); AdamMemberOrderResult result = new AdamMemberOrderResult();
// 判断黑名单,待定(暂不做) // 判断黑名单,待定(暂不做)
......
...@@ -19,8 +19,8 @@ liquidnet: ...@@ -19,8 +19,8 @@ liquidnet:
username: admin username: admin
password: admin password: admin
config: config:
# location: /Users/color/company_project/java/liquidnet-bus-v1-1/liquidnet-bus-config/liquidnet-config location: /Users/color/company_project/java/liquidnet-bus-v1-1/liquidnet-bus-config/liquidnet-config
location: /app/support-config # location: /app/support-config
# end-dev-这里是配置信息基本值 # end-dev-这里是配置信息基本值
spring: spring:
......
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