Commit 8bbb6f78 by rui.zhu

refactor:修改退款明细中的支付渠道和名称的获取逻辑

parent 24f2cebc
...@@ -47,8 +47,8 @@ public class OrderCancelReqAdapter { ...@@ -47,8 +47,8 @@ public class OrderCancelReqAdapter {
refundItem.setPayChannelType(Integer.valueOf(orderRefundData.getCashType())); refundItem.setPayChannelType(Integer.valueOf(orderRefundData.getCashType()));
refundItem.setPayChannelName(CashTypeEnum.getByCode(orderRefundData.getCashType()) == null ? null : CashTypeEnum.getByCode(orderRefundData.getCashType()).getDesc()); refundItem.setPayChannelName(CashTypeEnum.getByCode(orderRefundData.getCashType()) == null ? null : CashTypeEnum.getByCode(orderRefundData.getCashType()).getDesc());
} else { } else {
refundItem.setPayChannelType(PayMethodEnum.getByCode(orderRefundData.getPayMethodCode()).getIndex()); refundItem.setPayChannelType(PayMethodEnum.getIndexByCode(orderRefundData.getPayMethodCode()));
refundItem.setPayChannelName(PayMethodEnum.getByCode(orderRefundData.getPayMethodCode()).getDesc()); refundItem.setPayChannelName(PayMethodEnum.getDescByCode(orderRefundData.getPayMethodCode()));
} }
refundItem.setAmount(orderRefundData.getRefundAmount().intValue()); refundItem.setAmount(orderRefundData.getRefundAmount().intValue());
refundItem.setRefundTradeNo(orderRefundData.getRefundTradeNo()); refundItem.setRefundTradeNo(orderRefundData.getRefundTradeNo());
...@@ -66,8 +66,8 @@ public class OrderCancelReqAdapter { ...@@ -66,8 +66,8 @@ public class OrderCancelReqAdapter {
refundItem.setPayChannelType(Integer.valueOf(r.getCashType())); refundItem.setPayChannelType(Integer.valueOf(r.getCashType()));
refundItem.setPayChannelName(CashTypeEnum.getByCode(r.getCashType()) == null ? null : CashTypeEnum.getByCode(r.getCashType()).getDesc()); refundItem.setPayChannelName(CashTypeEnum.getByCode(r.getCashType()) == null ? null : CashTypeEnum.getByCode(r.getCashType()).getDesc());
} else { } else {
refundItem.setPayChannelType(PayMethodEnum.getByCode(r.getPayMethodCode()).getIndex()); refundItem.setPayChannelType(PayMethodEnum.getIndexByCode(r.getPayMethodCode()));
refundItem.setPayChannelName(PayMethodEnum.getByCode(r.getPayMethodCode()).getDesc()); refundItem.setPayChannelName(PayMethodEnum.getDescByCode(r.getPayMethodCode()));
} }
refundItem.setAmount(r.getSettleRefundAmount()); refundItem.setAmount(r.getSettleRefundAmount());
refundItem.setRefundTradeNo(r.getRefundTradeNo()); refundItem.setRefundTradeNo(r.getRefundTradeNo());
...@@ -86,8 +86,8 @@ public class OrderCancelReqAdapter { ...@@ -86,8 +86,8 @@ public class OrderCancelReqAdapter {
payRefundItem.setPayChannelType(Integer.valueOf(request.getCashType())); payRefundItem.setPayChannelType(Integer.valueOf(request.getCashType()));
payRefundItem.setPayChannelName(CashTypeEnum.getByCode(request.getCashType()) == null ? null : CashTypeEnum.getByCode(request.getCashType()).getDesc()); payRefundItem.setPayChannelName(CashTypeEnum.getByCode(request.getCashType()) == null ? null : CashTypeEnum.getByCode(request.getCashType()).getDesc());
} else { } else {
payRefundItem.setPayChannelType(PayMethodEnum.getByCode(request.getPayMethodCode()).getIndex()); payRefundItem.setPayChannelType(PayMethodEnum.getIndexByCode(request.getPayMethodCode()));
payRefundItem.setPayChannelName(PayMethodEnum.getByCode(request.getPayMethodCode()).getDesc()); payRefundItem.setPayChannelName(PayMethodEnum.getDescByCode(request.getPayMethodCode()));
} }
payRefundItem.setAmount(request.getRefundAmount()); payRefundItem.setAmount(request.getRefundAmount());
payRefundItem.setRefundTime(DateUtil.convert2Date(request.getRefundTime(), "yyyy-MM-dd HH:mm:ss").getTime()); payRefundItem.setRefundTime(DateUtil.convert2Date(request.getRefundTime(), "yyyy-MM-dd HH:mm:ss").getTime());
......
...@@ -33,6 +33,30 @@ public enum PayMethodEnum { ...@@ -33,6 +33,30 @@ public enum PayMethodEnum {
return null; return null;
} }
public static Integer getIndexByCode(String code) {
if (code == null) {
return null;
}
for (PayMethodEnum payStatus : values()) {
if (payStatus.getCode().equals(code)) {
return payStatus.getIndex();
}
}
return null;
}
public static String getDescByCode(String code) {
if (code == null) {
return null;
}
for (PayMethodEnum payStatus : values()) {
if (payStatus.getCode().equals(code)) {
return payStatus.getDesc();
}
}
return null;
}
public String getCode() { public String getCode() {
return code; return code;
} }
......
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