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

yujian

2020-05-13 3b9e1385a90ae84f97f2a4b8b7a35a6b13c01062

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneyDailyCountServiceImpl.java

@@ -39,24 +39,35 @@
      SimpleDateFormat formatMonth = new SimpleDateFormat("yyyy-MM");
      record.setYearMonth(formatMonth.format(record.getCountDay()));

      OrderMoneyDailyCount dailyCount = orderMoneyDailyCountDao.getById(id);
      OrderMoneyDailyCount dailyCount = orderMoneyDailyCountDao.get(id);
      if (dailyCount != null) {
         // 选择性更新
         orderMoneyDailyCountDao.updateSelective(record);
      } else {
         // 选择性插入
         if (record.getIncome() == null)
            record.setIncome(BigDecimal.valueOf(0));
         if (record.getIncomeTeam() == null)
            record.setIncomeTeam(BigDecimal.valueOf(0));
         if (record.getOrderNum() == null)
            record.setOrderNum(0);
         if (record.getOrderNumTeam() == null)
            record.setOrderNumTeam(0);
         initData(record);
         record.setUpdateTime(new Date());
         orderMoneyDailyCountDao.save(record);
      }
   }

   private void initData(OrderMoneyDailyCount record) {
      if (record.getIncome() == null)
         record.setIncome(0);
      if (record.getIncomeTeam() == null)
         record.setIncomeTeam(0);
      if (record.getOrderNum() == null)
         record.setOrderNum(0);
      if (record.getOrderNumTeam() == null)
         record.setOrderNumTeam(0);
      if (record.getTeamReward() == null)
         record.setTeamReward(0);
      if (record.getTeamRewardNum() == null)
         record.setTeamRewardNum(0);
      if (record.getTeamSubsidy() == null)
         record.setTeamSubsidy(0);
      if (record.getTeamSubsidyNum() == null)
         record.setTeamSubsidyNum(0);
   }
	
   @Override
   public List<OrderMoneyDailyCount> query(Long uid, Date minDay, Date maxDay) {
      return orderMoneyDailyCountDao.query(uid, minDay, maxDay);
@@ -81,4 +92,15 @@
   public List<OrderMoneyDailyCount> sumGroupByYearMonth(Long uid, Date minDay, Date maxDay) {
      return orderMoneyDailyCountDao.sumGroupByYearMonth(uid, minDay, maxDay);
   }
	
	
   @Override
   public List<OrderMoneyDailyCount> sumTeamGroupByCountDay(Long uid, Date minDay, Date maxDay) {
      return orderMoneyDailyCountDao.sumTeamGroupByCountDay(uid, minDay, maxDay);
   }

   @Override
   public List<OrderMoneyDailyCount> sumTeamGroupByYearMonth(Long uid, Date minDay, Date maxDay) {
      return orderMoneyDailyCountDao.sumTeamGroupByYearMonth(uid, minDay, maxDay);
   }
}