代码调整

yanghb

2023-04-21 0481353111afb43a2322e18530dde26f1d841ead

 ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java

@@ -12,6 +12,7 @@
import com.stylefeng.guns.modular.system.util.DateUtil;
import com.stylefeng.guns.modular.system.util.RedisUtil;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.sun.org.apache.regexp.internal.RE;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -43,9 +44,6 @@
    private ITCarService tCarService;

    @Autowired
    private ITTaxiCardService taxiCardService;

    @Autowired
    private RedisUtil redisUtil;

    @Autowired
@@ -74,6 +72,7 @@

    @Autowired
    private IDriverOnlineService driverOnlineService;


    @RequestMapping("/openNetCarInfo")
    public Object openNetCarInfo(Integer id, Model model){
@@ -165,7 +164,7 @@
            zcTodayTme.eq("companyId", companyId);
        }
        int zcTodayNum = itOrderPrivateCarService.selectCount(zcTodayTme);
        map1.put("orderDetail1", zcTodayNum);  //快车订单
        map1.put("orderDetail1", zcTodayNum);  //专车订单

        Wrapper<TOrderCrossCity> kcTodayTme = new EntityWrapper<TOrderCrossCity>().between("travelTime", calendar1.getTime(), calendar2.getTime());
        if(companyId != null){
@@ -220,11 +219,8 @@

        Double allTradeMoney = tOrderTaxiService.getAllTradeMoney(companyId, null, null);
        Double allIncomeMoney = tOrderTaxiService.getAllIncomeMoney(companyId, null, null);

        ///   购买打车卡产生的收益
        double allCardMoney = taxiCardService.AllCardMoney(ShiroKit.getUser().getObjectId());
        map1.put("paiceSum", allTradeMoney + allCardMoney);  //交易总金额
        map1.put("paySum", allIncomeMoney + allCardMoney);  //总收益
        map1.put("paiceSum", allTradeMoney);  //交易总金额
        map1.put("paySum", allIncomeMoney);  //总收益
        map.put("operationSum", map1);

        //【运营数据增长查询】
@@ -248,7 +244,7 @@
            zcTodayTmeByConditions.eq("companyId", companyId);
        }
        int zcTodayNum1 = itOrderPrivateCarService.selectCount(zcTodayTmeByConditions);
        map1.put("orderDetail1", zcTodayNum1);  //快车订单
        map1.put("orderDetail1", zcTodayNum1);  //专车订单

        Wrapper<TOrderTaxi> travelTime2 = new EntityWrapper<TOrderTaxi>().between("travelTime", calendar3.getTime(), calendar4.getTime());
        if(companyId != null){
@@ -335,7 +331,7 @@
            Integer allOrderNum = tOrderTaxiService.getAllOrderNum(companyId, startTime1, endTime1);
            m3.add(allOrderNum);

            //快车订单趋势图
            //专车订单趋势图
            Wrapper<TOrderPrivateCar> inZC = new EntityWrapper<TOrderPrivateCar>().between("travelTime", s1.getTime(), e1.getTime()).in("state", states);
            if(companyId != null){
                inZC.eq("companyId", companyId);
@@ -373,7 +369,7 @@
        map1.put("orderDetail5", m7);  //跨城物流订单数趋势图
        map1.put("orderDetail4", m6);  //同城物流订单数趋势图
        map1.put("orderDetail3", m5);  //跨城订单数趋势图
        map1.put("orderDetail1", m4);  //快车订单数趋势图
        map1.put("orderDetail1", m4);  //专车订单数趋势图
        map1.put("orderDetailSum", m3);  //全部订单数趋势图
        map1.put("passengerInfoSum", m2);  //用户注册趋势图
        map1.put("orderDetail2", m1);  //出租车订单趋势图