调整-11-17

lichao
1 parent a03e1526
Showing 7 changed files with 54 additions and 6 deletions
trash-garbage/src/main/java/com/trash/garbage/controller/GarbageOrderController.java
trash-garbage/src/main/java/com/trash/garbage/mapper/GarOrderMatchAskMapper.java
trash-garbage/src/main/java/com/trash/garbage/service/GarOrderMatchAskService.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/GarOrderMatchAskMapper.xml
@@ -174,9 +174,22 @@ public class GarbageOrderController {
         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));
     }
@@ -184,6 +197,7 @@ public class GarbageOrderController {
     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));
     }
@@ -66,8 +66,12 @@ public interface GarOrderMatchAskMapper extends BaseMapper&lt;GarOrderMatchAsk&gt; {
     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);
@@ -67,6 +67,10 @@ public interface GarOrderMatchAskService extends IService&lt;GarOrderMatchAsk&gt; {
     int queryGarOrderMatchAsks(String orderId);
+    List<GarOrderMatchAsk> queryCarCode(String orderId);
+
+    int queryErrType(String phone);
+
     GarOrderMatchAsk selectByGarOrderAskId(String garOrderId);
     int insertGarOrderMatchAskBySelect(GarOrderMatchAsk garOrderMatchAsk);
@@ -146,6 +146,12 @@ public class GarOrderMatchAskServiceImpl extends ServiceImpl&lt;GarOrderMatchAskMap
         return garOrderMatchAskMapper.queryDriverSend(phone);
     };
+    public List<GarOrderMatchAsk> queryCarCode(String orderId){
+        return garOrderMatchAskMapper.queryCarCode(orderId);
+    }
+    public int queryErrType(String phone){
+        return garOrderMatchAskMapper.queryErrType(phone);
+    }
 }
@@ -354,6 +354,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;
             }
@@ -361,6 +364,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;
             }
@@ -1800,8 +1806,10 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
             for (int i = 0; i < garRealCarCount; i++) {
                 GarOrderCar newCar = getGarOrderCar(originalCar);
                 garOrderCarMapper.insertSelective(newCar);
-                GarOrderMatchAsk newAsk = getGarOrderMatchAsk(garOrderMatchAsk);
-                garOrderMatchAskMapper.insertGarOrderMatchAskBySelect(newAsk);
+                if(garOrderMatchAsk != null){
+                    GarOrderMatchAsk newAsk = getGarOrderMatchAsk(garOrderMatchAsk);
+                    garOrderMatchAskMapper.insertGarOrderMatchAskBySelect(newAsk);
+                }
             }
         }
         return baseMapper.updateGarRealCarCount(garOrderId,garRealCarCount);
@@ -1830,6 +1838,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
     @NotNull
     private static GarOrderMatchAsk getGarOrderMatchAsk(GarOrderMatchAsk garOrderMatchAsk) {
+
         GarOrderMatchAsk newCar = new GarOrderMatchAsk();
         newCar.setGarId(String.valueOf(Long.parseLong(garOrderMatchAsk.getGarId()) + 1));
         newCar.setGarOrderId(garOrderMatchAsk.getGarOrderId());
@@ -142,7 +142,7 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
         }
         GarUser nUser = null;
-        if (StringUtils.isNotEmpty(loginDto.getNickname())) {
+        if (loginDto.getSignin() != 1 && StringUtils.isNotEmpty(loginDto.getNickname())) {
             QueryWrapper<GarUser> qw = new QueryWrapper<>();
             qw.lambda().eq(GarUser::getGarUserName, loginDto.getNickname());
             nUser = this.getOne(qw);
@@ -298,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;
     }
@@ -29,6 +29,7 @@
     <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">
@@ -212,6 +213,17 @@
         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>