Просмотр исходного кода

fix trade daily

release_toaliyun_real
lin 3 лет назад
Родитель
Сommit
ab904a3ef3
2 измененных файлов: 16 добавлений и 6 удалений
  1. +15
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java
  2. +1
    -6
      mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml

+ 15
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java Просмотреть файл

@@ -148,6 +148,21 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ
wxMerchantTradeDaily.setCreateDate(new Date()); wxMerchantTradeDaily.setCreateDate(new Date());
wxMerchantTradeDaily.setUpdateDate(new Date()); wxMerchantTradeDaily.setUpdateDate(new Date());
wxMerchantTradeDailyMapper.insert(wxMerchantTradeDaily); wxMerchantTradeDailyMapper.insert(wxMerchantTradeDaily);
WxMerchantTradeDailyHistory wxMerchantTradeDailyHistory = new WxMerchantTradeDailyHistory();
wxMerchantTradeDailyHistory.setId(idWorker.nextId());
wxMerchantTradeDailyHistory.setTradeDailyId(wxMerchantTradeDaily.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(wxMerchantTradeDaily); return new ResultData(wxMerchantTradeDaily);




+ 1
- 6
mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml Просмотреть файл

@@ -76,7 +76,7 @@
and date_type = 1 and date_type = 1
<if test=" null != startTime and null != endTime"> <if test=" null != startTime and null != endTime">
and report_date &gt;= date_format(#{startTime},'%Y-%m-%d') and report_date &gt;= date_format(#{startTime},'%Y-%m-%d')
and report_date &lt;= date_format(#{endTime},'%Y-%m-%d')
and report_date &lt;= date_format(#{endTime},'%Y-%m-%d')
</if > </if >
</if> </if>
@@ -88,11 +88,6 @@
</if > </if >
</if> </if>
<if test=" null != startTime and null != endTime">
and report_date &gt;= date_format(#{startTime},'%Y-%m-%d')
and report_date &lt;= date_format(#{endTime},'%Y-%m-%d')
</if>
<if test=" null != merchantIdList "> <if test=" null != merchantIdList ">
and merchant_id in and merchant_id in
<foreach collection="merchantIdList" index="index" item="midItem" open="(" separator="," close=")"> <foreach collection="merchantIdList" index="index" item="midItem" open="(" separator="," close=")">


Загрузка…
Отмена
Сохранить