fix:callback.test;

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

 package com.liquidnet.service.adam.dto;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Map;
 
 @ApiModel(value = "AdamMemberOrderCallbackParam", description = "购买会员或会员码的支付回调")
 @Data
-public class AdamMemberOrderCallbackParam implements Serializable {
+public class AdamMemberOrderCallbackParam implements Serializable, Cloneable {
     private static final long serialVersionUID = -4161563334263071103L;
     private Integer status;
-    @JsonProperty("order_code")
     private String orderCode;
     private String code;
-    @ApiModelProperty(value = "[VIP,CLUB]", allowableValues = "VIP,CLUB")
     private String type;
     private BigDecimal price;
-    @JsonProperty("payment_type")
     private String paymentType;
-    @JsonProperty("payment_at")
     private String paymentAt;
+    private String paymentId;
+
+    private static final AdamMemberOrderCallbackParam obj = new AdamMemberOrderCallbackParam();
+
+    public static AdamMemberOrderCallbackParam getNew() {
+        try {
+            return (AdamMemberOrderCallbackParam) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new AdamMemberOrderCallbackParam();
+        }
+    }
+
+    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"));
+        return this;
+    }
 }

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

@@ -8,6 +8,7 @@ import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.commons.lang.util.HttpUtil;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.commons.lang.util.ServletUtils;
+import com.liquidnet.service.adam.dto.AdamMemberOrderCallbackParam;
 import com.liquidnet.service.adam.dto.AdamMemberOrderCodeParam;
 import com.liquidnet.service.adam.dto.AdamMemberOrderParam;
 import com.liquidnet.service.adam.dto.AdamMemberOrderResult;
@@ -118,44 +119,31 @@ public class AdamMemberOrderController {
      * 通知响应：'success'，响应成功，将不再通知客户端
      * 通知响应：'fail'，响应失败，将不再通知客户端，建议在订单异常的状态下响应失败
      *
-     * @param parameter
+     * @param mapParameter
      * @return
      */
     @ApiOperationSupport(order = 2)
     @ApiOperation(value = "会员支付回调")
     @PostMapping("callback")
-    public String paymentNotifyCallBack(Map<String, Object> parameter) {
-        log.debug("/member/callback.request:{}", ServletUtils.getRequest().getMethod());
-        log.debug("/member/callback.request:{}", ServletUtils.getRequest().getContentType());
-        log.debug("/member/callback.parameterMap:{}", JsonUtils.toJson(ServletUtils.getRequest().getParameterMap()));
-        log.debug("/member/callback.headerNames:{}", JsonUtils.toJson(ServletUtils.getRequest().getHeaderNames()));
-        log.debug("/member/callback.parameter:{}, token:{}", JsonUtils.toJson(parameter), ServletUtils.getRequest().getHeader("token"));
-
-        int status = (int) parameter.get("status");
-        String type = (String) parameter.get("type");
-        String code = (String) parameter.get("code");
-        String orderCode = (String) parameter.get("order_code");
-        String price = (String) parameter.get("price");
-        String paymentType = (String) parameter.get("payment_type");
-        String paymentAt = (String) parameter.get("payment_at");
-        String paymentId = (String) parameter.get("payment_id");
-
-        if (1 != status ||
-                !type.equals("VIP") ||
-                null == orderCode ||
-                null == code) {
+    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);
+        if (1 != parameter.getStatus() ||
+                !parameter.getType().equals("VIP") ||
+                null == parameter.getOrderCode() ||
+                null == parameter.getCode()) {
             log.error("会员支付回调参数有误:{}", JsonUtils.toJson(parameter));
 
             return "fail";
         }
 
-//        ResponseDto<Object> dto = adamMemberOrderService.paymentNotifyCallBack(parameter);
-//
-//        if (!dto.isSuccess()) {
-//            log.warn("###会员支付回调处理失败:handleDto:{},CallbackParam:{}", JsonUtils.toJson(dto), JsonUtils.toJson(parameter));
-//
-//            return "fail";
-//        }
+        ResponseDto<Object> dto = adamMemberOrderService.paymentNotifyCallBack(parameter);
+
+        if (!dto.isSuccess()) {
+            log.warn("###会员支付回调处理失败:handleDto:{},CallbackParam:{}", JsonUtils.toJson(dto), JsonUtils.toJson(mapParameter));
+
+            return "fail";
+        }
         return "fail";
     }