Merge remote-tracking branch 'origin/dev' into dev

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

@@ -31,7 +31,7 @@ public class PushClient {
 
 	public String send(UmengNotification msg) throws Exception {
 		// TODO: 2021/7/14 上线去掉 
-		msg.setTestMode();
+//		msg.setTestMode();
 		String timestamp = Integer.toString((int)(System.currentTimeMillis() / 1000));
 		msg.setPredefinedKeyValue("timestamp", timestamp);
         String url = host + postPath;

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/express/shunfeng/PerformancesExpressCallbackServiceImpl.java

@@ -122,7 +122,7 @@ public class PerformancesExpressCallbackServiceImpl extends ServiceImpl<KylinOrd
 
     public boolean orderRoute(@RequestBody String params) {
         boolean res = shunfengSignUtils.receiveRequestAndCheckSign(params, httpServletRequest);
-        if (true) {
+        if (res) {
             PerformanceExpressPushRouteParam performanceExpressPushRouteParam = JsonUtils.fromJson(params, PerformanceExpressPushRouteParam.class);
             KylinOrderExpressRoute kylinOrderExpressRoute = new KylinOrderExpressRoute();
             String orderExpressRouteId = IDGenerator.nextSnowId();