Merge branch 'dev' of http://61.169.120.202:8888/youxiw20000/trash into

dev # Conflicts: # trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java

Merge branch 'dev' of http://61.169.120.202:8888/youxiw20000/trash into
dev # Conflicts: # trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
youxiw2000
2 parents ca15ec7c bbf81559
Showing 15 changed files with 433 additions and 30 deletions
trash-garbage/src/main/java/com/trash/garbage/controller/GarbageOrderController.java
trash-garbage/src/main/java/com/trash/garbage/mapper/GarOrderCarMapper.java
trash-garbage/src/main/java/com/trash/garbage/mapper/GarOrderMapper.java
trash-garbage/src/main/java/com/trash/garbage/mapper/GarOrderMatchAskMapper.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/DriverSend.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrder.java
trash-garbage/src/main/java/com/trash/garbage/service/GarOrderMatchAskService.java
trash-garbage/src/main/java/com/trash/garbage/service/GarOrderService.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderMatchAskServiceImpl.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarUserServiceImpl.java
trash-garbage/src/main/resources/mapper/GarOrderCarMapper.xml
trash-garbage/src/main/resources/mapper/GarOrderMapper.xml
trash-garbage/src/main/resources/mapper/GarOrderMatchAskMapper.xml
trash-garbage/src/main/resources/mapper/GarOrderMatchHandlerMapper.xml
@@ -15,6 +15,7 @@ import com.trash.common.core.domain.model.LoginUser;
 import com.trash.common.core.page.PageDomain;
 import com.trash.common.core.page.TableSupport;
 import com.trash.common.enums.BusinessType;
+import com.trash.common.utils.SecurityUtils;
 import com.trash.common.utils.ServletUtils;
 import com.trash.common.utils.StringUtils;
 import com.trash.common.utils.file.FileUploadUtils;
@@ -27,6 +28,7 @@ import com.trash.framework.web.service.TokenService;
 import com.trash.garbage.custom.BizException;
 import com.trash.garbage.global.Result;
 import com.trash.garbage.global.ResultCode;
+import com.trash.garbage.pojo.domain.DriverSend;
 import com.trash.garbage.pojo.domain.GarOrder;
 import com.trash.garbage.pojo.domain.GarOrderMatchAsk;
 import com.trash.garbage.pojo.domain.GarOrderMatchDisposal;
@@ -167,6 +169,46 @@ public class GarbageOrderController {
         return Result.OK(garOrderMatchAskService.queryGarOrderMatchAsk(orderId));
     }
+    @GetMapping("/queryGarOrderMatchAsks/{orderId}")
+    public Result<Integer> queryGarOrderMatchAsks(@PathVariable String orderId) {
+        return Result.OK(garOrderMatchAskService.queryGarOrderMatchAsks(orderId));
+    }
+
+    @GetMapping("/queryErrType")
+    public Result<Integer> queryErrType() {
+        String phone = SecurityUtils.getLoginUser().getUser().getPhonenumber();
+        return Result.OK(garOrderMatchAskService.queryErrType(phone));
+    }
+
+    @GetMapping("/queryCarCode")
+    public Result<List<GarOrderMatchAsk>> queryCarCode(@RequestParam String orderId) {
+        return Result.OK(garOrderMatchAskService.queryCarCode(orderId));
+    }
+
+    @PostMapping("/sendToDriver")
+    public Result<Integer> sendToDriver(@RequestBody DriverSend driverSend) {
+        String phone = SecurityUtils.getLoginUser().getUser().getPhonenumber();
+        driverSend.setPhone(phone);
+        driverSend.setState("0");
+        return Result.OK(garOrderMatchAskService.addDriverSend(driverSend));
+    }
+
+    @PostMapping("/updateDriverSend")
+    public Result<Integer> updateDriverSend(@RequestBody DriverSend driverSend) {
+        String phone = SecurityUtils.getLoginUser().getUser().getPhonenumber();
+        driverSend.setPhone(phone);
+        driverSend.setState("1");
+        return Result.OK(garOrderMatchAskService.updateDriverSendState(driverSend));
+    }
+
+    @GetMapping("/queryDriverSend")
+    public Result<DriverSend> queryDriverSend() {
+        String phone = SecurityUtils.getLoginUser().getUser().getPhonenumber();
+        return Result.OK(garOrderMatchAskService.queryDriverSend(phone));
+    }
+
+
+
     @GetMapping("/querySiteByTel")
     public Result<List<SiteInfoDTO>> querySiteByTel() {
         // 获取登录用户手机号
@@ -205,6 +247,15 @@ public class GarbageOrderController {
         return Result.OK(garOrderService.queryDispatch(orderId));
     }
+    @GetMapping("/updateGarRealCarCount")
+    public Result<?> updateGarRealCarCount(@RequestParam("orderId") String orderId,@RequestParam("garRealCarCount")Integer garRealCarCount) {
+        return Result.OK(garOrderService.updateGarRealCarCount(orderId, garRealCarCount));
+    }
+
+    @GetMapping("/getGarOrderMatchHandlers")
+    public Result<?> getGarOrderMatchHandlers(@RequestParam("orderId") String orderId) {
+        return Result.OK(garOrderService.getGarOrderMatchHandlers(orderId));
+    }
     @GetMapping("/queryDispatch/dss/{orderId}")
     public Result<?> queryDispatchDss(@PathVariable("orderId") String orderId) {
@@ -10,7 +10,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * @Entity com.trash.garbage.pojo.domain.GarOrderCar
 */
 public interface GarOrderCarMapper extends BaseMapper<GarOrderCar> {
-
+    GarOrderCar selectByGarOrderId(String garOrderId);
+    int insertSelective(GarOrderCar garOrderCar);
 }
@@ -46,6 +46,10 @@ public interface GarOrderMapper extends BaseMapper&lt;GarOrder&gt; {
     List<DockingQRCodeEntity> queryReportByCarCode(@Param("carCode") String carCode,@Param("dateStr") String dateStr);
     int queryGarRealCarCountByGarOrderId(@Param("garOrderId") String garOrderId);
+
+    int updateGarRealCarCount(@Param("garOrderId") String garOrderId,@Param("garRealCarCount") Integer garRealCarCount);
+
+    int queryGarNowCarCount(@Param("garOrderId") String garOrderId);
 }
@@ -2,8 +2,7 @@ package com.trash.garbage.mapper;
 import com.trash.garbage.pojo.domain.GarOrderMatchAsk;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.trash.garbage.pojo.vo.DispatchDisposalVo;
-import org.apache.ibatis.annotations.Param;
+import com.trash.garbage.pojo.domain.DriverSend;
 import java.util.List;
@@ -64,6 +63,20 @@ public interface GarOrderMatchAskMapper extends BaseMapper&lt;GarOrderMatchAsk&gt; {
     int deleteGarOrderMatchAskByIds(String[] garIds);
     int queryGarOrderMatchAsk(String orderId);
+
+    int queryGarOrderMatchAsks(String orderId);
+
+    int queryErrType(String phone);
+
+    GarOrderMatchAsk selectByGarOrderAskId(String garOrderId);
+
+    List<GarOrderMatchAsk> queryCarCode(String orderId);
+
+    int insertGarOrderMatchAskBySelect(GarOrderMatchAsk garOrderMatchAsk);
+
+    int addDriverSend(DriverSend driverSend);
+    int updateDriverSendState(DriverSend driverSend);
+    DriverSend queryDriverSend(String phoneNumber);
 }
+package com.trash.garbage.pojo.domain;
+
+import lombok.Data;
+
+@Data
+public class DriverSend {
+    private String phone;
+    private String orderId;
+    private String state;
+}
@@ -192,7 +192,44 @@ public class GarOrder implements Serializable {
     private String garAskStatus;
-    /**
+    @TableField(exist = false)
+    private Integer garNowCarCount;
+    
+    
+
+    public String getGarOrderHandlerStatusStr() {
+		return garOrderHandlerStatusStr;
+	}
+
+	public void setGarOrderHandlerStatusStr(String garOrderHandlerStatusStr) {
+		this.garOrderHandlerStatusStr = garOrderHandlerStatusStr;
+	}
+
+	public String getGarCancelFlagStr() {
+		return garCancelFlagStr;
+	}
+
+	public void setGarCancelFlagStr(String garCancelFlagStr) {
+		this.garCancelFlagStr = garCancelFlagStr;
+	}
+
+	public Boolean getNeedFollowCar() {
+		return needFollowCar;
+	}
+
+	public void setNeedFollowCar(Boolean needFollowCar) {
+		this.needFollowCar = needFollowCar;
+	}
+
+	public Integer getGarNowCarCount() {
+		return garNowCarCount;
+	}
+
+	public void setGarNowCarCount(Integer garNowCarCount) {
+		this.garNowCarCount = garNowCarCount;
+	}
+
+	/**
      * 是否有用户的评价，默认值是0，默认没有
      *
      * @author liujun
 package com.trash.garbage.service;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.trash.garbage.pojo.domain.DriverSend;
 import com.trash.garbage.pojo.domain.GarOrderMatchAsk;
 import com.trash.garbage.pojo.vo.DispatchDisposalVo;
@@ -63,4 +64,20 @@ public interface GarOrderMatchAskService extends IService&lt;GarOrderMatchAsk&gt; {
     int deleteGarOrderMatchAskById(String garId);
     int queryGarOrderMatchAsk(String orderId);
+
+    int queryGarOrderMatchAsks(String orderId);
+
+    List<GarOrderMatchAsk> queryCarCode(String orderId);
+
+    int queryErrType(String phone);
+
+    GarOrderMatchAsk selectByGarOrderAskId(String garOrderId);
+
+    int insertGarOrderMatchAskBySelect(GarOrderMatchAsk garOrderMatchAsk);
+
+    int addDriverSend(DriverSend driverSend);
+
+    int updateDriverSendState(DriverSend driverSend);
+
+    DriverSend queryDriverSend(String phone);
 }
@@ -9,6 +9,7 @@ import com.trash.garbage.pojo.domain.GarOrderEvaluate;
 import com.trash.garbage.pojo.domain.GarOrderMatchHandler;
 import com.trash.garbage.pojo.dto.*;
 import com.trash.garbage.pojo.vo.*;
+import org.apache.ibatis.annotations.Param;
 import java.util.List;
@@ -112,4 +113,8 @@ public interface GarOrderService extends IService&lt;GarOrder&gt; {
     Integer queryGarRealCarCountByGarOrderId(String garOrderId);
+    int updateGarRealCarCount(String garOrderId,Integer garRealCarCount);
+
+    List<GarOrderMatchHandler> getGarOrderMatchHandlers(String garOrderId);
+
 }
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.trash.garbage.mapper.GarOrderMapper;
 import com.trash.garbage.mapper.GarOrderMatchAskMapper;
+import com.trash.garbage.pojo.domain.DriverSend;
 import com.trash.garbage.pojo.domain.GarOrderMatchAsk;
 import com.trash.garbage.pojo.vo.OrderDetailTransportVo;
 import com.trash.garbage.service.GarOrderMatchAskService;
@@ -120,6 +121,37 @@ public class GarOrderMatchAskServiceImpl extends ServiceImpl&lt;GarOrderMatchAskMap
     public int queryGarOrderMatchAsk(String orderId) {
         return garOrderMatchAskMapper.queryGarOrderMatchAsk(orderId);
     }
+
+    @Override
+    public int queryGarOrderMatchAsks(String orderId){
+        return garOrderMatchAskMapper.queryGarOrderMatchAsks(orderId);
+    }
+
+    public GarOrderMatchAsk selectByGarOrderAskId(String garOrderId){
+        return garOrderMatchAskMapper.selectByGarOrderAskId(garOrderId);
+    };
+
+    public int insertGarOrderMatchAskBySelect(GarOrderMatchAsk garOrderMatchAsk){
+        return garOrderMatchAskMapper.insertGarOrderMatchAskBySelect(garOrderMatchAsk);
+    };
+
+    public int addDriverSend(DriverSend driverSend){
+        return garOrderMatchAskMapper.addDriverSend(driverSend);
+    }
+
+    public int updateDriverSendState(DriverSend driverSend){
+        return garOrderMatchAskMapper.updateDriverSendState(driverSend);
+    };
+    public DriverSend queryDriverSend(String phone){
+        return garOrderMatchAskMapper.queryDriverSend(phone);
+    };
+
+    public List<GarOrderMatchAsk> queryCarCode(String orderId){
+        return garOrderMatchAskMapper.queryCarCode(orderId);
+    }
+    public int queryErrType(String phone){
+        return garOrderMatchAskMapper.queryErrType(phone);
+    }
 }
@@ -30,7 +30,10 @@ import com.trash.enterprise.service.ITransportationEnterpriseService;
 import com.trash.garbage.custom.BizException;
 import com.trash.garbage.global.GlobalStatus;
 import com.trash.garbage.global.ResultCode;
+import com.trash.garbage.mapper.GarOrderCarMapper;
 import com.trash.garbage.mapper.GarOrderMapper;
+import com.trash.garbage.mapper.GarOrderMatchAskMapper;
+import com.trash.garbage.mapper.GarOrderMatchHandlerMapper;
 import com.trash.garbage.pojo.domain.*;
 import com.trash.garbage.pojo.dto.*;
 import com.trash.garbage.pojo.vo.*;
@@ -43,6 +46,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import org.apache.commons.lang3.time.FastDateFormat;
 import org.apache.http.client.utils.HttpClientUtils;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -109,9 +113,10 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
     private GarAreaServer garAreaServer;
     @Autowired
     private GarOrderAssociationServiceAsync garOrderAssociationServiceAsync;
-    
     @Autowired
     private CarInfoMapper carInfoMapper;
+    @Autowired
+    private GarOrderCarMapper garOrderCarMapper;
     private FastDateFormat fastDateFormat = FastDateFormat.getInstance("yyyy-MM-dd");
@@ -128,6 +133,10 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
     private IDropPointInfoService dropPointInfoService;
     @Autowired
     private com.trash.common.config.trashConfig trashConfig;
+    @Autowired
+    private GarOrderMatchAskMapper garOrderMatchAskMapper;
+    @Autowired
+    private GarOrderMatchHandlerMapper garOrderMatchHandlerMapper;
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -350,6 +359,9 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                             .eq(GarOrder::getGarTimeOutFlag, GlobalStatus.GarOrderStatus.ORDER_TIME_OUT_FLAG_NO.getValue());
                 }
                 List<GarOrder> orderList = list(qw);
+                orderList.stream().forEach(s->{
+                    s.setGarNowCarCount(baseMapper.queryGarNowCarCount(s.getGarOrderId()));
+                });
                 PageInfo<GarOrder> pageInfo = new PageInfo<GarOrder>(orderList, pageSize);
                 return pageInfo;
             }
@@ -357,6 +369,9 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
             // 全部
             if (GlobalStatus.GarOrderStatus.ALL_ORDER.getValue().equals(type)) {
                 List<GarOrder> orderList = list(qw);
+                orderList.stream().forEach(s->{
+                    s.setGarNowCarCount(baseMapper.queryGarNowCarCount(s.getGarOrderId()));
+                });
                 PageInfo<GarOrder> pageInfo = new PageInfo<GarOrder>(orderList, pageSize);
                 return pageInfo;
             }
@@ -368,6 +383,9 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                     || GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue().equals(type)
                     || GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue().equals(type)) {
                 List<GarOrderDriverVo> orderList = baseMapper.queryDriverOrderListByTelWithType(user.getGarUserTel(), type, GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue());
+                orderList.stream().forEach(s->{
+                    s.setGarNowCarCount(baseMapper.queryGarNowCarCount(s.getGarOrderId()));
+                });
                 PageInfo<GarOrderDriverVo> pageInfo = new PageInfo<GarOrderDriverVo>(orderList, pageSize);
                 return pageInfo;
             }
@@ -395,10 +413,16 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                             .eq(GarOrder::getGarTimeOutFlag, GlobalStatus.GarOrderStatus.ORDER_TIME_OUT_FLAG_NO.getValue());
                 }
                 List<GarOrder> orderList = list(qw);
+
+                orderList.stream().forEach(s->{
+                    s.setGarNowCarCount(baseMapper.queryGarNowCarCount(s.getGarOrderId()));
+                });
+
                 orderList = queryHaveEvaluateOfClient(orderList, GlobalStatus.GarOrderStatus.EVALUATE_TYPE_COMPANY.getValue());
                 PageInfo<GarOrder> pageInfo = new PageInfo<GarOrder>(orderList, pageSize);
                 return pageInfo;
             }
+
             // 全部
             if (GlobalStatus.GarOrderStatus.ALL_ORDER.getValue().equals(type)) {
                 List<GarOrder> orderList = baseMapper.selectList(qw);
@@ -1431,7 +1455,6 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
             // TODO 短信通知
             smsUtils.sendMessage(tels, content);
         }
-
     }
     private GarOrderMatchDisposal getGarOrderMatchDisposal(GarOrder order, DisposalDispatchDto.DispatchDetail detail) {
@@ -1780,6 +1803,81 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                 .set(dto.getEvaluateType().equals(GlobalStatus.GarOrderStatus.EVALUATE_TYPE_USER.getValue()), GarOrder::getGarHandlerEvaluateFlag, GlobalStatus.GarOrderStatus.EVALUATE_ORDER_YES.getValue());
         update(uw);
     }
+
+    public int updateGarRealCarCount(String garOrderId,Integer garRealCarCount){
+        GarOrderCar originalCar = garOrderCarMapper.selectByGarOrderId(garOrderId);
+        GarOrderMatchAsk garOrderMatchAsk = garOrderMatchAskMapper.selectByGarOrderAskId(garOrderId);
+        if (originalCar != null && garRealCarCount != null && garRealCarCount > 0) {
+            for (int i = 0; i < garRealCarCount; i++) {
+                GarOrderCar newCar = getGarOrderCar(originalCar);
+                garOrderCarMapper.insertSelective(newCar);
+                if(garOrderMatchAsk != null){
+                    GarOrderMatchAsk newAsk = getGarOrderMatchAsk(garOrderMatchAsk);
+                    garOrderMatchAskMapper.insertGarOrderMatchAskBySelect(newAsk);
+                }
+            }
+        }
+        return baseMapper.updateGarRealCarCount(garOrderId,garRealCarCount);
+    }
+
+    public List<GarOrderMatchHandler> getGarOrderMatchHandlers(String garOrderId){
+        System.out.println(garOrderMatchHandlerMapper.queryGarOrderMatchHandler(garOrderId));
+        return garOrderMatchHandlerMapper.queryGarOrderMatchHandler(garOrderId);
+    }
+
+    @NotNull
+    private static GarOrderCar getGarOrderCar(GarOrderCar originalCar) {
+        GarOrderCar newCar = new GarOrderCar();
+        newCar.setGarOrderId(originalCar.getGarOrderId());
+        newCar.setGarOrderCarType(originalCar.getGarOrderCarType());
+        newCar.setCarId(originalCar.getCarId());
+        newCar.setContainerVolume(originalCar.getContainerVolume());
+        newCar.setGarCreateBy(originalCar.getGarCreateBy());
+        newCar.setGarUpdateBy(originalCar.getGarUpdateBy());
+        newCar.setGarOrderCarUserType(originalCar.getGarOrderCarUserType());
+        newCar.setGarId(null);
+        newCar.setGarCreateTime(new Date());
+        newCar.setGarUpdateTime(new Date());
+        return newCar;
+    }
+
+    @NotNull
+    private static GarOrderMatchAsk getGarOrderMatchAsk(GarOrderMatchAsk garOrderMatchAsk) {
+
+        GarOrderMatchAsk newCar = new GarOrderMatchAsk();
+        newCar.setGarId(String.valueOf(Long.parseLong(garOrderMatchAsk.getGarId()) + 1));
+        newCar.setGarOrderId(garOrderMatchAsk.getGarOrderId());
+        newCar.setGarCreateTime(new Date());
+        newCar.setGarCreateBy(garOrderMatchAsk.getGarCreateBy());
+        newCar.setGarUpdateBy(garOrderMatchAsk.getGarUpdateBy());
+        newCar.setDropPointId(garOrderMatchAsk.getDropPointId());
+        newCar.setDropPointName(garOrderMatchAsk.getDropPointName());
+        newCar.setGarOrderType(garOrderMatchAsk.getGarOrderType());
+        newCar.setDisposalId(garOrderMatchAsk.getDisposalId());
+        newCar.setDisposalSiteName(garOrderMatchAsk.getDisposalSiteName());
+        String orderNumber = garOrderMatchAsk.getGarOrderNumber();
+        if (orderNumber != null && orderNumber.length() >= 2) {
+            try {
+                String prefix = orderNumber.substring(0, orderNumber.length() - 2);
+                String suffix = orderNumber.substring(orderNumber.length() - 2);
+                int suffixNum = Integer.parseInt(suffix);
+                String newSuffix = String.format("%02d", (suffixNum + 1) % 100);
+                newCar.setGarOrderNumber(prefix + newSuffix);
+            } catch (Exception e) {
+                newCar.setGarOrderNumber(orderNumber);
+            }
+        } else {
+            newCar.setGarOrderNumber(orderNumber);
+        }
+        newCar.setGarOrderPhone(garOrderMatchAsk.getGarOrderPhone());
+        newCar.setGarOrderName(garOrderMatchAsk.getGarOrderName());
+        newCar.setDropAddress(garOrderMatchAsk.getDropAddress());
+        newCar.setDropCarNum(0);
+        newCar.setGarOrderTime(new Date());
+        return newCar;
+    }
+
+
 }
@@ -140,29 +140,40 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
                 throw new BizException(ResultCode.CODE_500, "解密失败");
             }
         }
-        
-        // 查询用户
-        QueryWrapper<GarUser> qw = new QueryWrapper<>();
+
         GarUser nUser = null;
-        qw.lambda().eq(GarUser::getGarUserTel, loginDto.getTel());
-        if(loginDto.getCode() == null && loginDto.getPassword() != null){
-        	qw.lambda().eq(GarUser::getGarUserTel, loginDto.getTel());
-        	  if(loginDto.getSignin() != 1){
-	            nUser = this.getOne(qw);
-	            if (Objects.isNull(nUser)) {
-	                throw new UsernameNotFoundException("当前用户不存在!");
-	            }
-	            if(!new BCryptPasswordEncoder().matches(loginDto.getPassword(),nUser.getPassword())){
-	            	 throw new UsernameNotFoundException("密码错误!");
-	            }
-        	  }
-        }else{
-        	// 验证码验证
-            String code = redisCache.getCacheObject(GlobalRedisProperties.REDIS_USER_CODE.getValue() + loginDto.getTel());
-            if (loginDto.getCode() == null || !loginDto.getCode().equals(code)) {
-                throw new BizException(ResultCode.CODE_400, "验证码错误！！");
-            }
+        if (loginDto.getSignin() != 1 && StringUtils.isNotEmpty(loginDto.getNickname())) {
+            QueryWrapper<GarUser> qw = new QueryWrapper<>();
+            qw.lambda().eq(GarUser::getGarUserName, loginDto.getNickname());
             nUser = this.getOne(qw);
+            if (Objects.isNull(nUser)) {
+                throw new UsernameNotFoundException("当前用户不存在!");
+            }
+            if (!new BCryptPasswordEncoder().matches(loginDto.getPassword(), nUser.getPassword())) {
+                throw new UsernameNotFoundException("密码错误!");
+            }
+            loginDto.setTel(nUser.getGarUserTel());
+        } else {
+            QueryWrapper<GarUser> qw = new QueryWrapper<>();
+            qw.lambda().eq(GarUser::getGarUserTel, loginDto.getTel());
+            if(loginDto.getCode() == null && loginDto.getPassword() != null){
+                qw.lambda().eq(GarUser::getGarUserTel, loginDto.getTel());
+                if(loginDto.getSignin() != 1){
+                    nUser = this.getOne(qw);
+                    if (Objects.isNull(nUser)) {
+                        throw new UsernameNotFoundException("当前用户不存在!");
+                    }
+                    if(!new BCryptPasswordEncoder().matches(loginDto.getPassword(),nUser.getPassword())){
+                        throw new UsernameNotFoundException("密码错误!");
+                    }
+                }
+            }else{
+                String code = redisCache.getCacheObject(GlobalRedisProperties.REDIS_USER_CODE.getValue() + loginDto.getTel());
+                if (loginDto.getCode() == null || !loginDto.getCode().equals(code)) {
+                    throw new BizException(ResultCode.CODE_400, "验证码错误！！");
+                }
+                nUser = this.getOne(qw);
+            }
         }
         if (Objects.isNull(nUser)) {
@@ -287,9 +298,8 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
         //随机生成6位数字验证码
         String validateCode = ValidateCodeUtil.generatorCode(4);
         //给用户发送验证码
-//        SMSUtils.sendMessage("", tel, validateCode.toString(), "");
+        smsUtils.sendMessage(tel, validateCode.toString());
         // 保存redis
-        System.out.println("code:" + validateCode);
         redisCache.setCacheObject(GlobalRedisProperties.REDIS_USER_CODE.getValue() + tel, validateCode, 60, TimeUnit.SECONDS);
         return validateCode;
     }
@@ -14,6 +14,8 @@
             <result property="garCreateBy" column="gar_create_by" jdbcType="VARCHAR"/>
             <result property="garUpdateBy" column="gar_update_by" jdbcType="VARCHAR"/>
             <result property="garRemark" column="gar_remark" jdbcType="VARCHAR"/>
+            <result property="carId" column="car_id" jdbcType="VARCHAR"/>
+            <result property="containerVolume" column="container_volume" jdbcType="VARCHAR"/>
     </resultMap>
     <sql id="Base_Column_List">
@@ -21,4 +23,42 @@
         gar_order_car_user_type,gar_create_time,gar_update_time,
         gar_create_by,gar_update_by,gar_remark
     </sql>
+    <select id="selectByGarOrderId" parameterType="string" resultMap="BaseResultMap">
+        SELECT gar_id,gar_order_id,gar_order_car_type,
+               gar_order_car_user_type,gar_create_time,gar_update_time,
+               gar_create_by,gar_update_by,gar_remark,car_id,container_volume
+        FROM gar_order_car
+        WHERE gar_order_id = #{garOrderId}
+        LIMIT 1
+    </select>
+
+    <insert id="insertSelective" parameterType="com.trash.garbage.pojo.domain.GarOrderCar">
+        INSERT INTO gar_order_car
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            gar_id,
+            gar_order_id,
+            gar_order_car_type,
+            gar_order_car_user_type,
+            gar_create_time,
+            gar_update_time,
+            gar_create_by,
+            gar_update_by,
+            gar_remark,
+            car_id,
+            container_volume
+        </trim>
+        <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
+            #{garId},
+            #{garOrderId},
+            #{garOrderCarType},
+            #{garOrderCarUserType},
+            #{garCreateTime},
+            #{garUpdateTime},
+            #{garCreateBy},
+            #{garUpdateBy},
+            #{garRemark},
+            #{carId},
+            #{containerVolume}
+        </trim>
+    </insert>
 </mapper>
@@ -275,4 +275,14 @@
     <select id="queryGarRealCarCountByGarOrderId" resultType="java.lang.Integer">
         select gar_real_car_count from gar_order where gar_order_id=#{garOrderId}
     </select>
+
+    <update id="updateGarRealCarCount">
+        update gar_order
+        set gar_real_car_count = gar_real_car_count + #{garRealCarCount}
+        where gar_order_id = #{garOrderId}
+    </update>
+
+    <select id="queryGarNowCarCount">
+        SELECT count(*) FROM gar_order_match_ask where gar_order_id = #{garOrderId} and transport_distance is not null
+    </select>
 </mapper>
@@ -26,6 +26,21 @@
         gar_create_time,gar_update_time,gar_create_by,
         gar_update_by,gar_remark
     </sql>
+    <resultMap type="DriverSend" id="driverSendMap">
+        <result property="orderId" column="order_id" />
+        <result property="phone" column="phone" />
+        <result property="state" column="state" />
+    </resultMap>
+
+    <insert id="addDriverSend" parameterType="DriverSend">
+        insert into driver_send (order_id,phone,state) values (#{orderId},#{phone},#{state})
+    </insert>
+    <select id="queryDriverSend" parameterType="DriverSend" resultMap="driverSendMap">
+        select * from driver_send where phone = #{phone} and state = 0 limit 1
+    </select>
+    <update id="updateDriverSendState" parameterType="DriverSend">
+        update  driver_send set state = 1 where  phone = #{phone}
+    </update>
     <resultMap type="GarOrderMatchAsk" id="GarOrderMatchAskResult">
         <result property="garId"    column="gar_id"    />
@@ -59,7 +74,7 @@
         <result property="updateTime"    column="update_time"    />
         <result property="garOrderTime"    column="gar_order_time"    />
         <result property="transportDistance"    column="transport_distance"    />
-
+        <result property="unloadingLonLat" column="unloading_lon_lat" />
     </resultMap>
     <sql id="selectGarOrderMatchAskVo">
@@ -198,4 +213,63 @@
         select COUNT(*) from gar_order_match_ask where gar_order_id = #{orderId} and transport_distance is not null
     </select>
+    <select id="queryErrType" resultType="java.lang.Integer">
+        select count(*) from gar_order_match_ask where gar_order_handler_tel = #{phone} and gar_order_type = 1
+    </select>
+
+    <select id="queryCarCode" parameterType="string" resultMap="GarOrderMatchAskResult">
+        SELECT gar_order_handler_name,gar_handler_car_code
+        FROM gar_order_match_ask
+        WHERE gar_order_id = #{garOrderId}
+        group by gar_handler_car_code
+    </select>
+
+    <select id="queryGarOrderMatchAsks" resultType="java.lang.Integer">
+        select COUNT(*) from gar_order_match_ask where gar_order_id = #{orderId} and (transport_distance is null or transport_distance = '')
+    </select>
+
+    <select id="selectByGarOrderAskId" parameterType="string" resultMap="GarOrderMatchAskResult">
+        SELECT gar_id,gar_order_id,gar_create_by,gar_update_by,drop_point_id,drop_point_name,gar_order_type,disposal_id,disposal_site_name,gar_order_number,gar_order_phone,gar_order_name,drop_address,drop_car_num,gar_order_time
+        FROM gar_order_match_ask
+        WHERE gar_order_id = #{garOrderId}
+        ORDER BY gar_order_number DESC
+        LIMIT 1
+    </select>
+
+    <insert id="insertGarOrderMatchAskBySelect" parameterType="com.trash.garbage.pojo.domain.GarOrderMatchAsk">
+        INSERT INTO gar_order_match_ask (
+            gar_id,
+            gar_order_id,
+            gar_create_by,
+            gar_update_by,
+            drop_point_id,
+            drop_point_name,
+            gar_order_type,
+            disposal_id,
+            disposal_site_name,
+            gar_order_number,
+            gar_order_phone,
+            gar_order_name,
+            drop_address,
+            drop_car_num,
+            gar_order_time
+        ) VALUES (
+                     #{garId},
+                     #{garOrderId},
+                     #{garCreateBy},
+                     #{garUpdateBy},
+                     #{dropPointId},
+                     #{dropPointName},
+                     #{garOrderType},
+                     #{disposalId},
+                     #{disposalSiteName},
+                     #{garOrderNumber},
+                     #{garOrderPhone},
+                     #{garOrderName},
+                     #{dropAddress},
+                     #{dropCarNum},
+                     #{garOrderTime}
+                 )
+    </insert>
+
 </mapper>
@@ -68,4 +68,5 @@
     <select id="queryGarOrderMatchHandler" resultType="com.trash.garbage.pojo.domain.GarOrderMatchHandler">
         select * from gar_order_match_handler where gar_order_id = #{orderId}
     </select>
+
 </mapper>