1、新增预结算单

2、新增正式结算单
3、调整IAM认证登录

blade-service/blade-system/src/main/java/org/springblade/system/feign/SysClient.java

@@ -25,6 +25,7 @@
  */
 package org.springblade.system.feign;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
@@ -63,6 +64,8 @@ public class SysClient implements ISysClient {
 
 	private final IRegionService regionService;
 
+	private final IFeeItemService feeItemService;
+
 	@Override
 	@GetMapping(MENU)
 	public R<Menu> getMenu(Long id) {
@@ -200,5 +203,14 @@ public class SysClient implements ISysClient {
 		return R.data(regionService.getById(code));
 	}
 
+	@Override
+	@GetMapping(FEE_ITEMS)
+	public R<List<FeeItem>> getFeeItems() {
+		return R.data(feeItemService.list(Wrappers.<FeeItem>lambdaQuery()
+			.eq(FeeItem::getStatus, 1)
+			.eq(FeeItem::getIsDeleted, 0)
+			.orderByAsc(FeeItem::getFeeCategory, FeeItem::getName)));
+	}
+
 
 }

blade-service/blade-system/src/main/java/org/springblade/system/feign/UserClient.java

@@ -108,6 +108,12 @@ public class UserClient implements IUserClient {
 		return R.data(service.submit(user));
 	}
 
+	@Override
+	@PostMapping(SAVE_IAM_USER)
+	public R<Boolean> saveIamUser(@RequestBody User user) {
+		return R.data(service.saveIamUser(user));
+	}
+
 	@Override
 	@PostMapping(REGISTER_USER)
 	public R<String> registerUser(User user) {

blade-service/blade-system/src/main/java/org/springblade/system/service/IUserService.java

@@ -280,6 +280,14 @@ public interface IUserService extends BaseService<User> {
 	 */
 	boolean registerUser(User user);
 
+	/**
+	 * 新建IAM统一身份认证用户（按可信租户落库）
+	 *
+	 * @param user 用户实体
+	 * @return 是否成功
+	 */
+	boolean saveIamUser(User user);
+
 	/**
 	 * 配置用户平台扩展信息（租户守卫校验用户归属）
 	 *

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/UserServiceImpl.java

@@ -74,6 +74,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.security.SecureRandom;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -549,6 +550,35 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 		return saveUser(user);
 	}
 
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public boolean saveIamUser(User user) {
+		if (AuthUtil.hasAuth()) {
+			throw new ServiceException("IAM用户创建仅允许统一身份认证流程调用!");
+		}
+		Tenant tenant = SysCache.getTenant(user.getTenantId());
+		if (tenant == null || tenant.getId() == null) {
+			throw new ServiceException("租户信息错误!");
+		}
+		if (user.getUserType() == null) {
+			user.setUserType(UserType.WEB.getCategory());
+		}
+		if (StringUtil.isBlank(user.getRoleId())) {
+			user.setRoleId(StringPool.MINUS_ONE);
+		}
+		if (StringUtil.isBlank(user.getDeptId())) {
+			user.setDeptId(StringPool.MINUS_ONE);
+		}
+		if (StringUtil.isBlank(user.getPostId())) {
+			user.setPostId(StringPool.MINUS_ONE);
+		}
+		user.setIsOa(1);
+		user.setSyncTime(new Date());
+		user.setStatus(StatusType.ACTIVE.getType());
+		applyUserDefaults(user);
+		return saveUser(user);
+	}
+
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public boolean updatePlatform(Long userId, Integer userType, String userExt) {