1

njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/controller/BizTruckController.java

@@ -12,7 +12,9 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 车辆信息
@@ -64,11 +66,17 @@ public class BizTruckController {
     /**
      * 删除
      *
-     * @param ids Ids
      */
     @PostMapping("/del")
-    public R<?> del(@RequestBody List<Long> ids) {
+    public R<?> del(@RequestBody HashMap<String, Object> map) {
-        bizTruckService.del(ids);
+        Object ids = map.get("id");
+        if (ids instanceof List) {
+            List<?> ids1 = (List<?>) ids;
+            List<Long> collect = ids1.stream().map(it -> Long.parseLong(it.toString())).collect(Collectors.toList());
+            bizTruckService.del(collect);
+        } else {
+            throw new IllegalArgumentException("参数格式错误");
+        }
         return R.success();
     }
 

njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java

@@ -860,7 +860,7 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
             // 1) 复制“产品”到 order_expense_items；
             // 2) 从 expense_items_config 读取可用付费项并按 scope 过滤（all / customer_type=QiYe|GeTi / customer 包含 trans_company_id）；
             // 3) 合并集合，计算 total_money 与 settle_money，并批量落库。
-            settleForTransCompany(orderInfoEntity, settleWeight);
+            // settleForTransCompany(orderInfoEntity, settleWeight);
         } finally {
             // TODO 关闭 GPS
             BizTruckEntity truckInfo = baseMapper.getTruckInfo(truckId);

njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/auth/mapper/AuthMapper.java

@@ -3,6 +3,7 @@ package com.njzscloud.supervisory.sys.auth.mapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.njzscloud.common.security.support.EndpointResource;
 import com.njzscloud.common.security.support.MenuResource;
+import com.njzscloud.supervisory.biz.pojo.entity.BizDriverEntity;
 import com.njzscloud.supervisory.biz.pojo.result.SearchCompanyResult;
 import com.njzscloud.supervisory.sys.auth.pojo.result.MyResult;
 import org.apache.ibatis.annotations.Mapper;
@@ -24,4 +25,6 @@ public interface AuthMapper {
     SearchCompanyResult selectCompanyInfo(@Param("userId") Long userId);
 
     String selectWechatOpenidByUserId(@Param("userId") Long userId);
+
+    BizDriverEntity getDriver(@Param("userId") Long userId);
 }

njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/auth/pojo/result/MyResult.java

@@ -4,6 +4,7 @@ import com.njzscloud.common.security.support.EndpointResource;
 import com.njzscloud.common.security.support.MenuResource;
 import com.njzscloud.common.security.support.UserDetail;
 import com.njzscloud.supervisory.biz.constant.BizObj;
+import com.njzscloud.supervisory.biz.pojo.entity.BizDriverEntity;
 import com.njzscloud.supervisory.biz.pojo.result.SearchCompanyResult;
 import lombok.Getter;
 import lombok.Setter;
@@ -25,6 +26,7 @@ public class MyResult extends UserDetail {
     private List<Map<String, Object>> setting;
     private BizObj bizObj;
     private SearchCompanyResult company;
+    private BizDriverEntity driver;
 
     /**
      * Id

njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/auth/service/AuthService.java

@@ -8,6 +8,7 @@ import com.njzscloud.common.security.module.password.PasswordLoginForm;
 import com.njzscloud.common.security.module.wechat.mini.WechatMiniLoginForm;
 import com.njzscloud.common.security.support.*;
 import com.njzscloud.common.security.util.SecurityUtil;
+import com.njzscloud.supervisory.biz.pojo.entity.BizDriverEntity;
 import com.njzscloud.supervisory.biz.pojo.result.SearchCompanyResult;
 import com.njzscloud.supervisory.sys.auth.mapper.AuthMapper;
 import com.njzscloud.supervisory.sys.auth.pojo.result.MyResult;
@@ -84,11 +85,13 @@ public class AuthService implements IUserService, IRoleService {
         SearchCompanyResult company = authMapper.selectCompanyInfo(userId);
         Set<String> strings = authMapper.selectRoleByUserId(userId);
         String wechatOpenid = authMapper.selectWechatOpenidByUserId(userId);
+        BizDriverEntity driver = authMapper.getDriver(userId);
         return BeanUtil.copyProperties(userEntity, MyResult.class)
                 .setRoles(strings)
                 .setMenus(menuResources)
                 .setEndpoints(endpointResources)
                 .setCompany(company)
+                .setDriver(driver)
                 .setWechatOpenid(wechatOpenid != null ? wechatOpenid : "");
     }
 

njzscloud-svr/src/main/resources/mapper/sys/auth/AuthMapper.xml

@@ -116,4 +116,9 @@
         FROM sys_user_account
         WHERE user_id = #{userId} AND deleted = 0
     </select>
+    <select id="getDriver" resultType="com.njzscloud.supervisory.biz.pojo.entity.BizDriverEntity">
+        SELECT *
+        FROM biz_driver
+        WHERE user_id = #{userId}
+    </select>
 </mapper>