Merge branches 'feature/20210621_支付回调取消订单优化_wuping' and 'master' of…

Merge branches 'feature/20210621_支付回调取消订单优化_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java

@@ -110,6 +110,8 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
     private SellCouponOrderServiceImpl sellCouponOrderService;
     @Value("${saas.autoRefund.client}")
     private String autoRefundClient;
+    @Value("${saas.autoRefund.partnerId}")
+    private String autoRefundPartnerId;
 
 
     @Override
@@ -316,17 +318,15 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
                 ApiLog.debug("paySuccessCallback_queryOrderById_faild, trackingNo:{},PaysuccessNoticeMessage:{}", LogTreadLocal.getTrackingNo(), gson.toJson(message));
                 return gson.toJson(message);
             }
-            QueryOrdersResponseDto.DataBean.OrderBean orderBean = orderBeans.get(OrderBeanType.SAASORDER.getCode());//todo
-            // 混合支付失败，取消订单
-            if (!message.getResult_code().equals(ResponseCodeConstant.RESPONSE_SUCCESS)) {
-                return orderService.cannelComPayOrder(confirmOrderDto, orderBean);
-            }
+            QueryOrdersResponseDto.DataBean.OrderBean orderBean = orderBeans.get(OrderBeanType.SAASORDER.getCode());
+            // 注意，支付状态判断优先级最高
             if (!PayStatus.NOT_PAY.getCode().equals(orderBean.getPayStatus())) {
                 return orderAdapter.sendPaySuccessNoticeMessage();
             }
             Integer client = OrderSourceType.getClientByCode(orderBean.getSource());
             //若是app订单超时回调了 订单已取消则做退款处理
-            if (OrderStatus.CALCEL.getCode().equals(orderBean.getStatus()) && Arrays.asList(autoRefundClient.split(",")).contains(client.toString())) {
+            if (OrderStatus.CALCEL.getCode().equals(orderBean.getStatus()) && Arrays.asList(autoRefundClient.split(",")).contains(client.toString())
+                    && Arrays.asList(autoRefundPartnerId.split(",")).contains(orderBean.getCompanyId())) {
                 orderService.timeOutRefund(orderBean);
                 return orderAdapter.sendPaySuccessNoticeMessage();
             }