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

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

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml

assortment-ordercenter-sdk/readme.md

@@ -146,4 +146,5 @@
 | 2.1.68-RELEASE |  取餐码迁移至聚合层  | 王航航 | 2021-06-07|
 | 2.1.69-RELEASE |  麦咖啡一键下单  | 徐康 | 2021-06-10|
 | 2.1.70-RELEASE |  更新sdk  | 张跃 | 2021-06-17|
-| 2.1.71-RELEASE |  麦咖啡买赠和阶梯运费  | 徐康 | 2021-06-19|
+| 2.1.71-RELEASE |  麦咖啡买赠和阶梯运费  | 徐康 | 2021-06-19|
\ No newline at end of file
+| 2.1.72-RELEASE |  券码所券  | 张跃 | 2021-06-21|
\ No newline at end of file

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();
             }

order-management/pom.xml

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>couponcenter-sdk</artifactId>
-            <version>4.1.2-SNAPSHOT</version>
+            <version>4.1.1.RELEASE</version>
             <scope>compile</scope>
         </dependency>