From c0f0b2825ed3dbef86b381c2490277164446dc10 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期六, 18 三月 2023 17:28:01 +0800 Subject: [PATCH] 新增加司机端接口 --- driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/RevenueServiceImpl.java | 69 ++++++++++++++++++++++++++++++++++ 1 files changed, 69 insertions(+), 0 deletions(-) diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/RevenueServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/RevenueServiceImpl.java index 3590285..3911b70 100644 --- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/RevenueServiceImpl.java +++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/RevenueServiceImpl.java @@ -1,10 +1,24 @@ package com.supersavedriving.driver.modular.system.service.impl; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.mapper.Wrapper; import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.supersavedriving.driver.core.util.ToolUtil; import com.supersavedriving.driver.modular.system.dao.RevenueMapper; +import com.supersavedriving.driver.modular.system.model.AppUser; +import com.supersavedriving.driver.modular.system.model.Driver; +import com.supersavedriving.driver.modular.system.model.Order; import com.supersavedriving.driver.modular.system.model.Revenue; +import com.supersavedriving.driver.modular.system.service.IAppUserService; +import com.supersavedriving.driver.modular.system.service.IDriverService; +import com.supersavedriving.driver.modular.system.service.IOrderService; import com.supersavedriving.driver.modular.system.service.IRevenueService; +import com.supersavedriving.driver.modular.system.warpper.CommissionListWarpper; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; /** * 收入记录 @@ -13,4 +27,59 @@ */ @Service public class RevenueServiceImpl extends ServiceImpl<RevenueMapper, Revenue> implements IRevenueService { + + @Autowired + private IOrderService orderService; + + @Autowired + private IAppUserService appUserService; + + @Autowired + private IDriverService driverService; + + + + + + + /** + * 获取司机佣金记录 + * @param driverId + * @param time + * @param pageNum + * @param pageSize + * @return + * @throws Exception + */ + @Override + public List<CommissionListWarpper> queryCommissionList(Integer driverId, String time, Integer pageNum, Integer pageSize) throws Exception { + pageNum = (pageNum - 1) * pageSize; + Wrapper<Revenue> wrapper = new EntityWrapper<Revenue>().eq("type", 2).eq("userType", 2) + .eq("userId", driverId); + if(ToolUtil.isNotEmpty(time)){ + wrapper.eq("DATE_FORMAT(createTime, '%Y年%m月')", time); + } + List<Revenue> revenues = this.selectList(wrapper.last(" order by createTime desc limit " + pageNum + ", " + pageSize)); + List<CommissionListWarpper> list = new ArrayList<>(); + for (Revenue revenue : revenues) { + CommissionListWarpper commissionListWarpper = new CommissionListWarpper(); + commissionListWarpper.setCreateTime(revenue.getCreateTime().getTime()); + commissionListWarpper.setAmount(revenue.getAmount()); + Order order = orderService.selectById(revenue.getOrderId()); + if(null != order.getUserId()){ + AppUser appUser = appUserService.selectById(order.getUserId()); + if(null != appUser.getInviterType() && appUser.getInviterType() == 2 && appUser.getInviterId().compareTo(driverId) == 0){ + commissionListWarpper.setUserType(1); + } + } + if(null == commissionListWarpper.getUserType()){ + Driver driver = driverService.selectById(order.getDriverId()); + if(null != driver.getInviterType() && driver.getInviterType() == 2 && driver.getInviterId().compareTo(driverId) == 0){ + commissionListWarpper.setUserType(2); + } + } + list.add(commissionListWarpper); + } + return list; + } } -- Gitblit v1.7.1