fix:member callback调整;

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

@@ -19,6 +19,8 @@ import com.liquidnet.service.adam.service.IAdamUserService;
 import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -116,6 +118,16 @@ public class AdamMemberOrderController {
      */
     @ApiOperationSupport(order = 2)
     @ApiOperation(value = "会员支付回调")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "status", value = "1-成功｜0-失败", example = "1"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "order_code", value = "会员订单号", example = "77062761607274496V"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "code", value = "支付订单号", example = "20210616153954199964032352974P"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "type", value = "购买类型", example = "VIP"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "price", value = "支付金额", example = "0.01"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "payment_type", value = "支付类型", example = "WAPALIPAY"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "payment_at", value = "支付时间", example = "2021-06-16 15:40:02"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "payment_id", value = "支付ID", example = "2021061622001468121421203878"),
+    })
     @PostMapping("callback")
     public String paymentNotifyCallBack() {
         log.debug("/member/callback.mapParameter:{}, token:{}", JsonUtils.toJson(ServletUtils.getRequest().getParameterMap()), ServletUtils.getRequest().getHeader("token"));

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

@@ -164,6 +164,9 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
     @Override
     public ResponseDto<Object> paymentNotifyCallBack(AdamMemberOrderCallbackParam parameter) {
         AdamMemberOrderVo handleMemberOrderVo = adamRdmService.getShotMemberOrderVoByOrderNo(parameter.getOrderCode());
+        if (null == handleMemberOrderVo) {
+            return ResponseDto.failure(ErrorMapping.get("10501"), parameter);
+        }
         // AdamMemberConst.STATUS_*:0-待支付,1-已支付,2-已过期,3-超时付,4-退款中,5-退款完成
         if (1 == handleMemberOrderVo.getState() || 3 == handleMemberOrderVo.getState()) {
             return ResponseDto.failure(ErrorMapping.get("10502"), parameter);
@@ -175,7 +178,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
         AdamMemberPriceVo memberPriceVo = adamRdmService.getMemberPriceVoByPriceId(
                 handleMemberOrderVo.getMemberId(), handleMemberOrderVo.getMemberPriceId());
         if (null == memberPriceVo) {
-            return ResponseDto.failure(ErrorMapping.get("10500"));
+            return ResponseDto.failure(ErrorMapping.get("10504"));
         }
         /**
          * 购买方式[order.mode]:

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/errors.properties

@@ -59,10 +59,10 @@
 
 
 10500=
-10501=会员订单回调处理失败，请核实
+10501=会员订单回调处理失败，该订单不存在
 10502=会员订单回调处理失败，该订单已处理
 10503=会员订单回调处理失败，订单金额有误
-10504=会员卡信息不存在，请核实
+10504=会员订单回调处理失败，会员价格信息不存在