Skip to content

O
order-group
Commit 6946e6a7 by 缪晖
Options

kehuo need auto order complete

parent 2a952469
Showing with 4 additions and 3 deletions
order-management/src/main/java/cn/freemud/management/service/handle/SaasOrderHandle.java
...@@ -112,9 +112,10 @@ public class SaasOrderHandle { ...@@ -112,9 +112,10 @@ public class SaasOrderHandle {
public BaseResponse orderDone(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean) { public BaseResponse orderDone(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean) {
BaseQueryOrderRequest orderDoneRequest = orderSdkAdapter.getOrderConfirmRequest(request.getOperator(), orderBean); BaseQueryOrderRequest orderDoneRequest = orderSdkAdapter.getOrderConfirmRequest(request.getOperator(), orderBean);
//合阔pos 商户订单状态不自动扭转 //合阔pos 商户订单状态不自动扭转
if (CollectionUtils.isNotEmpty(notAutomaticTwistPartnerId) && notAutomaticTwistPartnerId.contains(orderBean.getCompanyId())) { // 2021-07-07 合阔自动
orderDoneRequest.setNotAutomaticTwist(true); // if (CollectionUtils.isNotEmpty(notAutomaticTwistPartnerId) && notAutomaticTwistPartnerId.contains(orderBean.getCompanyId())) {
} // orderDoneRequest.setNotAutomaticTwist(true);
// }
BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderDone(orderDoneRequest); BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderDone(orderDoneRequest);
if (baseOrderResponse == null || ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), baseOrderResponse.getErrcode().toString())) { if (baseOrderResponse == null || ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), baseOrderResponse.getErrcode().toString())) {
return ResponseUtil.error(ResponseResult.DONE_ORDER_FAIL); return ResponseUtil.error(ResponseResult.DONE_ORDER_FAIL);
......
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