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

admin

2020-06-09 afe61a27c4f77db65df66b0ff5dc93cbd3e0014b

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/dividents/TeamDividentsSourceUserServiceImpl.java

@@ -32,8 +32,8 @@
   }



   @Override

   public BigDecimal sumMoneyByUidAndDay(Long uid, String day) {

      BigDecimal money = teamDividentsSourceUserMapper.sumMoneyByTargetUidAndDay(uid, day);

   public BigDecimal sumMoneyByUidAndDay(Long uid, String day,Integer type) {

      BigDecimal money = teamDividentsSourceUserMapper.sumMoneyByTargetUidAndDayAndType(uid, day,type);

      if (money == null)

         return new BigDecimal(0);

      return money;