Commit 2ae9a2ae by rui.zhu

对应售后明细字段

parent 0b28c00f
package cn.freemud.management.entities.dto.response.pay; package cn.freemud.management.entities.dto.response.pay;
import cn.freemud.management.enums.ResponseResult; import cn.freemud.management.enums.ResponseResult;
import com.freemud.application.sdk.api.ordercenter.request.OrderCancelReq;
import com.freemud.sdk.api.assortment.order.enums.PayRefundStatus; import com.freemud.sdk.api.assortment.order.enums.PayRefundStatus;
import lombok.Data; import lombok.Data;
...@@ -73,7 +72,7 @@ public class PayRefundResponse { ...@@ -73,7 +72,7 @@ public class PayRefundResponse {
/** /**
* 退款时间 单位毫秒 * 退款时间 单位毫秒
*/ */
private Long refundDate; private Long refundTime;
/** /**
* 退款储值卡卡号(退款渠道为储值卡时,则必须传递) * 退款储值卡卡号(退款渠道为储值卡时,则必须传递)
*/ */
......
...@@ -9,7 +9,6 @@ import cn.freemud.management.thirdparty.MulitiPaymentClient; ...@@ -9,7 +9,6 @@ import cn.freemud.management.thirdparty.MulitiPaymentClient;
import cn.freemud.management.util.RedisUtil; import cn.freemud.management.util.RedisUtil;
import cn.freemud.redis.RedisCache; import cn.freemud.redis.RedisCache;
import com.freemud.application.sdk.api.ordercenter.enums.PayChannelType; import com.freemud.application.sdk.api.ordercenter.enums.PayChannelType;
import com.freemud.application.sdk.api.ordercenter.request.OrderCancelReq;
import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderPayItemResp; import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderPayItemResp;
import com.freemud.sdk.api.assortment.order.enums.PayRefundStatus; import com.freemud.sdk.api.assortment.order.enums.PayRefundStatus;
import com.freemud.sdk.api.assortment.order.request.order.MultiOrderRefundRequest; import com.freemud.sdk.api.assortment.order.request.order.MultiOrderRefundRequest;
...@@ -117,9 +116,9 @@ public class MultiRefundService { ...@@ -117,9 +116,9 @@ public class MultiRefundService {
PayRefundResponse.PayRefundItem refundItem = new PayRefundResponse.PayRefundItem(); PayRefundResponse.PayRefundItem refundItem = new PayRefundResponse.PayRefundItem();
refundItem.setPayChannelType(Integer.valueOf(PayChannelType.getByEbcode(r.getEbcode()).getIndex())); refundItem.setPayChannelType(Integer.valueOf(PayChannelType.getByEbcode(r.getEbcode()).getIndex()));
refundItem.setPayChannelName(PayChannelType.getByEbcode(r.getEbcode()).getName()); refundItem.setPayChannelName(PayChannelType.getByEbcode(r.getEbcode()).getName());
refundItem.setAmount(r.getRefundAmount()); refundItem.setAmount(r.getSettleRefundAmount());
refundItem.setRefundTradeNo(r.getRefundTradeNo()); refundItem.setRefundTradeNo(r.getRefundTradeNo());
refundItem.setRefundDate(DateUtil.convert2Date(r.getRefundTime(), "yyyy-MM-dd HH:mm:ss").getTime()); refundItem.setRefundTime(DateUtil.convert2Date(r.getRefundTime(), "yyyy-MM-dd HH:mm:ss").getTime());
//TODO 混合支付储值卡卡号 这里需要跟支付对接,下游设计中 //TODO 混合支付储值卡卡号 这里需要跟支付对接,下游设计中
// refundItem.setCardCode("?"); // refundItem.setCardCode("?");
return refundItem; return refundItem;
...@@ -156,7 +155,7 @@ public class MultiRefundService { ...@@ -156,7 +155,7 @@ public class MultiRefundService {
refundItem.setPayChannelName(PayChannelType.getByEbcode(data.getEbcode()).getName()); refundItem.setPayChannelName(PayChannelType.getByEbcode(data.getEbcode()).getName());
refundItem.setAmount(data.getRefundAmount()); refundItem.setAmount(data.getRefundAmount());
refundItem.setRefundTradeNo(data.getRefundEndTransTradeNo()); refundItem.setRefundTradeNo(data.getRefundEndTransTradeNo());
refundItem.setRefundDate(DateUtil.convert2Date(data.getRefundTime(), "yyyy-MM-dd HH:mm:ss").getTime()); refundItem.setRefundTime(DateUtil.convert2Date(data.getRefundTime(), "yyyy-MM-dd HH:mm:ss").getTime());
refundItems.add(refundItem); refundItems.add(refundItem);
} }
} catch (Throwable e) { } catch (Throwable e) {
......
...@@ -206,7 +206,7 @@ public class PaymentHandle { ...@@ -206,7 +206,7 @@ public class PaymentHandle {
refundItem.setPayChannelName(PayChannelType.getByEbcode(data.getPayCode()).getName()); refundItem.setPayChannelName(PayChannelType.getByEbcode(data.getPayCode()).getName());
refundItem.setAmount(data.getRefundAmount().intValue()); refundItem.setAmount(data.getRefundAmount().intValue());
refundItem.setRefundTradeNo(data.getRefundTradeNo()); refundItem.setRefundTradeNo(data.getRefundTradeNo());
refundItem.setRefundDate(DateUtil.convert2Date(data.getRefundTime(), "yyyy-MM-dd HH:mm:ss").getTime()); refundItem.setRefundTime(DateUtil.convert2Date(data.getRefundTime(), "yyyy-MM-dd HH:mm:ss").getTime());
refundItemList.add(refundItem); refundItemList.add(refundItem);
} }
PayRefundResponse payRefundResponse = handlePayRefundResponse(refundStatus, refundReq.getRefundId()); PayRefundResponse payRefundResponse = handlePayRefundResponse(refundStatus, refundReq.getRefundId());
......
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