Commit 1a6c99ec by zhiheng.zhang

oms退款金额修改 日志打印修改

parent 02915e32
...@@ -49,7 +49,7 @@ public class PaymentSdkAdapter { ...@@ -49,7 +49,7 @@ public class PaymentSdkAdapter {
multiQueryRequest.setPartnerId(orderBean.getCompanyId()); multiQueryRequest.setPartnerId(orderBean.getCompanyId());
multiQueryRequest.setStoreId(orderBean.getShopId()); multiQueryRequest.setStoreId(orderBean.getShopId());
multiQueryRequest.setFmId(""); multiQueryRequest.setFmId("");
multiQueryRequest.setRefundAmount(orderBean.getAmount()); multiQueryRequest.setRefundAmount(Long.valueOf(String.valueOf(refundAmount)));
multiQueryRequest.setRefundTradeNo(getRefundSerialNo().toString()); multiQueryRequest.setRefundTradeNo(getRefundSerialNo().toString());
multiQueryRequest.setStoreId(orderBean.getShopId()); multiQueryRequest.setStoreId(orderBean.getShopId());
multiQueryRequest.setNotifyUrl(refundNotifyCallback); multiQueryRequest.setNotifyUrl(refundNotifyCallback);
......
...@@ -124,7 +124,6 @@ public class PaymentHandle { ...@@ -124,7 +124,6 @@ public class PaymentHandle {
private BigDecimal getRefundAmount(QueryOrdersResponse.DataBean.OrderBean data) { private BigDecimal getRefundAmount(QueryOrdersResponse.DataBean.OrderBean data) {
BigDecimal refundAmount = new BigDecimal(data.getAmount()); BigDecimal refundAmount = new BigDecimal(data.getAmount());
com.freemud.application.sdk.api.ordercenter.response.BaseResponse<List<AfterSalesOrderResp>> listBaseResponse = orderSdkService.queryAfterSaleByOrderCode(data.getCompanyId(), data.getOid()); com.freemud.application.sdk.api.ordercenter.response.BaseResponse<List<AfterSalesOrderResp>> listBaseResponse = orderSdkService.queryAfterSaleByOrderCode(data.getCompanyId(), data.getOid());
log.info("getRefundAmount:,{}"+listBaseResponse);
if (CollectionUtils.isNotEmpty(listBaseResponse.getResult())){ if (CollectionUtils.isNotEmpty(listBaseResponse.getResult())){
refundAmount=new BigDecimal(listBaseResponse.getResult().get(0).getActualAmount()); refundAmount=new BigDecimal(listBaseResponse.getResult().get(0).getActualAmount());
} }
...@@ -147,9 +146,7 @@ public class PaymentHandle { ...@@ -147,9 +146,7 @@ public class PaymentHandle {
public PayRefundResponse multiRefund(QueryOrdersResponse.DataBean.OrderBean orderBean){ public PayRefundResponse multiRefund(QueryOrdersResponse.DataBean.OrderBean orderBean){
PayRefundStatus refundStatus=PayRefundStatus.SUCCESS; PayRefundStatus refundStatus=PayRefundStatus.SUCCESS;
log.info("======orderBean:,{}"+orderBean);
MultiOrderRefundRequest multiOrderRefundRequest = paymentSdkAdapter.getMultiOrderPayRefundRequest(orderBean,getRefundAmount(orderBean)); MultiOrderRefundRequest multiOrderRefundRequest = paymentSdkAdapter.getMultiOrderPayRefundRequest(orderBean,getRefundAmount(orderBean));
log.info("======multiOrderRefundRequest:,{}"+multiOrderRefundRequest);
MultiOrderRefundResponse multiOrderRefundResponse = mulitiPaymentClient.paymentApplicationRefund(multiOrderRefundRequest,orderBean.getCompanyId()); MultiOrderRefundResponse multiOrderRefundResponse = mulitiPaymentClient.paymentApplicationRefund(multiOrderRefundRequest,orderBean.getCompanyId());
if (multiOrderRefundResponse == null || multiOrderRefundResponse.getData() == null || !com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant.ORDER_PAY_RESPONSE_SUCCESS.equals(multiOrderRefundResponse.getCode())) { if (multiOrderRefundResponse == null || multiOrderRefundResponse.getData() == null || !com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant.ORDER_PAY_RESPONSE_SUCCESS.equals(multiOrderRefundResponse.getCode())) {
throw new OrderServiceException(ResponseResult.REFUND_EXCEPTION); throw new OrderServiceException(ResponseResult.REFUND_EXCEPTION);
......
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