Merge branch 'master' into dev

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderStatisticsBiz.java

@@ -21,7 +21,9 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.text.ParseException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
 import java.util.stream.Collectors;
 
 
@@ -56,6 +58,7 @@ public class OrderStatisticsBiz extends BaseBiz<OrderStatisticsMapper, OrderStat
         result.setTotalOrders(list.stream().map(HomePageOrderData::getTotalOrders).reduce(BigDecimal.ZERO, BigDecimal::add));
         result.setTotalOutstandingDeposit(list.stream().map(HomePageOrderData::getTotalOutstandingDeposit).reduce(BigDecimal.ZERO, BigDecimal::add));
         result.setAdditionalIndemnity(list.stream().map(HomePageOrderData::getAdditionalIndemnity).reduce(BigDecimal.ZERO, BigDecimal::add));
+        result.setTotalOrders(new BigDecimal(167260));
         return result;
     }
 

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mqhandler/RefundMQHandler.java

@@ -38,6 +38,11 @@ public class RefundMQHandler {
      */
     @RabbitListener(queues = ORDER_DEPOSIT_REFUND_QUEUE)
     public void integralHandler(Message message, @Headers Map<String, Object> headers, Channel channel) {
+        try {
+            Thread.sleep(5000L);
+        }catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
         ExecutorService executorService = Executors.newCachedThreadPool();
         executorService.execute(new Runnable() {
             @Override

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/constant/PushJumpType.java

@@ -15,6 +15,7 @@ public enum PushJumpType {
     VEHICLE_ORDER_SCORE(3,"租车订单评价页"),
     TOUR_ORDER_SCORE(4,"旅游订单评价页面"),
     MEMBER_ORDER_DETAIL(5,"会员订单详情页"),
+    URL(6,"指定跳转地址"),
     ;
     /**
      * 编码

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/entity/MessagePush.java

@@ -64,11 +64,16 @@ public class MessagePush implements Serializable {
 	@ApiModelProperty(value = "指定跳转页面")
     private String intent;
 
+
 	@Column(name = "jump_type")
 	@ApiModelProperty(value = "跳转页面类型：0-进入app；其他见枚举")
 	private Integer jumpType;
 
 
+	@ApiModelProperty(value = "指定跳转地址")
+	private String url;
+
+
 	@Column(name = "crt_time")
 	@ApiModelProperty(value = "创建时间", hidden = true )
 	private Long crtTime;

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/JPushBiz.java

@@ -193,6 +193,7 @@ public class JPushBiz extends BaseBiz<MessagePushMapper, MessagePush> {
         if (StringUtils.isNotBlank(orderNo)){
         extras.put("orderNo",orderNo);
         }
+        extras.put("url",messagePush.getUrl());
         Notification notification = Notification.newBuilder()
                 .addPlatformNotification(AndroidNotification.newBuilder()
                         .setAlert(messagePush.getAlert())