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

admin

2020-03-20 c3a5e164cbabbfc5f66e1356cb0de657ce3f58b9

 fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/order/InviteOrderSubsidyMessageListener.java

@@ -119,8 +119,13 @@
                              dto.getSourceType());

                     } else {

                        // 使数据有效

                        inviteOrderSubsidyService.validByOrderIdAndSourceType(dto.getOrderId(),

                              dto.getSourceType());

                        try {

                           inviteOrderSubsidyService.validByOrderIdAndSourceType(dto.getOrderId(),

                                 dto.getSourceType());

                        } catch (InviteOrderSubsidyException e) {

                           e.printStackTrace();

                           return Action.ReconsumeLater;

                        }

                     }

                  }

               }