From 3584672da71d507a6ad63c952d32c1fd8cab29ef Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Fri, 14 Jul 2023 13:55:35 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=97=A5=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/mapper/SettleOrderReportMapper.java | 3 ++- .../pile/service/ISettleOrderReportService.java | 2 ++ .../service/impl/OrderBasicInfoServiceImpl.java | 13 +++++++++++-- .../service/impl/SettleOrderReportServiceImpl.java | 7 +++++-- .../mapper/pile/SettleOrderReportMapper.xml | 8 ++++++++ 5 files changed, 28 insertions(+), 5 deletions(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/SettleOrderReportMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/SettleOrderReportMapper.java index de39aae59..9a429e7c3 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/SettleOrderReportMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/SettleOrderReportMapper.java @@ -2,7 +2,6 @@ package com.jsowell.pile.mapper; import com.jsowell.pile.domain.SettleOrderReport; import com.jsowell.pile.dto.MerchantOrderReportDTO; -import com.jsowell.pile.vo.web.MerchantOrderReportVO; import com.jsowell.pile.vo.web.SettleOrderReportVO; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -71,4 +70,6 @@ public interface SettleOrderReportMapper { * @return */ List getMerchantOrderReport(@Param("dto") MerchantOrderReportDTO dto); + + SettleOrderReport selectByStationIdAndDate(@Param("stationId") String stationId, @Param("date") String date); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/ISettleOrderReportService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/ISettleOrderReportService.java index aef187e0a..3dc963f82 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/ISettleOrderReportService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/ISettleOrderReportService.java @@ -21,6 +21,8 @@ public interface ISettleOrderReportService { */ public SettleOrderReport selectSettleOrderReportById(Long id); + SettleOrderReport selectByStationIdAndDate(String stationId, String date); + /** * 查询结算订单报列表 * diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 46a59beb7..55ae0845a 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -2122,7 +2122,8 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { // 结算金额 totalSettleAmount = totalSettleAmount.add(new BigDecimal(vo.getSettleAmount())); } - // 保存到数据库 + + // 计算报表 SettleOrderReport settleOrderReport = new SettleOrderReport(); settleOrderReport.setMerchantId(stationInfo.getMerchantId()); settleOrderReport.setStationId(stationId); @@ -2138,7 +2139,15 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { BigDecimal tradeFee = totalSettleAmount.multiply(new BigDecimal("0.0055")); settleOrderReport.setTradeFee(tradeFee); settleOrderReport.setTradeAmount(totalSettleAmount.subtract(tradeFee)); - settleOrderReportService.insertSettleOrderReport(settleOrderReport); + + SettleOrderReport selectResult = settleOrderReportService.selectByStationIdAndDate(stationId, yesterday.toString()); + if (selectResult == null) { + settleOrderReportService.insertSettleOrderReport(settleOrderReport); + } else { + settleOrderReport.setId(selectResult.getId()); + settleOrderReportService.updateSettleOrderReport(settleOrderReport); + } + } /** diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java index deacdc517..bb5b829be 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java @@ -9,7 +9,6 @@ import com.jsowell.pile.domain.SettleOrderReport; import com.jsowell.pile.dto.MerchantOrderReportDTO; import com.jsowell.pile.mapper.SettleOrderReportMapper; import com.jsowell.pile.service.ISettleOrderReportService; -import com.jsowell.pile.vo.uniapp.MemberWalletLogVO; import com.jsowell.pile.vo.web.MerchantOrderReportVO; import com.jsowell.pile.vo.web.SettleOrderReportVO; import org.springframework.beans.factory.annotation.Autowired; @@ -19,7 +18,6 @@ import org.springframework.util.CollectionUtils; import java.math.BigDecimal; import java.util.Date; import java.util.List; -import java.util.Objects; /** * 结算订单报Service业务层处理 @@ -43,6 +41,11 @@ public class SettleOrderReportServiceImpl implements ISettleOrderReportService { return settleOrderReportMapper.selectSettleOrderReportById(id); } + @Override + public SettleOrderReport selectByStationIdAndDate(String stationId, String date) { + return settleOrderReportMapper.selectByStationIdAndDate(stationId, date); + } + /** * 查询结算订单报列表 * diff --git a/jsowell-pile/src/main/resources/mapper/pile/SettleOrderReportMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/SettleOrderReportMapper.xml index 939e1c791..210228de5 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/SettleOrderReportMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/SettleOrderReportMapper.xml @@ -153,4 +153,12 @@ and t1.trade_date #{dto.endTime,jdbcType=VARCHAR} + + \ No newline at end of file