Merge branch 'dev'

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/PerformancesExpressServiceImpl.java

@@ -182,8 +182,13 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
             String result = shunfengSignUtils.generateSignatureAndRequest(hBody, "/public/order/v1/placeOrder");
             HashMap hashMap = JsonUtils.fromJson(result, HashMap.class);
             System.out.println(result);
-            if (hashMap.get("succ").equals("fail")) {
-                String msg = (String) hashMap.get("msg");
+            if (null == hashMap.get("succ") || hashMap.get("succ").equals("fail")) {
+                String msg = "";
+                if (null == hashMap.get("succ")) {
+                    msg = result;
+                } else {
+                    msg = (String) hashMap.get("msg");
+                }
                 return ResponseDto.failure(msg);
             } else {
                 HashMap hashMapResult = (HashMap) hashMap.get("result");

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/ShunfengSignUtils.java

@@ -105,6 +105,7 @@ public class ShunfengSignUtils {
             );
             System.out.println("发送请求失败");
             e.printStackTrace();
+            return e.getMessage();
         } finally {
             if (client != null) {
                 try {