Merge remote-tracking branch 'remotes/origin/feature/refundJudgeNull-刘鹏飞' into develop

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
#	order-application-service/pom.xml
#	order-management/pom.xml
#	ordercenter-sdk/pom.xml

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>2.1.7-SNAPSHOT</version>
+    <version>2.1.8-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -61,7 +61,7 @@
         <dependency>
             <artifactId>promotioncenter-sdk</artifactId>
             <groupId>com.freemud.application.service.sdk</groupId>
-            <version>2.6.5.SNAPSHOT</version>
+            <version>2.7.RELEASE</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

assortment-ordercenter-sdk/readme.md

@@ -92,4 +92,5 @@
 | 2.0.24-SNAPSHOT| 农工商添加设备号 | 梁崇福 | 2020-11-09 |
 | 2.1.3-SNAPSHOT| redis工具类添加解锁方法 | 刘鹏飞 | 2020-11-10 |
 | 2.1.6-SNAPSHOT| 升级ordercenter-sdk   | lixixoaer | 2020-11-10 |
-| 2.1.7-SNAPSHOT|  混合支付退款   | lixixoaer | 2020-11-11 |
\ No newline at end of file
+| 2.1.7-SNAPSHOT|  混合支付退款   | lixixoaer | 2020-11-11 |
+| 2.1.8-SNAPSHOT|  退款增加自动退款配置的null判断   | 刘鹏飞 | 2020-11-12 |
\ No newline at end of file

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -557,7 +557,11 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
      */
     private OrderTaskReq setAfterSalesOrderTimeOutTask(StoreResponse.Configuration configuration) {
 
-        if(configuration != null && (configuration.getTimeTypeOfRefund() != null && 2 == configuration.getTimeTypeOfRefund().intValue()) || configuration.getTimeTypeOfRefund() == null){// 48小时之后
+        if(configuration == null ){
+            return null;
+        }
+
+        if((configuration.getTimeTypeOfRefund() != null && 2 == configuration.getTimeTypeOfRefund().intValue()) || configuration.getTimeTypeOfRefund() == null){// 48小时之后
             OrderTaskReq orderTask = new OrderTaskReq();
             orderTask.setTaskType(4);
             orderTask.setTimeout(1);
@@ -571,7 +575,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
             orderTask.setProcessingTime(DateUtil.convert2String(processingDate, DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
 
             return orderTask;
-        }else if(configuration != null && configuration.getTimeTypeOfRefund() != null && 1 == configuration.getTimeTypeOfRefund().intValue()){// 指定时间
+        }else if(configuration.getTimeTypeOfRefund() != null && 1 == configuration.getTimeTypeOfRefund().intValue()){// 指定时间
             OrderTaskReq orderTask = new OrderTaskReq();
             orderTask.setTaskType(4);
             orderTask.setTimeout(1);

order-application-service/pom.xml

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>2.1.7-SNAPSHOT</version>
+            <version>2.1.8-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
@@ -60,7 +60,7 @@
         <dependency>
             <artifactId>promotioncenter-sdk</artifactId>
             <groupId>com.freemud.application.service.sdk</groupId>
-            <version>2.6.5.SNAPSHOT</version>
+            <version>2.7.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>

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

@@ -157,12 +157,10 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
             }
             return orderService.createOrderNew(createOrderVo);
         } catch (Exception e) {
-            log.error("创建订单失败,trackingNo:{}", LogTreadLocal.getTrackingNo());
+            throw e;
         } finally {
-            LockUtils.unlock(redisCache.getRedisTemplate(),createOrderKey);
+            //LockUtils.unlock(redisCache.getRedisTemplate(),createOrderKey);
         }
-
-        return ResponseUtil.error(ResponseResult.ORDER_CREATE_ERROR);
     }