Merge branch 'feature/1.9.17-Exception-20200325-dingkai'

# Conflicts:
#	order-application-service/pom.xml

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>1.2.6.RELEASE</version>
+    <version>1.2.7.RELEASE</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>

assortment-ordercenter-sdk/readme.md

@@ -20,4 +20,5 @@
 | 1.2.3.RELEASE | 预约单升级RELEASE | wuping | 2020-03-18 |
 | 1.2.4.RELEASE | 紧急需求 增加骑手电话 | 海波 | 2020-03-19 |
 | 1.2.5.RELEASE | 满额减配送费 | dingkai | 2020-03-26 |
-| 1.2.5.RELEASE | 满额减配送费 | 海波 | 2020-03-26 |
+| 1.2.5.RELEASE | 满额减配送费 | 海波 | 2020-03-26 |
\ No newline at end of file
+| 1.2.7.RELEASE | 判断优化 | 丁凯 | 2020-04-03 |
\ No newline at end of file

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -474,7 +474,11 @@ public class OrderSdkAdapter {
         CreateOrderResponse response = new CreateOrderResponse();
         response.setErrcode(Integer.parseInt(result.getCode()));
         response.setErrmsg(result.getMessage());
-        if (result.getResult().equals(new OrderInfoReqs())) {
+        /**
+         * 为什么做这样的判断result.getResult().equals(new OrderInfoReqs())？
+         * 我猜是因为基础服务异常返回的时候以前result返回了{}对象
+         */
+        if (result.getResult() == null || result.getResult().equals(new OrderInfoReqs())) {
             return response;
         }
 

call-back-service/pom.xml

@@ -20,7 +20,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>sdk-common-base</artifactId>
-            <version>1.3.9-SNAPSHOT</version>
+            <version>1.4.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

order-application-service/pom.xml

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>1.2.6.RELEASE</version>
+            <version>1.2.7.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

order-application-service/src/main/java/cn/freemud/utils/LogUtil.java

@@ -288,14 +288,14 @@ public class LogUtil {
             if (StringUtils.isEmpty(uri) && method != null) {
                 PostMapping postMapping = AnnotationUtils.getAnnotation(method, PostMapping.class);
                 uri = uriPre + (!Objects.equals(postMapping, null) && !Objects.equals(postMapping.path(), null) && postMapping.path().length > 0 ? postMapping.path()[0] : "");
-            }
-            if (StringUtils.isEmpty(uri)) {
-                GetMapping getMapping = AnnotationUtils.getAnnotation(method, GetMapping.class);
-                uri = uriPre + (!Objects.equals(getMapping, null) && !Objects.equals(getMapping.path(), null) && getMapping.path().length > 0 ? getMapping.path()[0] : "");
-            }
-            if (StringUtils.isEmpty(uri)) {
-                RequestMapping methodRequestMapping = AnnotationUtils.getAnnotation(method, RequestMapping.class);
-                uri = uriPre + (!Objects.equals(methodRequestMapping, null) && !Objects.equals(methodRequestMapping.path(), null) && methodRequestMapping.path().length > 0 ? methodRequestMapping.path()[0] : "");
+                if (StringUtils.isEmpty(uri)) {
+                    GetMapping getMapping = AnnotationUtils.getAnnotation(method, GetMapping.class);
+                    uri = uriPre + (!Objects.equals(getMapping, null) && !Objects.equals(getMapping.path(), null) && getMapping.path().length > 0 ? getMapping.path()[0] : "");
+                }
+                if (StringUtils.isEmpty(uri)) {
+                    RequestMapping methodRequestMapping = AnnotationUtils.getAnnotation(method, RequestMapping.class);
+                    uri = uriPre + (!Objects.equals(methodRequestMapping, null) && !Objects.equals(methodRequestMapping.path(), null) && methodRequestMapping.path().length > 0 ? methodRequestMapping.path()[0] : "");
+                }
             }
             ThirdPartLogVo thirdPartLogVo = new ThirdPartLogVo();
             thirdPartLogVo.setThirdPartName(serviceName);

shopping-cart-application-service/src/main/java/cn/freemud/utils/LogUtil.java

@@ -297,14 +297,14 @@ public class LogUtil {
             if (method != null) {
                 PostMapping postMapping = AnnotationUtils.getAnnotation(method, PostMapping.class);
                 uri = uriPre + (!Objects.equals(postMapping, null) && postMapping.path().length > 0 ? postMapping.path()[0] : "");
-            }
-            if (StringUtils.isEmpty(uri)) {
-                GetMapping getMapping = AnnotationUtils.getAnnotation(method, GetMapping.class);
-                uri = uriPre + (!Objects.equals(getMapping, null) && getMapping.path().length > 0 ? getMapping.path()[0] : "");
-            }
-            if (StringUtils.isEmpty(uri)) {
-                RequestMapping methodRequestMapping = AnnotationUtils.getAnnotation(method, RequestMapping.class);
-                uri = uriPre + (!Objects.equals(methodRequestMapping, null) && methodRequestMapping.path().length > 0 ? methodRequestMapping.path()[0] : "");
+                if (StringUtils.isEmpty(uri)) {
+                    GetMapping getMapping = AnnotationUtils.getAnnotation(method, GetMapping.class);
+                    uri = uriPre + (!Objects.equals(getMapping, null) && getMapping.path().length > 0 ? getMapping.path()[0] : "");
+                }
+                if (StringUtils.isEmpty(uri)) {
+                    RequestMapping methodRequestMapping = AnnotationUtils.getAnnotation(method, RequestMapping.class);
+                    uri = uriPre + (!Objects.equals(methodRequestMapping, null) && methodRequestMapping.path().length > 0 ? methodRequestMapping.path()[0] : "");
+                }
             }
             ThirdPartLogVo thirdPartLogVo = new ThirdPartLogVo();
             thirdPartLogVo.setThirdPartName(serviceName);