修改日志打印

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

@@ -171,12 +171,13 @@ public class AuthServiceImpl implements IAuthService {
         List<LoginResVo1.TabBarItem> tabBar = buildAppTabBar(loginBase, null,1,loginRes.getEntTypes());
         if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(tabBar)) {
             loginRes.setTabBar(tabBar);
+            log.info("开始设置角色名称，当前用户：{}，当前企业类型：{}", loginRes.getAccount(), loginRes.getEntTypes());
             if (org.apache.commons.lang3.StringUtils.equals(loginRes.getEntTypes(), "1")  ) {
                 loginRes.setRoleName("供应商管理员");
             } else if (org.apache.commons.lang3.StringUtils.equals(loginRes.getEntTypes(), "2")) {
-                 loginRes.setRoleName("采购商管理员");
+                loginRes.setRoleName("采购商管理员");
             }else if (org.apache.commons.lang3.StringUtils.equals(loginRes.getEntTypes(), "3")) {
-                 loginRes.setRoleName("物流商管理员");
+                loginRes.setRoleName("物流商管理员");
             }
         }
         applyAppModulePermissions(loginRes, loginBase, null);
@@ -272,6 +273,14 @@ public class AuthServiceImpl implements IAuthService {
         List<LoginResVo1.TabBarItem> tabBar = buildAppTabBar(loginBase, user.getRoleName(),0,loginRes.getEntTypes());
         if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(tabBar)) {
             loginRes.setTabBar(tabBar);
+            log.info("开始设置角色名称，当前用户：{}，当前企业类型：{}", loginRes.getAccount(), loginRes.getEntTypes());
+            if (org.apache.commons.lang3.StringUtils.equals(loginRes.getEntTypes(), "1")  ) {
+                loginRes.setRoleName("供应商管理员");
+            } else if (org.apache.commons.lang3.StringUtils.equals(loginRes.getEntTypes(), "2")) {
+                loginRes.setRoleName("采购商管理员");
+            }else if (org.apache.commons.lang3.StringUtils.equals(loginRes.getEntTypes(), "3")) {
+                loginRes.setRoleName("物流商管理员");
+            }
         }
         applyAppModulePermissions(loginRes, loginBase, user.getRoleName());
         if (user.getSystemType().equals(SystemTypeEnum.MANAGE.getCode())) {
@@ -362,6 +371,14 @@ public class AuthServiceImpl implements IAuthService {
         List<LoginResVo1.TabBarItem> tabBar = buildAppTabBar(loginBase, user.getRoleName(),0,loginRes.getEntTypes());
         if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(tabBar)) {
             loginRes.setTabBar(tabBar);
+            log.info("开始设置角色名称，当前用户：{}，当前企业类型：{}", loginRes.getAccount(), loginRes.getEntTypes());
+            if (org.apache.commons.lang3.StringUtils.equals(loginRes.getEntTypes(), "1")  ) {
+                loginRes.setRoleName("供应商管理员");
+            } else if (org.apache.commons.lang3.StringUtils.equals(loginRes.getEntTypes(), "2")) {
+                loginRes.setRoleName("采购商管理员");
+            }else if (org.apache.commons.lang3.StringUtils.equals(loginRes.getEntTypes(), "3")) {
+                loginRes.setRoleName("物流商管理员");
+            }
         }
         applyAppModulePermissions(loginRes, loginBase, user.getRoleName());
         if (user.getSystemType().equals(SystemTypeEnum.MANAGE.getCode())) {
@@ -868,6 +885,14 @@ public class AuthServiceImpl implements IAuthService {
         List<LoginResVo1.TabBarItem> tabBar = buildAppTabBar(loginBase, null,1,loginRes.getEntTypes());
         if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(tabBar)) {
             loginRes.setTabBar(tabBar);
+            log.info("开始设置角色名称，当前用户：{}，当前企业类型：{}", loginRes.getAccount(), loginRes.getEntTypes());
+            if (org.apache.commons.lang3.StringUtils.equals(loginRes.getEntTypes(), "1")  ) {
+                loginRes.setRoleName("供应商管理员");
+            } else if (org.apache.commons.lang3.StringUtils.equals(loginRes.getEntTypes(), "2")) {
+                loginRes.setRoleName("采购商管理员");
+            }else if (org.apache.commons.lang3.StringUtils.equals(loginRes.getEntTypes(), "3")) {
+                loginRes.setRoleName("物流商管理员");
+            }
         }
         applyAppModulePermissions(loginRes, loginBase, null);
         return loginRes;
@@ -906,6 +931,14 @@ public class AuthServiceImpl implements IAuthService {
         List<LoginResVo1.TabBarItem> tabBar = buildAppTabBar(loginBase, user.getRoleName(),1,loginRes.getEntTypes());
         if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(tabBar)) {
             loginRes.setTabBar(tabBar);
+            log.info("开始设置角色名称，当前用户：{}，当前企业类型：{}", loginRes.getAccount(), loginRes.getEntTypes());
+            if (org.apache.commons.lang3.StringUtils.equals(loginRes.getEntTypes(), "1")  ) {
+                loginRes.setRoleName("供应商管理员");
+            } else if (org.apache.commons.lang3.StringUtils.equals(loginRes.getEntTypes(), "2")) {
+                loginRes.setRoleName("采购商管理员");
+            }else if (org.apache.commons.lang3.StringUtils.equals(loginRes.getEntTypes(), "3")) {
+                loginRes.setRoleName("物流商管理员");
+            }
         }
         applyAppModulePermissions(loginRes, loginBase, user.getRoleName());
         if (user.getSystemType().equals(SystemTypeEnum.MANAGE.getCode())) {
@@ -925,6 +958,7 @@ public class AuthServiceImpl implements IAuthService {
     }
 
     private void applyAppModulePermissions(LoginResVo1 loginRes, LoginBase loginBase, String roleName) {
+        roleName = loginRes.getRoleName();
         loginRes.setShowOrderStatisticsModule(Boolean.FALSE);
         loginRes.setShowSalesStatisticsModule(Boolean.FALSE);
         loginRes.setShowWalletModule(Boolean.FALSE);
@@ -933,9 +967,9 @@ public class AuthServiceImpl implements IAuthService {
         if (!isAppLogin(loginBase) || StringUtils.isBlank(roleName)) {
             return;
         }
-        boolean isSeller = containsAnyRole(roleName, "销售");
+        boolean isSeller = containsAnyRole(roleName, "销售","供应商管理员");
         boolean isFinance = containsAnyRole(roleName, "财务");
-        boolean isPurchase = containsAnyRole(roleName, "采购", "买家");
+        boolean isPurchase = containsAnyRole(roleName, "采购", "买家","采购商管理员");
         if (isSeller) {
             loginRes.setShowOrderStatisticsModule(Boolean.TRUE);
             loginRes.setShowSalesStatisticsModule(Boolean.TRUE);
@@ -968,6 +1002,7 @@ public class AuthServiceImpl implements IAuthService {
     }
 
     private List<LoginResVo1.TabBarItem> buildAppTabBar(LoginBase loginBase, String roleName,int flag,  String entTypeNames) {
+       log.info("当前用户角色：{}, 企业类型：{}", roleName, entTypeNames);
         if (!isAppLogin(loginBase)) {
             return List.of();
         }
@@ -1011,6 +1046,7 @@ public class AuthServiceImpl implements IAuthService {
             return buildLogisticsAdminTabBar();
         }
         if (isPurchaseAdmin){
+            log.info("用户角色包含系统管理员且企业属性为采购商，返回采购管理员TabBar");
             return buildPurchaseAdminTabBar();}
         return List.of();
     }

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/vo/res/QueryLogisticDetailResp.java

@@ -170,7 +170,17 @@ public class QueryLogisticDetailResp implements Serializable {
         @Schema(description = "合同状态描述")
         private String contractStatusDesc;
 
-
+        /**
+         * 结算方式 (1普通结算，2预付制结算)
+         */
+        @NotNull(message = "结算方式不能为空")
+        @Schema(description = "结算方式 (1普通结算，2记账模式)")
+        private Integer settlement;
+        /**
+         * 结算方式描述
+         */
+        @Schema(description = "结算方式描述")
+        private String settlementDesc;
     }
     @Data
     public static class TradeGoodsInfo implements Serializable{

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/operateService/KwcContractLogisticsService.java

@@ -1600,6 +1600,8 @@ public class KwcContractLogisticsService {
         tradeBaseInfo.setCommonPrice(logistics.getCommonPrice().compareTo(new BigDecimal("0.00"))==0 ? null: logistics.getCommonPrice());
         tradeBaseInfo.setContractStatus(String.valueOf(logistics.getStatus()));
         tradeBaseInfo.setContractStatusDesc(ContractStatusEnum.getNameByCode(logistics.getStatus()));
+        tradeBaseInfo.setSettlement(logistics.getSettlement());
+        tradeBaseInfo.setSettlementDesc(Objects.equals(1, logistics.getSettlement()) ? "普通结算" : "记账模式");
 
 
         queryLogisticListResp.setBaseInfo(tradeBaseInfo);