Commit ef3bec82 by zhiheng.zhang

订单状态转换

parent 9652d34f
...@@ -1342,8 +1342,7 @@ public class OrderAdapter { ...@@ -1342,8 +1342,7 @@ public class OrderAdapter {
QueryOrdersResponse.DataBean.OrderBean.RefundBean refundBean = ordersBean.getRefundList().get(0); QueryOrdersResponse.DataBean.OrderBean.RefundBean refundBean = ordersBean.getRefundList().get(0);
responseVo.setRid(refundBean.getRid()); responseVo.setRid(refundBean.getRid());
responseVo.setRefundStatus(refundBean.getStatus()); responseVo.setRefundStatus(refundBean.getStatus());
responseVo.setRefundStatusDesc(Optional.ofNullable(RefundStatus.getByCode(refundBean.getStatus())) responseVo.setRefundStatusDesc(getRefundStatusDesc(refundBean,ordersBean));
.map(RefundStatus::getDesc).orElse(""));
responseVo.setRefundReason(refundBean.getReason()); responseVo.setRefundReason(refundBean.getReason());
String refundCreateTime = DateUtil.convert2String(new Date(Long.parseLong(refundBean.getCreateTime())),DateUtil.FORMAT_YYYY_MM_DD_HHMMSS); String refundCreateTime = DateUtil.convert2String(new Date(Long.parseLong(refundBean.getCreateTime())),DateUtil.FORMAT_YYYY_MM_DD_HHMMSS);
responseVo.setRefundCreateTime(refundCreateTime); responseVo.setRefundCreateTime(refundCreateTime);
...@@ -4274,4 +4273,18 @@ public class OrderAdapter { ...@@ -4274,4 +4273,18 @@ public class OrderAdapter {
orderPayRefundRequest.setNotifyUrl(refundNotifyCallback); orderPayRefundRequest.setNotifyUrl(refundNotifyCallback);
return orderPayRefundRequest; return orderPayRefundRequest;
} }
private String getRefundStatusDesc(QueryOrdersResponse.DataBean.OrderBean.RefundBean refundBean ,QueryOrdersResponse.DataBean.OrderBean orderBean){
String refundStatusDesc = "";
if(OrderClientType.SAASMALL.getIndex().toString().equalsIgnoreCase(orderBean.getOrderClient())){
if(refundBean.getStatus() == RefundStatus.AGREE_REFUND.getCode()){
refundStatusDesc = "退款中";
}else if(refundBean.getStatus() == RefundStatus.COMPLETE_REFUND.getCode()){
return "同意退款";
}
}else{
refundStatusDesc = Optional.ofNullable(RefundStatus.getByCode(refundBean.getStatus())).map(RefundStatus::getDesc).orElse("");
}
return refundStatusDesc;
}
} }
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