Commit 4c289a58 by rui.zhu

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

parents e97b047c 7a63c984
...@@ -146,10 +146,6 @@ public class OrderAdapterServiceImpl { ...@@ -146,10 +146,6 @@ public class OrderAdapterServiceImpl {
private OrderCommonService orderCommonService; private OrderCommonService orderCommonService;
@Autowired @Autowired
private SellCouponOrderServiceImpl sellCouponOrderService; private SellCouponOrderServiceImpl sellCouponOrderService;
@Value("${saas.autoRefund.client}")
private String autoRefundClient;
@Value("${saas.autoRefund.partnerId}")
private String autoRefundPartnerId;
@Autowired @Autowired
private OrderCenterProperties orderCenterProperties; private OrderCenterProperties orderCenterProperties;
@Autowired @Autowired
...@@ -340,9 +336,7 @@ public class OrderAdapterServiceImpl { ...@@ -340,9 +336,7 @@ public class OrderAdapterServiceImpl {
} }
Integer client = Integer.parseInt(orderBean.getOrderClient()); Integer client = Integer.parseInt(orderBean.getOrderClient());
//若是订单超时回调了 订单已取消则做退款处理 //若是订单超时回调了 订单已取消则做退款处理
if (NewOrderStatus.CLOSED.getIndex().equals(orderBean.getStatusV2()) if (NewOrderStatus.CLOSED.getIndex().equals(orderBean.getStatusV2())) {
&& Arrays.asList(autoRefundClient.split(",")).contains(client.toString())
&& Arrays.asList(autoRefundPartnerId.split(",")).contains(orderBean.getCompanyId())) {
cn.freemud.management.entities.dto.request.order.OrderManagerRequest request = new cn.freemud.management.entities.dto.request.order.OrderManagerRequest(); cn.freemud.management.entities.dto.request.order.OrderManagerRequest request = new cn.freemud.management.entities.dto.request.order.OrderManagerRequest();
request.setOrderId(orderBean.getOid()); request.setOrderId(orderBean.getOid());
request.setPartnerId(orderBean.getCompanyId()); request.setPartnerId(orderBean.getCompanyId());
......
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