Commit b8677acd authored by 周健威's avatar 周健威

修改过了出发时间取消订单bug

parent 4e3b925f
...@@ -236,7 +236,7 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> { ...@@ -236,7 +236,7 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
} }
orv.setFreeze2PayAmount(freeze2PayAmount); orv.setFreeze2PayAmount(freeze2PayAmount);
orv.setFreeze2PayDesc(""); orv.setFreeze2PayDesc("冻结转支付订单号: "+ baseOrder.getNo());
ObjectRestResponse<String> result = thirdFeign.refund(orv); ObjectRestResponse<String> result = thirdFeign.refund(orv);
refundTradeNo = result.getData(); refundTradeNo = result.getData();
......
...@@ -396,7 +396,7 @@ public class BaseOrderController extends CommonBaseController implements UserRes ...@@ -396,7 +396,7 @@ public class BaseOrderController extends CommonBaseController implements UserRes
}}); }});
orv.setAmount(baseOrder.getRealAmount().multiply(new BigDecimal("100")).intValue()); orv.setAmount(baseOrder.getRealAmount().multiply(new BigDecimal("100")).intValue());
orv.setOrderNo(baseOrder.getNo()); orv.setOrderNo(baseOrder.getNo());
orv.setRefundDesc("退款"); orv.setRefundDesc("退款订单号:"+ no);
orv.setRefundAmount(refundAmount.multiply(new BigDecimal("100")).intValue()); orv.setRefundAmount(refundAmount.multiply(new BigDecimal("100")).intValue());
ObjectRestResponse<String> result = thirdFeign.refund(orv); ObjectRestResponse<String> result = thirdFeign.refund(orv);
return ObjectRestResponse.succ(result); return ObjectRestResponse.succ(result);
......
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