Merge remote-tracking branch 'origin/dev_20260131' into dev_20260131

sckw-auth/src/main/java/com/sckw/auth/service/impl/AuthServiceImpl.java

@@ -168,7 +168,7 @@ public class AuthServiceImpl implements IAuthService {
         loginRes.setClientType(loginBase.getClientType());
         loginRes.setSystemType(loginBase.getSystemType());
         loginRes.setToken(token);
-        List<LoginResVo1.TabBarItem> tabBar = buildAppTabBar(loginBase, null,1);
+        List<LoginResVo1.TabBarItem> tabBar = buildAppTabBar(loginBase, null,1,loginRes.getEntTypes());
         if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(tabBar)) {
             loginRes.setTabBar(tabBar);
         }
@@ -262,7 +262,7 @@ public class AuthServiceImpl implements IAuthService {
         loginRes.setDriverId(user.getDriverId());
         loginRes.setRoleName(user.getRoleName());
         loginRes.setRoleList(user.getRoleInfoDto());
-        List<LoginResVo1.TabBarItem> tabBar = buildAppTabBar(loginBase, user.getRoleName(),0);
+        List<LoginResVo1.TabBarItem> tabBar = buildAppTabBar(loginBase, user.getRoleName(),0,loginRes.getEntTypes());
         if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(tabBar)) {
             loginRes.setTabBar(tabBar);
         }
@@ -352,7 +352,7 @@ public class AuthServiceImpl implements IAuthService {
         loginRes.setRoleId(user.getRoleId());
         loginRes.setRoleName(user.getRoleName());
         loginRes.setRoleList(user.getRoleInfoDto());
-        List<LoginResVo1.TabBarItem> tabBar = buildAppTabBar(loginBase, user.getRoleName(),0);
+        List<LoginResVo1.TabBarItem> tabBar = buildAppTabBar(loginBase, user.getRoleName(),0,loginRes.getEntTypes());
         if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(tabBar)) {
             loginRes.setTabBar(tabBar);
         }
@@ -858,7 +858,7 @@ public class AuthServiceImpl implements IAuthService {
         loginRes.setToken(newToken);
         loginRes.setRefreshToken(newRefreshToken);
         loginRes.setDriverId(driver.getId());
-        List<LoginResVo1.TabBarItem> tabBar = buildAppTabBar(loginBase, null,1);
+        List<LoginResVo1.TabBarItem> tabBar = buildAppTabBar(loginBase, null,1,loginRes.getEntTypes());
         if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(tabBar)) {
             loginRes.setTabBar(tabBar);
         }
@@ -896,7 +896,7 @@ public class AuthServiceImpl implements IAuthService {
         loginRes.setDriverId(user.getDriverId());
         loginRes.setRoleName(user.getRoleName());
         loginRes.setRoleList(user.getRoleInfoDto());
-        List<LoginResVo1.TabBarItem> tabBar = buildAppTabBar(loginBase, user.getRoleName(),1);
+        List<LoginResVo1.TabBarItem> tabBar = buildAppTabBar(loginBase, user.getRoleName(),1,loginRes.getEntTypes());
         if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(tabBar)) {
             loginRes.setTabBar(tabBar);
         }
@@ -960,7 +960,7 @@ public class AuthServiceImpl implements IAuthService {
         return false;
     }
 
-    private List<LoginResVo1.TabBarItem> buildAppTabBar(LoginBase loginBase, String roleName,int flag) {
+    private List<LoginResVo1.TabBarItem> buildAppTabBar(LoginBase loginBase, String roleName,int flag,  String entTypeNames) {
         if (!isAppLogin(loginBase)) {
             return List.of();
         }
@@ -974,6 +974,11 @@ public class AuthServiceImpl implements IAuthService {
         boolean isDriver = StringUtils.isNotBlank(roleName) && roleName.contains("司机");
         boolean isLogistics = StringUtils.isNotBlank(roleName) && roleName.contains("物流");
         boolean isFinance = StringUtils.isNotBlank(roleName) && roleName.contains("财务");
+        //企业属性 （1供应商，2采购商，34PL物流，43PL物流）
+        boolean isSupplierAdmin = StringUtils.isNotBlank(roleName) && roleName.contains("供应商管理员") && org.apache.commons.lang3.StringUtils.equals(entTypeNames, "1")  ;
+        boolean isLogisticsAdmin = StringUtils.isNotBlank(roleName) && roleName.contains("物流商管理员") && org.apache.commons.lang3.StringUtils.equals(entTypeNames, "3");
+        boolean isPurchaseAdmin = StringUtils.isNotBlank(roleName) && roleName.contains("采购商管理员") && org.apache.commons.lang3.StringUtils.equals(entTypeNames, "2");
+
         if (isDoorKeeper) {
             return buildDoorKeeperTabBar();
         }
@@ -992,9 +997,106 @@ public class AuthServiceImpl implements IAuthService {
         if (isLogistics){
             return buildLogisticsTabBar();
         }
+        if (isSupplierAdmin){
+            return buildSupplierAdminTabBar();
+        }
+        if (isLogisticsAdmin){
+            return buildLogisticsAdminTabBar();
+        }
+        if (isPurchaseAdmin){
+            return buildPurchaseAdminTabBar();}
         return List.of();
     }
 
+    private List<LoginResVo1.TabBarItem> buildPurchaseAdminTabBar() {
+        List<LoginResVo1.TabBarItem> items = new ArrayList<>();
+        items.add(buildTabBarItem(
+                "商城",
+                "/static/tabbar/mall_select.png",
+                "/static/tabbar/mall.png",
+                "/pages/mall/index"
+        ));
+        items.add(buildTabBarItem(
+                "贸易订单",
+                "/static/tabbar/trade_select.png",
+                "/static/tabbar/trade.png",
+                "/pages/tradeOrder/index"
+        ));
+        items.add(buildTabBarItem(
+                "物流订单",
+                "/static/tabbar/logOrder_select.png",
+                "/static/tabbar/logOrder.png",
+                "/pages/logistics/order/index"
+        ));
+        items.add(buildTabBarItem(
+                "物流运单",
+                "/static/tabbar/waybill_select.png",
+                "/static/tabbar/waybill.png",
+                "/pages/logistics/waybill/index"
+        ));
+        items.add(buildTabBarItem(
+                "个人中心",
+                "/static/tabbar/my_select.png",
+                "/static/tabbar/my.png",
+                "/pages/myCenter/index"
+        ));
+        return items;
+    }
+
+    private List<LoginResVo1.TabBarItem> buildLogisticsAdminTabBar() {
+        List<LoginResVo1.TabBarItem> items = new ArrayList<>();
+
+        items.add(buildTabBarItem(
+                "物流订单",
+                "/static/tabbar/logOrder_select.png",
+                "/static/tabbar/logOrder.png",
+                "/pages/logistics/order/index"
+        ));
+        items.add(buildTabBarItem(
+                "物流运单",
+                "/static/tabbar/waybill_select.png",
+                "/static/tabbar/waybill.png",
+                "/pages/logistics/waybill/index"
+        ));
+        items.add(buildTabBarItem(
+                "个人中心",
+                "/static/tabbar/my_select.png",
+                "/static/tabbar/my.png",
+                "/pages/myCenter/index"
+        ));
+        return items;
+    }
+
+    private List<LoginResVo1.TabBarItem> buildSupplierAdminTabBar() {
+        List<LoginResVo1.TabBarItem> items = new ArrayList<>();
+        items.add(buildTabBarItem(
+                "贸易订单",
+                "/static/tabbar/trade_select.png",
+                "/static/tabbar/trade.png",
+                "/pages/tradeOrder/index"
+        ));
+        items.add(buildTabBarItem(
+                "物流订单",
+                "/static/tabbar/logOrder_select.png",
+                "/static/tabbar/logOrder.png",
+                "/pages/logistics/order/index"
+        ));
+        items.add(buildTabBarItem(
+                "物流运单",
+                "/static/tabbar/waybill_select.png",
+                "/static/tabbar/waybill.png",
+                "/pages/logistics/waybill/index"
+        ));
+        items.add(buildTabBarItem(
+                "个人中心",
+                "/static/tabbar/my_select.png",
+                "/static/tabbar/my.png",
+                "/pages/myCenter/index"
+        ));
+        return items;
+
+    }
+
     private List<LoginResVo1.TabBarItem> buildSellerTabBar() {
         List<LoginResVo1.TabBarItem> items = new ArrayList<>();
         items.add(buildTabBarItem(

sckw-modules-api/sckw-system-api/src/main/java/com/sckw/system/api/model/dto/req/RegisterReqDto.java

@@ -1,5 +1,6 @@
 package com.sckw.system.api.model.dto.req;
 
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
 import java.io.Serial;
@@ -55,6 +56,9 @@ public class RegisterReqDto implements Serializable {
      * 当前使用系统专场标识
      */
     private String special;
-
+    /**
+     * 企业类型 多个类型用","隔开
+     */
+    private String entTypes;
 
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsEnterpriseService.java

@@ -836,6 +836,7 @@ public class KwsEnterpriseService {
             registerReqDto.setPhone(reqVo.getPhone());
             registerReqDto.setIsMain(Global.YES);
             registerReqDto.setSystemType(SystemTypeEnum.COMPANY.getCode());
+            registerReqDto.setEntTypes(reqVo.getEntTypes());
             RegisterResDto register = kwsUserService.register(registerReqDto);
 
             EntRegisterReqVo entRegisterReqVo = new EntRegisterReqVo();

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsUserService.java

@@ -243,7 +243,16 @@ public class KwsUserService {
                 throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.MENU_NOT_EXISTS);
             }
             kwsMenus = kwsMenus.stream().filter(item -> item.getClientType().equals(Global.NUMERICAL_TWO)).collect(Collectors.toList());
-            editRoleReqVo.setName(Global.MANAGE_NAME);
+
+            //企业属性 （1供应商，2采购商，34PL物流，43PL物流）
+            if (org.apache.commons.lang3.StringUtils.equals("1",reqDto.getEntTypes())){
+                editRoleReqVo.setName("供应商管理员");
+            }else if (org.apache.commons.lang3.StringUtils.equals("2",reqDto.getEntTypes())){
+                editRoleReqVo.setName("采购商管理员");
+            }else if (org.apache.commons.lang3.StringUtils.equals("3",reqDto.getEntTypes())){
+                editRoleReqVo.setName("物流商管理员");
+            }
+           // editRoleReqVo.setName(Global.MANAGE_NAME);
             editRoleReqVo.setCurrentUnitId(null);
             editRoleReqVo.setMenuIds(String.join(Global.COMMA, kwsMenus.stream().map(KwsMenu::getId).map(String::valueOf).toList()));
             editRoleReqVo.setVisiblePersonal(false);

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/repository/KwtWaybillOrderSubtaskRepository.java

@@ -65,13 +65,15 @@ public class KwtWaybillOrderSubtaskRepository extends ServiceImpl<KwtWaybillOrde
     }
 
     public IPage<KwtWaybillOrderSubtask> queryByPage( Set<Long> logOrderIds, Set<Long> billOrderIds,
-                                                     List<Integer> status,
+                                                     Integer status,
+                                                      List<Integer> waybillOrderStatus,
                                                      int pageNum,
                                                      int pageSize) {
         return page(new Page<>(pageNum, pageSize),
                 Wrappers.<KwtWaybillOrderSubtask>lambdaQuery()
                         .eq(BaseModel::getDelFlag,0)
-                        .in(CollectionUtils.isNotEmpty( status),KwtWaybillOrderSubtask::getStatus, status)
+                        .eq(Objects.nonNull( status),KwtWaybillOrderSubtask::getStatus, status)
+                        .in(CollectionUtils.isNotEmpty( waybillOrderStatus),KwtWaybillOrderSubtask::getStatus, waybillOrderStatus)
                         .in(CollectionUtils.isNotEmpty(logOrderIds),KwtWaybillOrderSubtask::getLOrderId, logOrderIds)
                         .in(CollectionUtils.isNotEmpty(billOrderIds),KwtWaybillOrderSubtask::getWOrderId, billOrderIds)
                         .orderByDesc(BaseModel::getUpdateTime)

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtWaybillOrderV1Service.java

@@ -3052,11 +3052,8 @@ public class KwtWaybillOrderV1Service {
         log.info("开始分页查询子运单信息，物流订单ID数量: {}, 运单ID数量: {}, 状态: {}", 
                 logOrderIds.size(), billOrderIds.size(), status);
         List<Integer> waybillOrderStatus = getWaybillOrderStatus();
-        if (Objects.nonNull( status)){
-            waybillOrderStatus = List.of(status);
-        }
         IPage<KwtWaybillOrderSubtask> page = waybillOrderSubtaskRepository.queryByPage(
-                logOrderIds, billOrderIds, waybillOrderStatus, req.getPageNum(), req.getPageSize());
+                logOrderIds, billOrderIds, status,waybillOrderStatus, req.getPageNum(), req.getPageSize());
 
         List<KwtWaybillOrderSubtask> records = page.getRecords();
         if (CollectionUtils.isEmpty(records)) {