fix:callback;

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/AdamMemberOrderCallbackParam.java

@@ -3,9 +3,9 @@ package com.liquidnet.service.adam.dto;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 
+import javax.servlet.http.HttpServletRequest;
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.Map;
 
 @ApiModel(value = "AdamMemberOrderCallbackParam", description = "购买会员或会员码的支付回调")
 @Data
@@ -30,15 +30,15 @@ public class AdamMemberOrderCallbackParam implements Serializable, Cloneable {
         }
     }
 
-    public AdamMemberOrderCallbackParam get(Map mapParameter) {
-        this.setStatus((Integer) mapParameter.get("status"));
-        this.setType((String) mapParameter.get("type"));
-        this.setCode((String) mapParameter.get("code"));
-        this.setOrderCode((String) mapParameter.get("order_code"));
-        this.setPrice((BigDecimal) mapParameter.get("price"));
-        this.setPaymentType((String) mapParameter.get("payment_type"));
-        this.setPaymentAt((String) mapParameter.get("payment_at"));
-        this.setPaymentId((String) mapParameter.get("payment_id"));
+    public AdamMemberOrderCallbackParam get(HttpServletRequest servletRequest) {
+        this.setStatus(Integer.valueOf(servletRequest.getParameter("status")));
+        this.setType(servletRequest.getParameter("type"));
+        this.setCode(servletRequest.getParameter("code"));
+        this.setOrderCode(servletRequest.getParameter("order_code"));
+        this.setPrice(BigDecimal.valueOf(Double.parseDouble(servletRequest.getParameter("price"))));
+        this.setPaymentType(servletRequest.getParameter("payment_type"));
+        this.setPaymentAt(servletRequest.getParameter("payment_at"));
+        this.setPaymentId(servletRequest.getParameter("payment_id"));
         return this;
     }
 }

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

@@ -29,7 +29,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
-import java.util.Map;
 
 @ApiSupport(order = 10031)
 @Api(tags = "购买会员")
@@ -119,15 +118,16 @@ public class AdamMemberOrderController {
      * 通知响应：'success'，响应成功，将不再通知客户端
      * 通知响应：'fail'，响应失败，将不再通知客户端，建议在订单异常的状态下响应失败
      *
-     * @param mapParameter
      * @return
      */
     @ApiOperationSupport(order = 2)
     @ApiOperation(value = "会员支付回调")
     @PostMapping("callback")
-    public String paymentNotifyCallBack(Map<String, Object> mapParameter) {
-        log.debug("/member/callback.mapParameter:{}, token:{}", JsonUtils.toJson(mapParameter), ServletUtils.getRequest().getHeader("token"));
-        AdamMemberOrderCallbackParam parameter = AdamMemberOrderCallbackParam.getNew().get(mapParameter);
+    public String paymentNotifyCallBack() {
+        log.debug("/member/callback.mapParameter:{}, token:{}", JsonUtils.toJson(ServletUtils.getRequest().getParameterMap()), ServletUtils.getRequest().getHeader("token"));
+        // TODO: 2021/6/13 验签
+        
+        AdamMemberOrderCallbackParam parameter = AdamMemberOrderCallbackParam.getNew().get(ServletUtils.getRequest());
         if (1 != parameter.getStatus() ||
                 !parameter.getType().equals("VIP") ||
                 null == parameter.getOrderCode() ||
@@ -140,11 +140,11 @@ public class AdamMemberOrderController {
         ResponseDto<Object> dto = adamMemberOrderService.paymentNotifyCallBack(parameter);
 
         if (!dto.isSuccess()) {
-            log.warn("###会员支付回调处理失败:handleDto:{},CallbackParam:{}", JsonUtils.toJson(dto), JsonUtils.toJson(mapParameter));
+            log.warn("###会员支付回调处理失败:handleDto:{},CallbackParam:{}", JsonUtils.toJson(dto), JsonUtils.toJson(parameter));
 
             return "fail";
         }
-        return "fail";
+        return "success";
     }
 
     @ApiOperationSupport(order = 3)