Merge branch 'feature_chw_zjw' into dev-chw

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/BaseOrderAcceptDetailedBiz.java

@@ -224,6 +224,8 @@ public class BaseOrderAcceptDetailedBiz extends BaseBiz<BaseOrderAcceptDetailedM
         if (insureAmount.compareTo(BigDecimal.ZERO) > 0){
             Integer type = status == 1 ? 2 : 1;
             BaseOrderAcceptDetailed acceptDetailed=new BaseOrderAcceptDetailed();
+            acceptDetailed.setMchId(0);
+            acceptDetailed.setUserId(orderDetailDTO.getUserId());
             acceptDetailed.setOrderNo(orderDetailDTO.getOrderNo());
             acceptDetailed.setOrderId(orderDetailDTO.getOrderId());
             acceptDetailed.setOrderAmount(orderDetailDTO.getOrderAmount());

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/handler/WaterMQHandler.java

@@ -47,6 +47,11 @@ public class WaterMQHandler {
     @RabbitListener(queues = ORDER_WATER_QUEUE)
     public void integralHandler(Message message, @Headers Map<String, Object> headers, Channel channel) {
         log.info("分账队列 messageJson："+ JSONUtil.parse(message));
+        try {
+            Thread.sleep(2000L);
+        }catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
         ExecutorService executorService = Executors.newCachedThreadPool();
         executorService.execute(new Runnable() {
             @Override

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

@@ -310,7 +310,7 @@ public class OrderCancelBiz {
                             }});
 
                             Integer dayLag = Long.valueOf(timeLag/(1000L * 60L * 60L * 24L)).intValue();
-                            if(dayLag <= 0) {
+                            if(dayLag > 0) {
                                 baseOrder.setInsureStatus(BaseOrder.INSURE_STATUS_CNL);
                                 //更新 申请状态
                                 insuranceList.forEach( insurance -> {