更新！11

FullCardClient/src/main/java/com/zhongshu/card/client/model/org/orgUser/UserOrgStoreModel.java

@@ -0,0 +1,43 @@
+package com.zhongshu.card.client.model.org.orgUser;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * 用户在项目中的信息
+ * @author TRX
+ * @date 2025/3/26
+ */
+@Data
+public class UserOrgStoreModel {
+
+    @Schema(description = "用户userId")
+    private String userId;
+
+    @Schema(description = "用户名称")
+    private String userName;
+
+    @Schema(description = "用户电话")
+    private String phone;
+
+    @Schema(description = "用户关联的机构")
+    private String orgId;
+
+    @Schema(description = "用户关联的结构名称")
+    private String orgName;
+
+    @Schema(description = "用户编号")
+    private String code;
+
+    @Schema(description = "部门id")
+    private String departmentId;
+
+    @Schema(description = "部门名称")
+    private String departmentName;
+
+    @Schema(description = "职位ID")
+    private String positionId;
+
+    @Schema(description = "职位名称")
+    private String positionName;
+}

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/base/SuperMain.java

@@ -21,6 +21,9 @@ public class SuperMain extends SuperEntity {
     @Schema(description = "所属项目oid")
     private String projectOid;
 
+    @Schema(description = "所属项目的code")
+    private String projectCode;
+
     @Schema(description = "数据主题的oid")
     private String aboutOid;
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/payment/ExpenseFlow.java

@@ -9,6 +9,7 @@ import com.github.microservice.types.deviceUse.OrderFromType;
 import com.github.microservice.types.payment.ChargeableType;
 import com.github.microservice.types.payment.PaymentDeviceType;
 import com.github.microservice.types.payment.PaymentType;
+import com.zhongshu.card.client.model.org.orgUser.UserOrgStoreModel;
 import com.zhongshu.card.client.model.school.AreaSimpleModel;
 import com.zhongshu.card.client.type.RefundState;
 import com.zhongshu.card.client.type.payment.SettlementState;
@@ -110,6 +111,9 @@ public class ExpenseFlow extends SuperMain {
     @DBRef(lazy = true)
     private UserAccount userAccount;
 
+    @Schema(description = "")
+    private UserOrgStoreModel storeUserInfo;
+
     //-----------------------关联的设备信息 start--------------------
 
     @Schema(description = "是否是设备订单")
@@ -124,9 +128,6 @@ public class ExpenseFlow extends SuperMain {
     @Schema(description = "设备所属区域信息")
     private AreaSimpleModel area;
 
-    @Schema(description = "所属项目的code")
-    private String projectCode;
-
     @Schema(description = "订单所属的商户")
     private String shopOid;
 
@@ -134,10 +135,10 @@ public class ExpenseFlow extends SuperMain {
     @Schema(description = "是否已关闭")
     private Boolean isClosed = Boolean.FALSE;
 
-    @Schema(description = "")
+    @Schema(description = "关闭订单的用户userId")
     private String closeUserId;
 
-    @Schema(description = "")
+    @Schema(description = "关闭订单的原因")
     private String closeReason;
 
     @Schema(description = "关闭时间")

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/org/OrganizationUserServiceImpl.java

@@ -16,6 +16,7 @@ import com.zhongshu.card.client.model.org.*;
 import com.zhongshu.card.client.model.org.orgUser.OrganizationUserAuditParam;
 import com.zhongshu.card.client.model.org.orgUser.OrganizationUserSearch;
 import com.zhongshu.card.client.model.org.orgUser.OrganizationUserSimpleModel;
+import com.zhongshu.card.client.model.org.orgUser.UserOrgStoreModel;
 import com.zhongshu.card.client.model.org.register.UserCountRegisterParam;
 import com.zhongshu.card.client.model.orgModel.OrgBindUserAllParam;
 import com.zhongshu.card.client.model.paySetting.paySetting.OrgPayShowSettingModel;
@@ -1171,6 +1172,34 @@ public class OrganizationUserServiceImpl extends SuperService {
         return null;
     }
 
+    public UserOrgStoreModel getUserInProjectInfo(String projectOid, UserAccount userAccount) {
+        UserOrgStoreModel storeModel = new UserOrgStoreModel();
+        OrganizationUser organizationUser = getUserTopInProjectBindOrgUserInfo(projectOid, userAccount);
+        if (storeModel != null) {
+            storeModel.setUserId(userAccount.getUserId());
+            storeModel.setUserName(userAccount.getName());
+            storeModel.setPhone(userAccount.getPhone());
+
+            Organization organization = organizationUser.getOrganization();
+            if (ObjectUtils.isNotEmpty(organization)) {
+                storeModel.setOrgId(organization.getOid());
+                storeModel.setOrgName(organization.getName());
+            }
+            storeModel.setCode(organization.getCode());
+            Department department = organizationUser.getDepartment();
+            if (ObjectUtils.isNotEmpty(department)) {
+                storeModel.setDepartmentId(department.getId());
+                storeModel.setDepartmentName(department.getName());
+            }
+            DictInfo position = organizationUser.getPosition();
+            if (ObjectUtils.isNotEmpty(position)) {
+                storeModel.setPositionId(position.getId());
+                storeModel.setPositionName(position.getName());
+            }
+        }
+        return storeModel;
+    }
+
     /**
      * 转换机构用户信息（基本信息 角色  部门）
      *

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/orgManager/OrganizationManagerServiceImpl.java

@@ -40,16 +40,16 @@ import java.util.stream.Collectors;
 public class OrganizationManagerServiceImpl extends SuperService {
 
     @Autowired
-    OrganizationDao organizationDao;
+    private OrganizationDao organizationDao;
 
     @Autowired
-    RegionDao regionDao;
+    private RegionDao regionDao;
 
     @Autowired
-    OrganizationRelationDao organizationRelationDao;
+    private OrganizationRelationDao organizationRelationDao;
 
     @Autowired
-    OrganizationServiceImpl organizationServiceImpl;
+    private OrganizationServiceImpl organizationServiceImpl;
 
     @Autowired
     private ProjectBindOrgServiceImpl projectBindOrgServiceImpl;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/ExpenseFlowServiceImpl.java

@@ -37,7 +37,6 @@ import com.zhongshu.card.client.type.RefundState;
 import com.zhongshu.card.client.type.StatisticType;
 import com.zhongshu.card.client.type.UserState;
 import com.zhongshu.card.client.type.payAccount.RechargeOrderStatus;
-import com.zhongshu.card.client.type.payment.OrderType;
 import com.zhongshu.card.client.type.payment.SettlementState;
 import com.zhongshu.card.client.type.school.CardState;
 import com.zhongshu.card.client.utils.DateUtils;
@@ -53,12 +52,12 @@ import com.zhongshu.card.server.core.domain.org.UserAccount;
 import com.zhongshu.card.server.core.domain.payment.ExpenseFlow;
 import com.zhongshu.card.server.core.domain.school.CardInfo;
 import com.zhongshu.card.server.core.httpRequest.ApiRequestService;
-import com.zhongshu.card.server.core.model.payment.ExpenseFlowUnionWithModel;
 import com.zhongshu.card.server.core.service.base.CommonService;
 import com.zhongshu.card.server.core.service.base.SuperService;
 import com.zhongshu.card.server.core.service.devices.DeviceInfoServiceImpl;
 import com.zhongshu.card.server.core.service.mqtt.MqttServiceImpl;
 import com.zhongshu.card.server.core.service.org.OrganizationServiceImpl;
+import com.zhongshu.card.server.core.service.org.OrganizationUserServiceImpl;
 import com.zhongshu.card.server.core.service.pay.WechatPayService;
 import com.zhongshu.card.server.core.service.permissVerify.DevicePermissVerifyService;
 import com.zhongshu.card.server.core.service.projectAbout.CardInfoServiceImpl;
@@ -130,6 +129,9 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
     @Autowired
     private CardInfoServiceImpl cardInfoService;
 
+    @Autowired
+    private OrganizationUserServiceImpl organizationUserService;
+
     /**
      * 创建流水
      *
@@ -402,6 +404,9 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
         }
         entity.setVerifyParamIsSuccess(Boolean.TRUE);
         entity.setVerifyParamMsg("参数验证成功");
+
+        // 冗余用户在项目的信息
+        entity.setStoreUserInfo(organizationUserService.getUserInProjectInfo(projectOid, entity.getUserAccount()));
     }
 
     /**
@@ -1006,7 +1011,7 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
     }
 
     public ResultContent pageOrder(Pageable pageable, ExpenseFlowSearchParam param) {
-        if (StringUtils.isNotEmpty(param.getProjectOid())){
+        if (StringUtils.isNotEmpty(param.getProjectOid())) {
             param.setProjectOid(getCurrentProjectOid());
         }
         Page<ExpenseFlow> expenseFlows = expenseFlowDao.pageOrder(pageable, param);
@@ -1017,7 +1022,7 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
         ExpenseFlowPageModel model = new ExpenseFlowPageModel();
         if (expenseFlow != null) {
             BeanUtils.copyProperties(expenseFlow, model);
-            if (StringUtils.isNotEmpty(expenseFlow.getRefundUserId())){
+            if (StringUtils.isNotEmpty(expenseFlow.getRefundUserId())) {
                 UserAccount refundUser = userCountDao.findTopByUserId(expenseFlow.getRefundUserId());
                 model.setRefundUserName(refundUser.getName());
             }
@@ -1031,7 +1036,7 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
         return ResultContent.buildContent(PageEntityUtil.concurrent2PageModel(page, this::toOrderUnionModel));
     }
 
-    private OrderUnionWithModel toOrderUnionModel(OrderUnionWithModel orderUnionWithModel){
+    private OrderUnionWithModel toOrderUnionModel(OrderUnionWithModel orderUnionWithModel) {
         if (StringUtils.isNotEmpty(orderUnionWithModel.getDeviceId())) {
             orderUnionWithModel.setDeviceInfo(deviceInfoService.getDeviceInfoModel(orderUnionWithModel.getDeviceId()));
         }