Commit 553287ad by 程裕兵

feat:refund

parent 99abe95c
package com.jiejing.fitness.finance.api.merchant.vo; package com.jiejing.fitness.finance.api.merchant.vo;
import com.jiejing.common.swagger.EnumMapping; import com.jiejing.common.swagger.EnumMapping;
import com.jiejing.fitness.finance.api.merchant.vo.StudioMerchantCheckRefundVO.CheckRefundCodeEnum;
import com.jiejing.paycenter.common.enums.common.TransStateEnums; import com.jiejing.paycenter.common.enums.common.TransStateEnums;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
...@@ -31,6 +32,10 @@ public class StudioMerchantRefundVO { ...@@ -31,6 +32,10 @@ public class StudioMerchantRefundVO {
@ApiModelProperty(name = "三方交易单号") @ApiModelProperty(name = "三方交易单号")
private String thirdTransNo; private String thirdTransNo;
@EnumMapping(enumClass = CheckRefundCodeEnum.class)
@ApiModelProperty(value = "失败code")
private String failCode;
@ApiModelProperty(name = "失败原因") @ApiModelProperty(name = "失败原因")
private String failMessage; private String failMessage;
......
...@@ -123,6 +123,8 @@ public class RefundConvert { ...@@ -123,6 +123,8 @@ public class RefundConvert {
return StudioMerchantRefundVO.builder() return StudioMerchantRefundVO.builder()
.thirdTransNo(vo.getThirdTransNo()) .thirdTransNo(vo.getThirdTransNo())
.transNo(refund.getTransNo()) .transNo(refund.getTransNo())
.failCode(TransStateEnums.FAIL.getCode().equals(vo.getRefundState())
? CheckRefundCodeEnum.OTHER_ERROR.getCode() : CheckRefundCodeEnum.SUCCESS.getCode())
.failMessage(vo.getFailMessage()) .failMessage(vo.getFailMessage())
.refundState(vo.getRefundState()) .refundState(vo.getRefundState())
.successTime(vo.getSuccessTime()) .successTime(vo.getSuccessTime())
......
...@@ -120,6 +120,7 @@ public class RefundServiceImpl implements RefundService { ...@@ -120,6 +120,7 @@ public class RefundServiceImpl implements RefundService {
this.refundCallback(RefundConvert.convertRefundEvent(refund, checkResult)); this.refundCallback(RefundConvert.convertRefundEvent(refund, checkResult));
return StudioMerchantRefundVO.builder() return StudioMerchantRefundVO.builder()
.transNo(refund.getTransNo()) .transNo(refund.getTransNo())
.failCode(checkResult.getCode())
.refundState(TransStateEnums.FAIL.getCode()) .refundState(TransStateEnums.FAIL.getCode())
.failMessage(checkResult.getFailMessage()) .failMessage(checkResult.getFailMessage())
.build(); .build();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment