Commit 1ad722cc by ping.wu

取消支付取消订单

parent efff0362
...@@ -1774,7 +1774,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -1774,7 +1774,7 @@ public class OrderServiceImpl implements Orderservice {
return ResponseUtil.error(ResponseResult.ORDER_DELETE_ERROR.getCode(), "支付成功"); return ResponseUtil.error(ResponseResult.ORDER_DELETE_ERROR.getCode(), "支付成功");
} }
String partnerId = deleteOrderVo.getPartnerId(); String partnerId = deleteOrderVo.getPartnerId();
if (deletePartnerId == null || deletePartnerId.contains(partnerId)) { if (CollectionUtils.isEmpty(deletePartnerId) || deletePartnerId.contains(partnerId)) {
String reason = "用户取消支付"; String reason = "用户取消支付";
CancelOrderRequest cancelOrderRequest = orderAdapter.convent2CancelOrderRequest(orderBean.getOid(), CancelOrderRequest cancelOrderRequest = orderAdapter.convent2CancelOrderRequest(orderBean.getOid(),
partnerId, AfterSalesType.USER_CANCEL, reason, LogThreadLocal.getTrackingNo(), System.currentTimeMillis()+""); partnerId, AfterSalesType.USER_CANCEL, reason, LogThreadLocal.getTrackingNo(), System.currentTimeMillis()+"");
......
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