From ad60725942fc475197c8deb9cbca1be8cf49203a Mon Sep 17 00:00:00 2001 From: 18650502300 <18650502300@163.com> Date: Sat, 27 Jul 2024 23:03:47 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/SysDeptController.java | 42 +++++++++++++++++-- .../service/impl/EtOrderServiceImpl.java | 15 ++++--- 2 files changed, 45 insertions(+), 12 deletions(-) diff --git a/electripper-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java index ac77253..1f5af32 100644 --- a/electripper-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java +++ b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java @@ -8,15 +8,13 @@ import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.entity.SysDept; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.domain.EtAreaDept; import com.ruoyi.system.mapper.EtAreaDeptMapper; +import com.ruoyi.system.mapper.EtCapitalFlowMapper; import com.ruoyi.system.mapper.EtOperatingAreaMapper; -import com.ruoyi.system.mapper.SysUserMapper; +import com.ruoyi.system.mapper.EtOrderMapper; import com.ruoyi.system.service.IEtOperatingAreaService; import com.ruoyi.system.service.ISysDeptService; import org.apache.commons.lang3.ArrayUtils; @@ -26,6 +24,9 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.math.BigDecimal; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.List; /** @@ -49,6 +50,12 @@ public class SysDeptController extends BaseController @Resource private EtOperatingAreaMapper etOperatingAreaMapper; + @Resource + private EtOrderMapper etOrderMapper; + + @Resource + private EtCapitalFlowMapper etCapitalFlowMapper; + /** * 获取运营商列表 @@ -196,6 +203,29 @@ public class SysDeptController extends BaseController } AjaxResult ajax = AjaxResult.success(); SysDept sysDept = deptService.selectDeptById(deptId); + + // 获取今天的日期字符串 + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + String startDateStr = dateFormat.format(new Date()) + " 00:00:00"; + String endDateStr = dateFormat.format(new Date()) + " 23:59:59"; + + //今日订单金额 + BigDecimal todayOrderAmount = BigDecimal.ZERO; + List longs = etOperatingAreaMapper.selectAreaListByDeptId(deptId); + for (Long areaId:longs) { + BigDecimal payFee = defaultIfNull(etOrderMapper.getPayFee(startDateStr, endDateStr, null, areaId), BigDecimal.ZERO);//新增 + BigDecimal refundFee = defaultIfNull(etOrderMapper.getRefundFee(startDateStr, endDateStr, null, areaId), BigDecimal.ZERO);//退款 + BigDecimal serviceFee = etCapitalFlowMapper.getHandlingFee(startDateStr, endDateStr, null, areaId);//手续费,扣除掉退款部分的 + BigDecimal platformServiceFee = etCapitalFlowMapper.getServiceFee(startDateStr, endDateStr, null,areaId);//平台服务费 ,扣除掉退款部分的 + BigDecimal areaOrderAmount = defaultIfNull(payFee.subtract(serviceFee).subtract(refundFee).subtract(platformServiceFee), BigDecimal.ZERO);//营收 = 新增 - 手续费 - 退款 - 平台服务费 + if (areaOrderAmount != null) { + todayOrderAmount = todayOrderAmount.add(areaOrderAmount); + } + } + // 更新 sysDept 的余额字段 + if (sysDept.getBalance() != null) { + sysDept.setBalance(sysDept.getBalance().subtract(todayOrderAmount)); + } ajax.put(AjaxResult.DATA_TAG, sysDept); return ajax; } @@ -211,4 +241,8 @@ public class SysDeptController extends BaseController return toAjax(deptService.bandAppUser(dept)); } + private BigDecimal defaultIfNull(BigDecimal value, BigDecimal defaultValue) { + return value != null ? value : defaultValue; + } + } diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java index 16883a2..80ac1f6 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java @@ -646,7 +646,7 @@ public class EtOrderServiceImpl implements IEtOrderService String formattedDate = dateFormat.format(calendar.getTime()); String startDateStr = formattedDate + " " + Constants.DATE_FORMAT_START_PEREND; String endDateStr = formattedDate + " " + Constants.DATE_FORMAT_END_PEREND; - IndexVo.OrderFeeStatisticsVo todayOrderInfo = getOrderFeeStatistics(startDateStr, endDateStr, areaId,sysDept); + IndexVo.OrderFeeStatisticsVo todayOrderInfo = getOrderFeeStatistics(startDateStr, endDateStr, areaId); log.info("【首页统计】营收统计----------todayOrderInfo: {}" , JSON.toJSON(todayOrderInfo)); IndexVo.IncomeVo incomeVo = new IndexVo.IncomeVo(); incomeVo.setDay(formattedDate); @@ -694,12 +694,12 @@ public class EtOrderServiceImpl implements IEtOrderService indexVo.setWithdraw(defaultIfNull(withdrawFee, BigDecimal.ZERO));//已提现 indexVo.setSettlementAmount(defaultIfNull(applyFee, BigDecimal.ZERO));//待结算金额 - IndexVo.OrderFeeStatisticsVo todayOrderInfo = getOrderFeeStatistics(startDateStr, endDateStr, areaId,sysDept); + IndexVo.OrderFeeStatisticsVo todayOrderInfo = getOrderFeeStatistics(startDateStr, endDateStr, areaId); indexVo.setTodayIncome(todayOrderInfo.getIncomeFee());//今日营收 indexVo.setTodayOrderFee(todayOrderInfo.getOrderFee());//今日订单金额 indexVo.setTodayOrderCount(todayOrderInfo.getOrderCount());//今日订单数 - IndexVo.OrderFeeStatisticsVo totalOrderInfo = getOrderFeeStatistics(null, null, areaId,sysDept); + IndexVo.OrderFeeStatisticsVo totalOrderInfo = getOrderFeeStatistics(null, null, areaId); indexVo.setTotalIncome(totalOrderInfo.getIncomeFee());//总营收 indexVo.setTotalOrderFee(totalOrderInfo.getOrderFee());//总订单金额 indexVo.setTotalOrderCount(totalOrderInfo.getOrderCount());//总订单数 @@ -716,14 +716,13 @@ public class EtOrderServiceImpl implements IEtOrderService /** * 订单信息统计 */ - private IndexVo.OrderFeeStatisticsVo getOrderFeeStatistics(String startDateStr, String endDateStr, Long areaId,SysDept sysDept) { + private IndexVo.OrderFeeStatisticsVo getOrderFeeStatistics(String startDateStr, String endDateStr, Long areaId) { IndexVo.OrderFeeStatisticsVo feeStatisticsVo = new IndexVo.OrderFeeStatisticsVo(); - String handlingCharge = sysDept.getHandlingCharge(); BigDecimal payFee = defaultIfNull(etOrderMapper.getPayFee(startDateStr, endDateStr, null, areaId), BigDecimal.ZERO);//新增 BigDecimal refundFee = defaultIfNull(etOrderMapper.getRefundFee(startDateStr, endDateStr, null, areaId), BigDecimal.ZERO);//退款 - BigDecimal divide = new BigDecimal(handlingCharge).divide(new BigDecimal(1000), 4, RoundingMode.HALF_UP); - BigDecimal serviceFee = payFee.multiply(divide).setScale(2, RoundingMode.HALF_UP);//手续费 - BigDecimal incomeFee = defaultIfNull(payFee.subtract(serviceFee).subtract(refundFee), BigDecimal.ZERO);//营收 = 支付金额 - 手续费 - 退款金额 + BigDecimal serviceFee = etCapitalFlowMapper.getHandlingFee(startDateStr, endDateStr, null, areaId);//手续费,扣除掉退款部分的 + BigDecimal platformServiceFee = etCapitalFlowMapper.getServiceFee(startDateStr, endDateStr, null,areaId);//平台服务费 ,扣除掉退款部分的 + BigDecimal incomeFee = defaultIfNull(payFee.subtract(serviceFee).subtract(refundFee).subtract(platformServiceFee), BigDecimal.ZERO);//营收 = 新增 - 手续费 - 退款 - 平台服务费 int orderCount = etOrderMapper.getOrderNum(startDateStr, endDateStr, areaId); feeStatisticsVo.setOrderFee(payFee); feeStatisticsVo.setIncomeFee(incomeFee);