From b850eee6e58029b45ada7a21a8b52d3ecb177850 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 13 五月 2020 11:18:39 +0800
Subject: [PATCH] 测试环境取消活跃消息

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneyDailyCountServiceImpl.java |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneyDailyCountServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneyDailyCountServiceImpl.java
index 24370d2..6e7ea35 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneyDailyCountServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneyDailyCountServiceImpl.java
@@ -1,5 +1,6 @@
 package com.yeshi.fanli.service.impl.order;
 
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
@@ -42,10 +43,18 @@
 	    OrderMoneyDailyCount dailyCount = orderMoneyDailyCountDao.getById(id);
 		if (dailyCount == null) {
 			// 閫夋嫨鎬ф洿鏂�
-			orderMoneyDailyCountDao.save(record);
+			orderMoneyDailyCountDao.updateSelective(record);
 		} else {
 			// 閫夋嫨鎬ф彃鍏�
-			orderMoneyDailyCountDao.updateSelective(record);
+			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);
+			orderMoneyDailyCountDao.save(record);
 		}
 	}
 	

--
Gitblit v1.8.0