超省司机2.0

liujie

2023-08-10 9b79a69c09d56a8cd9b8155b2910cb4546758a9d

 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/RevenueServiceImpl.java

@@ -4,11 +4,9 @@
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.AccountChangeDetailMapper;
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.model.*;
import com.supersavedriving.driver.modular.system.service.IAppUserService;
import com.supersavedriving.driver.modular.system.service.IDriverService;
import com.supersavedriving.driver.modular.system.service.IOrderService;
@@ -18,6 +16,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;

@@ -38,6 +37,9 @@
    @Autowired
    private IDriverService driverService;

    @Resource
    private AccountChangeDetailMapper accountChangeDetailMapper;




@@ -53,20 +55,34 @@
     * @throws Exception
     */
    @Override
    public List<CommissionListWarpper> queryCommissionList(Integer driverId, String time, Integer pageNum, Integer pageSize) throws Exception {
    public List<CommissionListWarpper> queryCommissionList(Integer driverId, String time, Integer pageNum, Integer pageSize,Integer type) throws Exception {
        pageNum = (pageNum - 1) * pageSize;
        Wrapper<Revenue> wrapper = new EntityWrapper<Revenue>().eq("userType", 2)
                .eq("userId", driverId);
        ArrayList<Integer> objects = new ArrayList<>();
        objects.add(1);
        objects.add(4);
        objects.add(5);
        objects.add(7);
        Wrapper<AccountChangeDetail> wrapper = new EntityWrapper<AccountChangeDetail>().eq("userType", 2)
                .eq("userId", driverId).eq("type",1).in("changeType",objects);
        if(ToolUtil.isNotEmpty(type)){
            wrapper.eq("changeType",type);
        }
        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<AccountChangeDetail> revenues = accountChangeDetailMapper.selectList(wrapper.last(" order by createTime desc limit " + pageNum + ", " + pageSize));
        List<CommissionListWarpper> list = new ArrayList<>();
        for (Revenue revenue : revenues) {
        for (AccountChangeDetail revenue : revenues) {
            CommissionListWarpper commissionListWarpper = new CommissionListWarpper();
            commissionListWarpper.setCreateTime(revenue.getCreateTime().getTime());
            commissionListWarpper.setAmount(revenue.getAmount());
            commissionListWarpper.setUserType(revenue.getType());
            commissionListWarpper.setUserType(revenue.getChangeType());
            commissionListWarpper.setMoney(revenue.getOldData());
            if(revenue.getChangeType()==4){
                commissionListWarpper.setAmount(revenue.getNewData()-revenue.getOldData());
            }else {
                commissionListWarpper.setAmount(revenue.getOldData()-revenue.getNewData());
            }

            list.add(commissionListWarpper);
        }
        return list;