diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java index 33ef39f68..843cbeef3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java @@ -167,10 +167,30 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ wxMerchantTradeDaily.setUpdateDate(new Date()); wxMerchantTradeDaily.setTradeCount(tradeDaily.getTradeCount()); wxMerchantTradeDaily.setProof(tradeDaily.getProof()); - wxMerchantTradeDaily.setMallUserId(mallUserInfo.getId()); + if (null != mallUserInfo) { + wxMerchantTradeDaily.setMallUserId(mallUserInfo.getId()); + } wxMerchantTradeDaily.setDateType(tradeDaily.getDateType()); wxMerchantTradeDaily.setReportDate(tradeDaily.getReportDate()); wxMerchantTradeDailyMapper.insert(wxMerchantTradeDaily); + + WxMerchantTradeDailyHistory wxMerchantTradeDailyHistory = new WxMerchantTradeDailyHistory(); + wxMerchantTradeDailyHistory.setId(idWorker.nextId()); + wxMerchantTradeDailyHistory.setTradeDailyId(wxMerchantTradeDaily.getId()); + if (null != mallUserInfo) { + wxMerchantTradeDailyHistory.setMallUserId(mallUserInfo.getId()); + } + wxMerchantTradeDailyHistory.updateTenantInfo(wxMerchantTradeDaily); + wxMerchantTradeDailyHistory.setMerchantId(wxMerchantTradeDaily.getMerchantId()); + wxMerchantTradeDailyHistory.setTradeAmt(wxMerchantTradeDaily.getTradeAmt() + ""); + wxMerchantTradeDailyHistory.setCreateDate(new Date()); + wxMerchantTradeDailyHistory.setUpdateDate(new Date()); + wxMerchantTradeDailyHistory.setTradeCount(wxMerchantTradeDaily.getTradeCount()); + wxMerchantTradeDailyHistory.setProof(wxMerchantTradeDaily.getProof()); + wxMerchantTradeDailyHistory.setbUserId(wxMerchantTradeDaily.getbUserId()); + wxMerchantTradeDailyHistory.setReportDate(wxMerchantTradeDaily.getReportDate()); + wxMerchantTradeDailyHistory.setDateType(wxMerchantTradeDaily.getDateType()); + wxMerchantTradeDailyHistoryMapper.insert(wxMerchantTradeDailyHistory); return new ResultData(Result.SUCCESS); }