autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-18 00:38:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 订单详情页新增退款状态字段

Browse Source
This commit is contained in:
Lemon
2024-06-18 15:45:28 +08:00
parent ebe0efc1b9
commit e4ec70c869
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java
View File

@@ -18,6 +18,7 @@ import com.jsowell.common.core.domain.ykc.TransactionRecordsData;
import com.jsowell.common.enums.AcquirerEnum; import com.jsowell.common.enums.AcquirerEnum;
import com.jsowell.common.enums.DelFlagEnum; import com.jsowell.common.enums.DelFlagEnum;
import com.jsowell.common.enums.MemberWalletEnum; import com.jsowell.common.enums.MemberWalletEnum;
import com.jsowell.common.enums.adapay.AdapayStatusEnum;
import com.jsowell.common.enums.adapay.MerchantDelayModeEnum; import com.jsowell.common.enums.adapay.MerchantDelayModeEnum;
import com.jsowell.common.enums.ykc.*; import com.jsowell.common.enums.ykc.*;
import com.jsowell.common.exception.BusinessException; import com.jsowell.common.exception.BusinessException;
@@ -682,8 +683,14 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic {
refundInfo.setReverseAmt(reverseResponse.getReverse_amt()); refundInfo.setReverseAmt(reverseResponse.getReverse_amt());
LocalDateTime createdTime = DateUtils.timestampToDatetime(Long.parseLong(reverseResponse.getCreated_time())); LocalDateTime createdTime = DateUtils.timestampToDatetime(Long.parseLong(reverseResponse.getCreated_time()));
refundInfo.setCreatedTime(DateUtils.formatDateTime(createdTime)); refundInfo.setCreatedTime(DateUtils.formatDateTime(createdTime));
LocalDateTime succeedTime = DateUtils.timestampToDatetime(Long.parseLong(reverseResponse.getSucceed_time()));
refundInfo.setSucceedTime(DateUtils.formatDateTime(succeedTime)); refundInfo.setStatus(reverseResponse.getStatus());
if (StringUtils.equals(AdapayStatusEnum.SUCCEEDED.getValue(), reverseResponse.getStatus())) {
LocalDateTime succeedTime = DateUtils.timestampToDatetime(Long.parseLong(reverseResponse.getSucceed_time()));
refundInfo.setSucceedTime(DateUtils.formatDateTime(succeedTime));
}else {
refundInfo.setSucceedTime("-");
}
resultList.add(refundInfo); resultList.add(refundInfo);
} }
} }

1
jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java
View File

@@ -118,6 +118,7 @@ public class OrderDetailInfoVO {
public static class OrderRefundInfo{ public static class OrderRefundInfo{
private String paymentId; // 支付交易对象id private String paymentId; // 支付交易对象id
private String reverseId; // 支付撤销对象id private String reverseId; // 支付撤销对象id
private String status; // 退款状态
private String reverseAmt; // 退款金额 private String reverseAmt; // 退款金额
private String createdTime; // 退款创建时间 private String createdTime; // 退款创建时间
private String succeedTime; // 退款成功时间 private String succeedTime; // 退款成功时间