fix:会员支付回调API调整;

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

@@ -7,97 +7,40 @@ import lombok.Data;
 import java.io.Serializable;
 import java.util.List;
 
-@ApiModel(value = "AdamMemberParam", description = "添加会员参数")
+@ApiModel(value = "AdamMemberParam", description = "添加会员入参")
 @Data
 public class AdamMemberParam implements Serializable {
     private static final long serialVersionUID = -7411934614249221021L;
     @ApiModelProperty(position = 0, required = false, value = "会员ID[50]", example = "62960077673504768")
     private String memberId;
-
-    /**
-     * 会员卡名称
-     */
     @ApiModelProperty(position = 1, required = false, value = "会员名称[50]", example = "摩登天空会员卡")
     private String name;
-
-    /**
-     * 标题
-     */
     @ApiModelProperty(position = 2, required = true, value = "会员标题[50]", example = "摩登天空会员卡")
     private String title;
-
-    /**
-     * 副标题
-     */
     @ApiModelProperty(position = 3, required = true, value = "会员副标题[50]", example = "摩登天空会员卡副标题")
     private String subTitle;
-
-    /**
-     * 图标
-     */
     @ApiModelProperty(position = 4, required = true, value = "icon图标[200]", example = "https://img.zhengzai.tv/files/2020/08/28/5f490418d30b4.png")
     private String icon;
-
-    /**
-     * 头像
-     */
     @ApiModelProperty(position = 5, required = true, value = "会员头像[200]", example = "https://img.zhengzai.tv/files/2020/08/31/5f4c75095e9bc.pngv")
     private String avatar;
-
-    /**
-     * 权益详情
-     */
     @ApiModelProperty(position = 6, required = true, value = "权益详情[200]", example = "加入摩登天空会员您可享受到.....")
     private String interestsDetail;
-
-    /**
-     * 注意事项
-     */
     @ApiModelProperty(position = 7, required = true, value = "注意事项[200]", example = "摩登天空会员需注意以下事项.....")
     private String notes;
-
-    /**
-     * '是否展示须知'
-     */
     @ApiModelProperty(position = 8, required = true, value = "是否展示须知[[0-否,1-是]]", allowableValues = "0,1")
     private Integer isNotice;
-
-    /**
-     * 须知内容
-     */
     @ApiModelProperty(position = 9, required = true, value = "会员须知内容[200]", example = "会员须知细则1.xxxx\n2.xxxx")
     private String noticeInfo;
-
-    /**
-     * 须知标题
-     */
     @ApiModelProperty(position = 10, required = true, value = "会员须知标题[200]", example = "摩登天空会员须知")
     private String noticeTitle;
-
-    /**
-     * 是否需要答题 0不需要 1需要
-     */
     @ApiModelProperty(position = 11, required = true, value = "是否需要答题[0-否,1-是]", allowableValues = "0,1")
     private Integer needQuestion;
-
-    /**
-     * 是否展示协议 0否1是
-     */
     @ApiModelProperty(position = 12, required = true, value = "是否展示协议[0-否,1-是]", allowableValues = "0,1")
     private Integer displayAgreement;
-
-    /**
-     * 会员协议
-     */
-    @ApiModelProperty(position = 13, required = true, value = "会员协议内容[200]", example = "摩登天空会员协议须知....")
-    private String agreement;
-
-    /**
-     * 限购数量
-     */
+    @ApiModelProperty(position = 13, required = true, value = "状态[1-NORMAL,2-INVALID]")
+    private Integer state;
     @ApiModelProperty(position = 14, required = true, value = "限购数量，0不限购[200]", example = "0")
     private Integer limitation;
-
     @ApiModelProperty(position = 15, required = true, value = "会员卡价格ID", example = "[63666042953703424]")
     private List<String> memberPriceList;
 }

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

@@ -48,6 +48,6 @@ public interface IAdamMemberOrderService extends IService<AdamMemberOrder> {
      * 支付回调
      * @return
      */
-    boolean memberNotifyCallBack(AdamMemberOrderCallbackResult result);
+    ResponseDto<Object> memberNotifyCallBack(AdamMemberOrderCallbackResult result);
 
 }

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

@@ -125,12 +125,10 @@ public class AdamMemberOrderController {
     @ApiOperationSupport(order = 5)
     @ApiOperation(value = "会员支付回调")
     @PostMapping("callback")
-    public ResponseDto<Object> memberOrderCallBack(@RequestBody AdamMemberOrderCallbackResult result){
-        boolean b = adamMemberOrderService.memberNotifyCallBack(result);
-        if (b) {
-            return ResponseDto.success();
-        } else {
-            return ResponseDto.failure();
+    public void memberOrderCallBack(@RequestBody AdamMemberOrderCallbackResult result){
+        ResponseDto<Object> dto = adamMemberOrderService.memberNotifyCallBack(result);
+        if (!dto.isSuccess()) {
+            log.warn(JsonUtils.toJson(dto));
         }
     }
 }

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

@@ -353,23 +353,23 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
     }
 
     @Override
-    public boolean memberNotifyCallBack(AdamMemberOrderCallbackResult result) {
+    public ResponseDto<Object> memberNotifyCallBack(AdamMemberOrderCallbackResult result) {
         if (1 != result.getStatus() ||
                 !result.getType().equals(AdamMemberConst.TYPE_VIP) ||
                 null == result.getOrderCode() ||
                 null == result.getCode()) {
-            return false;
+            return ResponseDto.failure(ErrorMapping.get("10500"), result);
         }
 
         AdamMemberOrderVo orderVo = mongoTemplate.findOne(Query.query(Criteria.where("orderNo").is(result.getOrderCode())), AdamMemberOrderVo.class, AdamMemberOrderVo.class.getSimpleName());
         int state = orderVo.getState();
         if (AdamMemberConst.STATUS_PAID == state || AdamMemberConst.STATUS_LATE == state) {
             // 订单已经处理过
-            return false;
+            return ResponseDto.failure(ErrorMapping.get("10502"), result);
         }
         if (result.getPrice().compareTo(orderVo.getPrice()) != 0) {
             // 金额不一致
-            return false;
+            return ResponseDto.failure(ErrorMapping.get("10503"), result);
         }
         String currentDateTime = DateUtil.getNowTime();
         // 获取购买天数
@@ -475,10 +475,10 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
 //                    SqlMapping.get("adam_member_order.add", mqList.toArray()));
 
         } catch (Exception e) {
-            e.printStackTrace();
-            return false;
+            log.error("系统异常:会员订单回调处理", e);
+            return ResponseDto.failure(ErrorMapping.get("10501"), result);
         }
-        return true;
+        return ResponseDto.success();
     }
 
     /**

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

@@ -28,4 +28,17 @@
 
 
 
-10301=
+10301=
\ No newline at end of file
+
+
+
+
+10401=
+
+
+
+
+10500=会员订单回调参数有误，请核实
+10501=会员订单回调处理失败，请核实
+10502=会员订单回调处理失败，该订单已处理
+10503=会员订单回调处理失败，订单金额有误
\ No newline at end of file