|
|
|
@@ -19,6 +19,8 @@ import com.iformall.service.WxMerchantTradeDailyService; |
|
|
|
import com.iformall.service.WxMallService; |
|
|
|
import com.iformall.service.WxMerchantBUserService; |
|
|
|
import com.iformall.service.WxMerchantService; |
|
|
|
import com.iformall.utils.DateUtils; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.slf4j.Logger; |
|
|
|
import org.slf4j.LoggerFactory; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
@@ -129,7 +131,11 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ |
|
|
|
|
|
|
|
WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily(); |
|
|
|
wxMerchantTradeDaily.setMerchantId(tradeDailyVo.getMerchantId()); |
|
|
|
wxMerchantTradeDaily.setReportDate(tradeDailyVo.getReportDate()); |
|
|
|
if (StringUtils.isEmpty(tradeDailyVo.getReportDate())) { |
|
|
|
wxMerchantTradeDaily.setReportDate(DateUtils.getTimeBefore(1, new Date())); |
|
|
|
} else { |
|
|
|
wxMerchantTradeDaily.setReportDate(tradeDailyVo.getReportDate()); |
|
|
|
} |
|
|
|
List<WxMerchantTradeDaily> tradeList = wxMerchantTradeDailyMapper.findList(wxMerchantTradeDaily); |
|
|
|
|
|
|
|
if (tradeList.size() > 0) { |
|
|
|
@@ -158,7 +164,7 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ |
|
|
|
wxMerchantTradeDaily.setMerchantId(tradeDailyVo.getMerchantId()); |
|
|
|
wxMerchantTradeDaily.setReportDate(tradeDailyVo.getReportDate()); |
|
|
|
List<WxMerchantTradeDaily> tradeList = wxMerchantTradeDailyMapper.findList(wxMerchantTradeDaily); |
|
|
|
wxMerchantTradeDaily = tradeList.size() > 0 ? tradeList.get(0) : null; |
|
|
|
wxMerchantTradeDaily = tradeList.size() > 0 ? tradeList.get(0) : new WxMerchantTradeDaily(); |
|
|
|
return new ResultData(wxMerchantTradeDaily); |
|
|
|
} |
|
|
|
|
|
|
|
|