`fix`

ruoyi-modules/ruoyi-dzbc/src/main/java/org/dromara/system/controller/CommonOtherController.java → ruoyi-modules/ruoyi-dzbc/src/main/java/org/dromara/system/controller/CommonDzbcOtherController.java

@@ -2,10 +2,12 @@ package org.dromara.system.controller;
 
 import cn.dev33.satoken.annotation.SaIgnore;
 import cn.hutool.json.JSONUtil;
+import com.dtflys.forest.annotation.Body;
 import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse;
 import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
 import com.github.binarywang.wxpay.bean.notify.WxPayRefundNotifyResult;
 import com.github.binarywang.wxpay.service.WxPayService;
+import io.undertow.servlet.spec.HttpServletRequestImpl;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
@@ -17,19 +19,23 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.system.domain.bo.TblDzbcBannerBo;
 import org.dromara.system.domain.bo.TblDzbcOrderBo;
+import org.dromara.system.domain.bo.TblDzbcStatisticsBo;
 import org.dromara.system.domain.vo.TblDzbcOrderVo;
 import org.dromara.system.service.ITblDzbcBannerService;
 import org.dromara.system.service.ITblDzbcOrderService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Deque;
+import java.util.Map;
+
 @Validated
 @RequiredArgsConstructor
 @RestController
 @SaIgnore
 @Slf4j
 @RequestMapping("/system/commonOther")
-public class CommonOtherController extends BaseController {
+public class CommonDzbcOtherController extends BaseController {
 
     private final ITblDzbcBannerService bannerService;
 
@@ -38,6 +44,8 @@ public class CommonOtherController extends BaseController {
 
 
 
+
+
     /**
      * 小程序banner列表
      */
@@ -124,6 +132,24 @@ public class CommonOtherController extends BaseController {
 
 
 
+    @ResponseBody
+    @Log(title = "定制班车-统计", businessType = BusinessType.UPDATE)
+    @RequestMapping("/static")
+    public R StaticAll(TblDzbcStatisticsBo bo) {
+        if(bo==null || bo.getKey()==null) return R.fail("参数存在问题");
+        String key = bo.getKey();
+        if(key.equals("order")){
+           try {
+               TblDzbcOrderBo bo1 = JSONUtil.toBean(JSONUtil.toJsonStr(bo.getProps()),TblDzbcOrderBo.class );
+               bo1.setParams(bo.getParams());
+               return R.ok(orderService.queryListByGroup(bo1));
+           }catch (Exception e){
+               return R.fail("参数存在问题");
+           }
+
+        }
+        return R.ok();
+    }
 
 
 }

ruoyi-modules/ruoyi-dzbc/src/main/java/org/dromara/system/controller/TblDzbcPathSchedulingController.java

@@ -5,6 +5,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 import cn.hutool.core.date.DateField;
+import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONObject;
@@ -15,8 +16,10 @@ import jakarta.validation.constraints.*;
 import org.dromara.common.redis.utils.RedisUtils;
 import org.dromara.system.domain.bo.TblDzbcSiteBo;
 import org.dromara.system.domain.vo.TblDzbcAreaVo;
+import org.dromara.system.domain.vo.TblDzbcPathVo;
 import org.dromara.system.domain.vo.TblDzbcSiteVo;
 import org.dromara.system.service.ITblDzbcAreaService;
+import org.dromara.system.service.ITblDzbcPathService;
 import org.dromara.system.service.ITblDzbcSiteService;
 import org.dromara.util.DistanceCalculator;
 import org.springframework.util.Assert;
@@ -49,6 +52,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 public class TblDzbcPathSchedulingController extends BaseController {
 
     private final ITblDzbcPathSchedulingService tblDzbcPathSchedulingService;
+    private final ITblDzbcPathService tblDzbcPathService;
     private final ITblDzbcSiteService tblDzbcSiteService;
     private final ITblDzbcAreaService tblDzbcAreaService;
 
@@ -194,9 +198,11 @@ public class TblDzbcPathSchedulingController extends BaseController {
                     }
                     catch (Exception e){
                         carTicket.setTicket(0);
+                        carTicket.setCarStatus("已售罄");
                     }
                 }else{
                     carTicket.setTicket(0);
+                    carTicket.setCarStatus("已售罄");
                 }
 
                 if(carTicket.getExt2() != null){
@@ -213,11 +219,42 @@ public class TblDzbcPathSchedulingController extends BaseController {
                             salszw.addAndGet(order.getInt("zw"));
                         } );
                         carTicket.setTicket(carTicket.getTicket() - salszw.get());
+                        if(carTicket.getTicket()<1){
+                            carTicket.setCarStatus("已售罄");
+                        }else{
+                            if(carTicket.getTicket()<4){
+                                carTicket.setCarStatus("余票紧张");
+                            }else{
+                                carTicket.setCarStatus("余票充足");
+                            }
+                        }
                     }
                     catch (Exception e){
                         carTicket.setTicket(0);
+                        carTicket.setCarStatus("已售罄");
                     }
+
                 }
+               try {
+                   //如果超出时间余票为0
+                   if(carTicket.getMtime()==null||carTicket.getMtime().equals("")){
+                       TblDzbcPathVo pathVo = tblDzbcPathService.queryById(carTicket.getPathId());
+                       if(pathVo != null){
+                           carTicket.setMtime(pathVo.getCostTime());
+                       }
+                   }
+                   if(carTicket.getMtime()!=null && !carTicket.getMtime().equals("")){
+                       Date datec =  DateUtil.parse(DateUtil.formatDate(carTicket.getMdate())+" "+carTicket.getMtime(), DatePattern.NORM_DATETIME_FORMAT);
+                       if(datec.getTime() < DateUtil.current()){
+                           carTicket.setTicket(0);
+                           carTicket.setCarStatus("已发车");
+                       }
+                   }
+               } catch (Exception e) {
+
+               }
+
+
             }
 
             return R.ok(carTickets);

ruoyi-modules/ruoyi-dzbc/src/main/java/org/dromara/system/domain/TblDzbcOrder.java

@@ -84,4 +84,6 @@ public class TblDzbcOrder extends BaseEntity {
     private Integer price;
     private Integer totalPrice;
 
+
+
 }

ruoyi-modules/ruoyi-dzbc/src/main/java/org/dromara/system/domain/TblDzbcPathScheduling.java

@@ -77,5 +77,7 @@ public class TblDzbcPathScheduling extends BaseEntity {
 
     private Integer  pprice;
 
+    private Integer  isauto;
+
 
 }

ruoyi-modules/ruoyi-dzbc/src/main/java/org/dromara/system/domain/bo/TblDzbcStatisticsBo.java

@@ -0,0 +1,13 @@
+package org.dromara.system.domain.bo;
+
+import lombok.Data;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Data
+public class TblDzbcStatisticsBo extends BaseEntity {
+    private String key;
+    private Map<String, Object> props = new HashMap<>();
+}

ruoyi-modules/ruoyi-dzbc/src/main/java/org/dromara/system/domain/vo/TblDzbcOrderVo.java

@@ -5,6 +5,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import org.mapstruct.Mapping;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -98,4 +99,6 @@ public class TblDzbcOrderVo implements Serializable {
     private TblDzbcPathSchedulingVo scheduling;
 
 
+
+
 }

ruoyi-modules/ruoyi-dzbc/src/main/java/org/dromara/system/domain/vo/TblDzbcPathSchedulingVo.java

@@ -102,5 +102,7 @@ public class TblDzbcPathSchedulingVo implements Serializable {
 
     private Integer  price;
 
+    private String carStatus;
+
 
 }

ruoyi-modules/ruoyi-dzbc/src/main/java/org/dromara/system/mapper/TblDzbcOrderMapper.java

@@ -1,9 +1,18 @@
 package org.dromara.system.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Param;
+import org.dromara.common.mybatis.annotation.DataColumn;
+import org.dromara.common.mybatis.annotation.DataPermission;
+import org.dromara.system.domain.SysUser;
 import org.dromara.system.domain.TblDzbcOrder;
+import org.dromara.system.domain.bo.TblDzbcOrderBo;
 import org.dromara.system.domain.vo.TblDzbcOrderVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
+import java.util.List;
+
 /**
  * 定制班车-订单Mapper接口
  *
@@ -12,4 +21,5 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
  */
 public interface TblDzbcOrderMapper extends BaseMapperPlus<TblDzbcOrder, TblDzbcOrderVo> {
 
+    List<TblDzbcOrderVo> queryListByGroup(TblDzbcOrderBo bo, @Param(Constants.WRAPPER) Wrapper<TblDzbcOrder> queryWrapper);
 }

ruoyi-modules/ruoyi-dzbc/src/main/java/org/dromara/system/service/ITblDzbcOrderService.java

@@ -35,6 +35,11 @@ public interface ITblDzbcOrderService {
     /**
      * 新增定制班车-订单
      */
+    List<TblDzbcOrderVo> queryListByGroup(TblDzbcOrderBo bo);
+
+    /**
+     * 新增定制班车-订单
+     */
     TblDzbcOrderBo insertByBo(TblDzbcOrderBo bo);
 
     /**

ruoyi-modules/ruoyi-dzbc/src/main/java/org/dromara/system/service/impl/TblDzbcCarServiceImpl.java

@@ -1,5 +1,6 @@
 package org.dromara.system.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -68,6 +69,9 @@ public class TblDzbcCarServiceImpl implements ITblDzbcCarService {
         lqw.eq(bo.getDriverId() != null, TblDzbcCar::getDriverId, bo.getDriverId());
         lqw.eq(StringUtils.isNotBlank(bo.getExt1()), TblDzbcCar::getExt1, bo.getExt1());
         lqw.eq(StringUtils.isNotBlank(bo.getExt2()), TblDzbcCar::getExt2, bo.getExt2());
+        if(params!=null && params.containsKey("mdate")){
+            lqw.apply(StrUtil.format("id in (select car_id from tbl_dzbc_path_scheduling where mdate >= '{}' )",params.get("mdate")));
+        }
         return lqw;
     }
 

ruoyi-modules/ruoyi-dzbc/src/main/java/org/dromara/system/service/impl/TblDzbcOrderServiceImpl.java

@@ -1,5 +1,7 @@
 package org.dromara.system.service.impl;
 
+import cn.hutool.core.date.DateField;
+import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.StrUtil;
@@ -7,6 +9,7 @@ import cn.hutool.cron.timingwheel.SystemTimer;
 import cn.hutool.cron.timingwheel.TimerTask;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.binarywang.wxpay.bean.request.BaseWxPayRequest;
 import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
 import com.github.binarywang.wxpay.service.WxPayService;
@@ -32,10 +35,8 @@ import org.dromara.system.domain.bo.TblDzbcOrderBo;
 import org.dromara.system.service.ITblDzbcOrderService;
 import org.springframework.util.Assert;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Collection;
+import java.text.DateFormat;
+import java.util.*;
 
 /**
  * 定制班车-订单Service业务层处理
@@ -79,7 +80,12 @@ public class TblDzbcOrderServiceImpl implements ITblDzbcOrderService {
             userMap.put(user.getUserId(), user);
         });
         result.getRecords().forEach(order -> {
-            order.setUserPhone(userMap.get(order.getUserId()).getUserName());
+            try {
+                order.setUserPhone(userMap.get(order.getUserId()).getUserName());
+            } catch (Exception e) {
+
+            }
+
         });
 
         return TableDataInfo.build(result);
@@ -94,6 +100,15 @@ public class TblDzbcOrderServiceImpl implements ITblDzbcOrderService {
         return baseMapper.selectVoList(lqw);
     }
 
+    @Override
+    public List<TblDzbcOrderVo> queryListByGroup(TblDzbcOrderBo bo) {
+        bo.getParams().put("orderByTime", "1");
+        LambdaQueryWrapper<TblDzbcOrder> lqw = buildQueryWrapper(bo);
+        return baseMapper.queryListByGroup(bo, lqw);
+    }
+
+
+
     private LambdaQueryWrapper<TblDzbcOrder> buildQueryWrapper(TblDzbcOrderBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<TblDzbcOrder> lqw = Wrappers.lambdaQuery();
@@ -106,7 +121,10 @@ public class TblDzbcOrderServiceImpl implements ITblDzbcOrderService {
         lqw.eq(StringUtils.isNotBlank(bo.getEndInfo()), TblDzbcOrder::getEndInfo, bo.getEndInfo());
         lqw.eq(StringUtils.isNotBlank(bo.getExt1()), TblDzbcOrder::getExt1, bo.getExt1());
         lqw.eq(StringUtils.isNotBlank(bo.getExt2()), TblDzbcOrder::getExt2, bo.getExt2());
-        lqw.orderBy(true, false,TblDzbcOrder::getCreateTime);
+
+        if(params==null||params.get("orderByTime") == null){
+            lqw.orderBy(true, false,TblDzbcOrder::getCreateTime);
+        }
         if(params!=null && params.containsKey("kyzId")){
             String datasql = "( select id from tbl_dzbc_car where kyz_id = "+bo.getParams().get("kyzId").toString()+")";
             lqw.apply(StringUtils.format(" scheduling_id in {}", datasql));
@@ -115,6 +133,7 @@ public class TblDzbcOrderServiceImpl implements ITblDzbcOrderService {
         return lqw;
     }
 
+
     /**
      * 新增定制班车-订单
      */
@@ -134,6 +153,11 @@ public class TblDzbcOrderServiceImpl implements ITblDzbcOrderService {
         if(bo.getParams().get("usersInfo")==null){
             bo.getParams().put("usersInfo",new Object[]{});
         }
+        if(scheduling.getMtime()==null || scheduling.getMtime().equals("")){
+            scheduling.setMtime(pathVo.getMtime());
+        }
+        Date datec =  DateUtil.parse(DateUtil.formatDate(scheduling.getMdate())+" "+scheduling.getMtime(), DatePattern.NORM_DATETIME_FORMAT);
+        Assert.isTrue( datec.getTime() > DateUtil.current(),"路线车辆已出发");
 
         Assert.isTrue(bo.getParams().get("startSiteId")!=null,"缺少出发站点");
         Assert.isTrue(bo.getParams().get("endSiteId")!=null,"缺少目的站点");

ruoyi-modules/ruoyi-dzbc/src/main/java/org/dromara/system/service/impl/TblDzbcPathSchedulingServiceImpl.java

@@ -88,6 +88,7 @@ public class TblDzbcPathSchedulingServiceImpl implements ITblDzbcPathSchedulingS
         lqw.eq(bo.getPathId() != null, TblDzbcPathScheduling::getPathId, bo.getPathId());
         lqw.eq(bo.getCarId() != null, TblDzbcPathScheduling::getCarId, bo.getCarId());
         lqw.eq(bo.getMdate() != null, TblDzbcPathScheduling::getMdate, bo.getMdate());
+        lqw.eq(bo.getIsauto() != null, TblDzbcPathScheduling::getIsauto, bo.getIsauto());
         lqw.eq(StringUtils.isNotBlank(bo.getMtime()), TblDzbcPathScheduling::getMtime, bo.getMtime());
         lqw.eq(StringUtils.isNotBlank(bo.getStartSites()), TblDzbcPathScheduling::getStartSites, bo.getStartSites());
         lqw.eq(StringUtils.isNotBlank(bo.getEndSites()), TblDzbcPathScheduling::getEndSites, bo.getEndSites());
@@ -100,7 +101,9 @@ public class TblDzbcPathSchedulingServiceImpl implements ITblDzbcPathSchedulingS
             if(params.containsKey("carId")){
                 lqw.apply(StringUtils.format(" ext1->'$.carInfo.id' = {}", params.get("carId").toString()));
             }
+
         }
+
         return lqw;
     }
 

ruoyi-modules/ruoyi-dzbc/src/main/java/org/dromara/system/service/impl/TblDzbcPathServiceImpl.java

@@ -1,5 +1,6 @@
 package org.dromara.system.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -71,6 +72,9 @@ public class TblDzbcPathServiceImpl implements ITblDzbcPathService {
             if(params.containsKey("recommend")){
                 lqw.apply(StringUtils.format(" ext1->'$.recommend' = {}", params.get("recommend").toString()));
             }
+            if( params.containsKey("mdate")){
+                lqw.apply(StrUtil.format("id in (select path_id from tbl_dzbc_path_scheduling where mdate >= '{}' )",params.get("mdate")));
+            }
         }
         return lqw;
     }

ruoyi-modules/ruoyi-dzbc/src/main/resources/mapper/system/TblDzbcOrderMapper.xml

@@ -4,4 +4,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.system.mapper.TblDzbcOrderMapper">
 
+    <select id="queryListByGroup" resultType="org.dromara.system.domain.vo.TblDzbcOrderVo"
+            parameterType="org.dromara.system.domain.bo.TblDzbcOrderBo">
+       select a.num , a.cdate as create_time from  ( select  count(*) as num, date_format(create_time,'%Y-%m-%d') as cdate from tbl_dzbc_order  ${ew.getCustomSqlSegment} group by cdate) a
+    </select>
 </mapper>