调整-11-27

lichao
1 parent 418d3413
Showing 6 changed files with 46 additions and 42 deletions
trash-garbage/src/main/java/com/trash/garbage/controller/GarbageOrderController.java
trash-garbage/src/main/java/com/trash/garbage/mapper/GarOrderMatchHandlerMapper.java
trash-garbage/src/main/java/com/trash/garbage/service/GarOrderMatchHandlerService.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderMatchHandlerServiceImpl.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
trash-garbage/src/main/resources/mapper/GarOrderMatchHandlerMapper.xml
@@ -259,9 +259,17 @@ public class GarbageOrderController {
         return Result.OK(garOrderMatchHandlerService.queryCarCountByTel(tel));
     }
  
-    @GetMapping("/updateCarCount")
-    public Result<?> updateCarCount(@RequestParam("tel") String tel) {
-        return Result.OK(garOrderMatchHandlerService.updateCarCount(tel));
+    @GetMapping("/queryGarRealCarCountByGarOrderNo/{orderNo}")
+    public Result<?> queryGarRealCarCountByGarOrderId(@PathVariable("orderNo") String orderNo) {
+        return Result.OK(garOrderService.queryGarRealCarCountByGarOrderId(orderNo));
+    }
+
+
+    @PostMapping("/updateCarCount")
+    public Result<?> updateCarCount(@RequestBody Map<String, String> params) {
+        String carCount = params.get("carCount");
+        String tel = params.get("tel");
+        return Result.OK(garOrderMatchHandlerService.updateCarCount(carCount,tel));
     }
  
     @GetMapping("/queryByOrderNo/{orderNo}")
@@ -269,6 +277,16 @@ public class GarbageOrderController {
         return Result.OK(garOrderMatchHandlerService.queryByOrderNo(orderNo));
     }
  
+    @GetMapping("/queryByOrderNoDriver/{orderNo}")
+    public Result<?> queryByOrderNoDriver(@PathVariable("orderNo") String orderNo) {
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        if (loginUser == null || loginUser.getUser() == null) {
+            return null;
+        }
+        String phoneNumber = loginUser.getUser().getPhonenumber();
+        return Result.OK(garOrderMatchHandlerService.queryByOrderNoDriver(orderNo,phoneNumber));
+    }
+
     @GetMapping("/getGarOrderMatchHandlers")
     public Result<?> getGarOrderMatchHandlers(@RequestParam("orderId") String orderId) {
         return Result.OK(garOrderService.getGarOrderMatchHandlers(orderId));
@@ -25,9 +25,11 @@ public interface GarOrderMatchHandlerMapper extends BaseMapper&lt;GarOrderMatchHand
  
     String queryCarCountByTel(@Param("tel") String tel);
  
-    int updateCarCount(@Param("tel") String tel);
+    int updateCarCount(@Param("carCount") String carCount ,@Param("tel") String tel);
  
     List<GarOrderMatchHandler> queryByOrderNo(@Param("orderNo") String orderNo);
+
+    List<GarOrderMatchHandler> queryByOrderNoDriver(@Param("orderNo") String orderNo,@Param("phone") String phone);
 }
  
  
@@ -19,6 +19,7 @@ public interface GarOrderMatchHandlerService extends IService&lt;GarOrderMatchHandl
     List<GarOrderMatchHandler> queryByOrderId(String orderId);
     String queryOrderNo(String carCode);
     String queryCarCountByTel(String tel);
-    int updateCarCount(String tel);
+    int updateCarCount(String carCount,String tel);
     List<GarOrderMatchHandler> queryByOrderNo(String orderNo);
+    List<GarOrderMatchHandler> queryByOrderNoDriver(String orderNo,String phone);
 }
@@ -44,14 +44,19 @@ public class GarOrderMatchHandlerServiceImpl extends ServiceImpl&lt;GarOrderMatchHa
     }
  
     @Override
-    public int updateCarCount(String tel) {
-        return baseMapper.updateCarCount(tel);
+    public int updateCarCount(String carCount , String tel) {
+        return baseMapper.updateCarCount(carCount, tel);
     }
  
     @Override
     public List<GarOrderMatchHandler> queryByOrderNo(String orderNo) {
         return baseMapper.queryByOrderNo(orderNo);
     }
+
+    @Override
+    public List<GarOrderMatchHandler> queryByOrderNoDriver(String orderNo, String phone) {
+        return baseMapper.queryByOrderNoDriver(orderNo, phone);
+    }
 }
  
  
@@ -13,13 +13,10 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
 import com.trash.carInfo.domain.CarInfo;
 import com.trash.carInfo.domain.vo.CarInfoVo;
 import com.trash.carInfo.mapper.CarInfoMapper;
 import com.trash.carInfo.service.impl.CarInfoServiceImpl;
-import com.trash.common.config.trashConfig;
 import com.trash.common.core.redis.RedisCache;
 import com.trash.common.utils.RemoteServerUtils;
 import com.trash.common.utils.SecurityUtils;
@@ -1003,6 +1000,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         return pageInfo;
     }
  
+
     @Override
     public PageInfo dockingUpEnterpriseList(TransportationEnterprise dto) {
         // 1）支持选择企业"所属区域"（长沙市内的）展示区域内所有企业
@@ -1052,39 +1050,15 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                 log.error("请求的确信息异常", e);
             }
         }
-        
-        Map<String, Object> params = new HashMap<>();
-        if (StringUtils.isNotEmpty(tel)) {
-            params.put("phoneNo", tel);
-        }
-
-        if (StringUtils.isNotEmpty(areaCode)) {
-            params.put("adCodes", areaCode);
-        }
  
-        if (StringUtils.isNotEmpty(officeAddress)) {
-            params.put("officeAddress", officeAddress);
-        }
-        if (StringUtils.isNotEmpty(name)) {
-            params.put("name", name);
-        }
-        
-        params.put("tag", "1");
-        
-        JSONArray array = RemoteServerUtils.getCompanyList(params,trashConfig.getToken());
-        
-        Gson g = new Gson();
-        
-        List<TransportationEnterprise> list = g.fromJson(array.toJSONString(), new TypeToken<List<TransportationEnterprise>>(){}.getType());
-        
-//        // 修改这里，将name参数传递给request方法
-//        List<TransportationEnterprise> list = garTransportationEnterpriseService.request(tel, areaCode, officeAddress, name);
+        // 修改这里，将name参数传递给request方法
+        List<TransportationEnterprise> list = garTransportationEnterpriseService.request(tel, areaCode, officeAddress, name);
  
         // 后续代码保持不变...
-//        if (CollectionUtils.isNotEmpty(array) && StringUtils.isNotEmpty(tel)) {
-//            String telStr = tel;
-//            array = array.stream().filter(t -> StringUtils.equals(telStr, t.getServicePhone())).collect(Collectors.toList());
-//        }
+        if (CollectionUtils.isNotEmpty(list) && StringUtils.isNotEmpty(tel)) {
+            String telStr = tel;
+            list = list.stream().filter(t -> StringUtils.equals(telStr, t.getServicePhone())).collect(Collectors.toList());
+        }
  
 //        saveOrUpdate(list);
         Integer pageNum = ServletUtils.getParameterToInt("pageNum");
@@ -86,11 +86,15 @@
     </select>
  
     <update id="updateCarCount">
-            update gar_order_match_handler set gar_car_count = #{carCount} where gar_order_handler_tel = #{tel}
+        update gar_order_match_handler set gar_car_count = gar_car_count + #{carCount} where gar_order_handler_tel = #{tel}
     </update>
  
     <select id="queryByOrderNo" resultType="com.trash.garbage.pojo.domain.GarOrderMatchHandler">
-            select * from gar_order_match_handler where gar_order_id = #{orderId}
+            select * from gar_order_match_handler where gar_order_id = #{orderNo}
+    </select>
+
+    <select id="queryByOrderNoDriver" resultType="com.trash.garbage.pojo.domain.GarOrderMatchHandler">
+        select * from gar_order_match_handler where gar_order_id = #{orderNo} and gar_order_handler_tel = #{phone}
     </select>
  
 </mapper>