Skip to content

O
order-group
Commit e97b047c by rui.zhu
Options

Merge branch 'feature/rui.zhu/关单逻辑优化' into qa

parents 625c4b21 1f00f3ad
Showing with 7 additions and 5 deletions
order-application-service/src/main/java/cn/freemud/service/impl/PayServiceImpl.java
...@@ -931,11 +931,13 @@ public class PayServiceImpl { ...@@ -931,11 +931,13 @@ public class PayServiceImpl {
closeUnifiedOrderRequest.setVer("2"); closeUnifiedOrderRequest.setVer("2");
closeUnifiedOrderRequest.setPartnerId(orderBean.getCompanyId()); closeUnifiedOrderRequest.setPartnerId(orderBean.getCompanyId());
closeUnifiedOrderRequest.setStoreId(orderBean.getShopId()); closeUnifiedOrderRequest.setStoreId(orderBean.getShopId());
com.freemud.application.sdk.api.base.BaseResponse<CloseUnifiedOrderResult> cancelNewUnifiedOrder = this.cancelNewUnifiedOrder(closeUnifiedOrderRequest); // 不关心支付关单结果，不判断是否关闭预定单成功
if (ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), cancelNewUnifiedOrder.getCode()) this.cancelNewUnifiedOrder(closeUnifiedOrderRequest);
|| ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), cancelNewUnifiedOrder.getData().getResultCode())) { // com.freemud.application.sdk.api.base.BaseResponse<CloseUnifiedOrderResult> cancelNewUnifiedOrder = this.cancelNewUnifiedOrder(closeUnifiedOrderRequest);
throw new ServiceException(ResponseResult.ORDER_PRE_PAYMENT_CLOSE_FAILED); // if (ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), cancelNewUnifiedOrder.getCode())
} // || ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), cancelNewUnifiedOrder.getData().getResultCode())) {
// throw new ServiceException(ResponseResult.ORDER_PRE_PAYMENT_CLOSE_FAILED);
// }
} }
return paySuccess; return paySuccess;
} }
......
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