`fix`

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

@@ -11,7 +11,7 @@ import lombok.Data;
 import java.io.Serial;
 import java.io.Serializable;
 import java.util.Date;
-
+import java.util.List;
 
 
 /**
@@ -76,5 +76,7 @@ public class TblDzbcAreaVo implements Serializable {
     @ExcelProperty(value = "扩展2")
     private String ext2;
 
+    private List<TblDzbcSiteVo>  sites;
+
 
 }

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

@@ -71,4 +71,5 @@ public class TblDzbcBannerVo implements Serializable {
     private String ext2;
 
 
+    private Date createTime;
 }

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

@@ -8,6 +8,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
+import org.dromara.system.domain.TblDzbcSite;
+import org.dromara.system.domain.vo.TblDzbcSiteVo;
+import org.dromara.system.mapper.TblDzbcSiteMapper;
 import org.springframework.stereotype.Service;
 import org.dromara.system.domain.bo.TblDzbcAreaBo;
 import org.dromara.system.domain.vo.TblDzbcAreaVo;
@@ -15,6 +18,7 @@ import org.dromara.system.domain.TblDzbcArea;
 import org.dromara.system.mapper.TblDzbcAreaMapper;
 import org.dromara.system.service.ITblDzbcAreaService;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
@@ -31,6 +35,8 @@ public class TblDzbcAreaServiceImpl implements ITblDzbcAreaService {
 
     private final TblDzbcAreaMapper baseMapper;
 
+    private final TblDzbcSiteMapper siteMapper;
+
     /**
      * 查询定制班车-区域
      */
@@ -46,6 +52,17 @@ public class TblDzbcAreaServiceImpl implements ITblDzbcAreaService {
     public TableDataInfo<TblDzbcAreaVo> queryPageList(TblDzbcAreaBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<TblDzbcArea> lqw = buildQueryWrapper(bo);
         Page<TblDzbcAreaVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+
+        List<TblDzbcSiteVo>   selectList =  siteMapper.selectVoList();
+        result.getRecords().forEach(areaVo -> {
+            try{
+                areaVo.setSites(selectList.stream().filter(siteVo -> siteVo.getAreaId().equals(areaVo.getId())).toList());
+            } catch (Exception e) {
+                areaVo.setSites(new ArrayList<>());
+            }
+
+        });
+
         return TableDataInfo.build(result);
     }
 

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

@@ -147,8 +147,10 @@ public class TblDzbcOrderServiceImpl implements ITblDzbcOrderService {
         add.setTotalPrice(add.getNum()*add.getPrice());
 
         bo.getParams().put("zw",add.getNum());
-        add.setExt1(JSONUtil.toJsonStr(bo.getParams()));
+        add.setExt1(JSONUtil.toJsonStr(Map.of("zw", add.getNum(),"usersInfo",bo.getParams().get("usersInfo"),"startSiteId",bo.getParams().get("startSiteId"),"endSiteId",bo.getParams().get("endSiteId"))));
 
+        scheduling.setStartSites(null);
+        scheduling.setEndSites(null);
         add.setExt2(JSONUtil.toJsonStr(Map.of("schedulInfo", scheduling)));
 
         boolean flag = baseMapper.insert(add) > 0;
@@ -194,6 +196,7 @@ public class TblDzbcOrderServiceImpl implements ITblDzbcOrderService {
                     if(entity!=null){
                         TblDzbcOrderBo bo1 = new TblDzbcOrderBo();
                         bo1.setSchedulingId(entity.getSchedulingId());
+                        bo1.setStatus("1");
                         List<TblDzbcOrderVo> list = queryList(bo1);
                         //查出所有订单的startInfo和endInfo
                         //{"areaInfo": {"id": 1889580334985953281, "addr": "ss", "ext1": "{}", "ext2": "{}", "name": "松罗", "kyzId": 1889579208173600769, "remark": "nulla deserunt minim tempor", "location": "119.61157136502725,27.179696949640462"}, "siteInfo": {"id": 1889579608918376450, "addr": "是多少", "ext1": "{}", "ext2": "{}", "name": "万达公交站", "areaId": 1889580334985953281, "remark": "ut nulla sint", "location": "119.70444636953097,27.142621940313745"}}
@@ -244,7 +247,6 @@ public class TblDzbcOrderServiceImpl implements ITblDzbcOrderService {
                 }
             });
 
-
         }
 
 
@@ -281,10 +283,9 @@ public class TblDzbcOrderServiceImpl implements ITblDzbcOrderService {
         List<TblDzbcOrder>  list = baseMapper.selectList(buildQueryWrapper(bo));
         for (TblDzbcOrder tblDzbcOrder : list) {
             if(System.currentTimeMillis()-tblDzbcOrder.getCreateTime().getTime()>=1000*60*30){
-                tblDzbcOrder.setStatus("2");
                 TblDzbcOrderBo bo1 = new TblDzbcOrderBo();
                 bo1.setId(tblDzbcOrder.getId());
-                bo1.setStatus("2");
+                bo1.setStatus("5");
                 updateByBo(bo1);
             }else{
                 SystemTimer timer = new SystemTimer();
@@ -292,7 +293,7 @@ public class TblDzbcOrderServiceImpl implements ITblDzbcOrderService {
                 timer.addTask(new TimerTask(()->{
                     TblDzbcOrderBo bo1 = new TblDzbcOrderBo();
                     bo1.setId(tblDzbcOrder.getId());
-                    bo1.setStatus("2");
+                    bo1.setStatus("5");
                     updateByBo(bo1);
                 },1000*60*30-(System.currentTimeMillis()-tblDzbcOrder.getCreateTime().getTime())));
             }

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

@@ -5,6 +5,7 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
+import org.dromara.common.core.service.OssService;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -50,6 +51,7 @@ public class TblDzbcPathSchedulingServiceImpl implements ITblDzbcPathSchedulingS
     private final TblDzbcPathMapper pathMapper;
 
     private final SysUserMapper userMapper;
+    private final OssService ossService;
 
     /**
      * 查询定制班车-路线排班
@@ -122,7 +124,9 @@ public class TblDzbcPathSchedulingServiceImpl implements ITblDzbcPathSchedulingS
             userVo1.setPhonenumber(userVo.getPhonenumber());
             userVo1.setEmail(userVo.getEmail());
             userVo1.setSex(userVo.getSex());
-            userVo1.setAvatar(userVo.getAvatar());
+            if(userVo.getAvatar()!=null){
+                userVo1.setAvatarUrl(ossService.selectUrlByIds(userVo.getAvatar().toString()));
+            }
             params.put("driverInfo",userVo1);
             params.put("carInfo",carVo);
         }

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

@@ -81,6 +81,8 @@ public class SysUserVo implements Serializable {
     @Translation(type = TransConstant.OSS_ID_TO_URL)
     private Long avatar;
 
+    private String avatarUrl;
+
     /**
      * 密码
      */