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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/service/inter/money/msg/UserMoneyMsgNotificationService.java

@@ -91,15 +91,13 @@


   /**

    * 分享赚订单到账

    * 
    * @param uid

    * @param orderCount

    * @param goodsCount

    * @param money

    * @param balance

    * @param orderType 1-淘宝 2-京东等渠道

    * @param money 到账金额

    * @param balance  账户余额

    * @param receivedDate 结算月份

    */

   public void shareOrderReceived(Long uid, int orderType, int orderCount, int goodsCount, BigDecimal money,

         BigDecimal balance, String orderId, Date downTime);

   public void shareOrderReceived(Long uid, int orderType,  BigDecimal money, BigDecimal balance,  Date receivedDate);