Merge branch 'dev' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into dev

# Conflicts:
#	liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamEntersServiceImpl.java

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamMemberController.java

@@ -2,10 +2,7 @@ package com.liquidnet.service.adam.controller;
 
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
-import com.liquidnet.service.adam.dto.AdamMemberOrderParam;
-import com.liquidnet.service.adam.dto.AdamMemberOrderResult;
 import com.liquidnet.service.adam.service.IAdamMemberOrderService;
-import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.adam.dto.vo.AdamMemberVo;
 import com.liquidnet.service.adam.service.IAdamMemberService;
@@ -14,7 +11,6 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -37,18 +33,4 @@ public class AdamMemberController {
         AdamMemberVo info = adamMemberService.queryMemberInfo();
         return ResponseDto.success(info);
     }
-
-    @ApiOperationSupport(order = 1)
-    @ApiOperation(value = "购买会员或会员码")
-    @PostMapping("buy/member")
-    public ResponseDto<AdamMemberOrderResult> buyMemberOrCode(AdamMemberOrderParam param) {
-        AdamMemberOrderResult adamMemberOrderResult = null;
-        try {
-            adamMemberOrderResult = adamMemberOrderService.buyMemberOrMemberCode(param);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return ResponseDto.failure();
-        }
-        return ResponseDto.success(adamMemberOrderResult);
-    }
 }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamMemberOrderController.java

@@ -4,6 +4,7 @@ package com.liquidnet.service.adam.controller;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.liquidnet.service.adam.dto.AdamMemberOrderCodeParam;
 import com.liquidnet.service.adam.dto.AdamMemberOrderParam;
+import com.liquidnet.service.adam.dto.AdamMemberOrderResult;
 import com.liquidnet.service.adam.entity.AdamMemberOrder;
 import com.liquidnet.service.adam.service.IAdamMemberOrderService;
 import com.liquidnet.service.base.ResponseDto;
@@ -25,16 +26,17 @@ public class AdamMemberOrderController {
     IAdamMemberOrderService adamMemberOrderService;
 
     @ApiOperationSupport(order = 0)
-    @ApiOperation(value = "购买会员或兑换码")
+    @ApiOperation(value = "购买会员或会员码")
     @PostMapping("/buy/member")
-    public ResponseDto<AdamMemberOrder> buyMemberOrCode(AdamMemberOrderParam param) {
+    public ResponseDto<AdamMemberOrderResult> buyMemberOrCode(AdamMemberOrderParam param) {
+        AdamMemberOrderResult adamMemberOrderResult = null;
         try {
-            adamMemberOrderService.buyMemberOrMemberCode(param);
-            return ResponseDto.success();
+            adamMemberOrderResult = adamMemberOrderService.buyMemberOrMemberCode(param);
         } catch (Exception e) {
             e.printStackTrace();
             return ResponseDto.failure();
         }
+        return ResponseDto.success(adamMemberOrderResult);
     }
 
     @ApiOperationSupport(order = 1)