FullCardClient/src/main/java/com/zhongshu/card/client/model/pay/RechargeSearchParam.java

@@ -16,6 +16,15 @@ public class RechargeSearchParam {
     @Schema(description = "用户名")
     private String userName;
 
+    @Schema(description = "用户编号")
+    private String userCode;
+
+    @Schema(description = "机构名称")
+    private String userOrgName;
+
+    @Schema(description = "部门名称")
+    private String departmentName;
+
     @Schema(description = "支付方式")
     private PaymentType paymentType;
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/pay/impl/BalanceRechargeOrderDaoImpl.java

@@ -115,6 +115,20 @@ public class BalanceRechargeOrderDaoImpl implements BalanceRechargeOrderDaoExten
             criteria.and("userName").regex(namePattern);
         }
 
+        if (StringUtils.isNotBlank(param.getUserCode())){
+            criteria.and("storeUserInfo.code").is(param.getUserCode());
+        }
+
+        if (StringUtils.isNotBlank(param.getUserOrgName())){
+            Pattern userOrgNamePattern = Pattern.compile("^.*" + param.getUserOrgName() + ".*$");
+            criteria.and("storeUserInfo.orgName").regex(userOrgNamePattern);
+        }
+
+        if (StringUtils.isNotBlank(param.getDepartmentName())){
+            Pattern departmentNamePattern = Pattern.compile("^.*" + param.getDepartmentName() + ".*$");
+            criteria.and("storeUserInfo.departmentName").regex(departmentNamePattern);
+        }
+
         if (param.getPaymentType()!=null){
             criteria.and("paymentType").is(param.getPaymentType());
         }

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/pay/BalanceRechargeOrder.java

@@ -3,6 +3,7 @@ package com.zhongshu.card.server.core.domain.pay;
 import com.github.microservice.components.data.mongo.mongo.domain.SuperEntity;
 import com.github.microservice.types.payment.PaymentChannelType;
 import com.github.microservice.types.payment.PaymentType;
+import com.zhongshu.card.client.model.org.orgUser.UserOrgStoreModel;
 import com.zhongshu.card.client.type.RechargeType;
 import com.zhongshu.card.client.type.payAccount.RechargeOrderStatus;
 import com.zhongshu.card.server.core.domain.org.UserAccount;
@@ -33,6 +34,9 @@ public class BalanceRechargeOrder extends SuperEntity {
     @DBRef(lazy = true)
     private UserAccount userAccount;
 
+    @Schema(description = "用户在机构的信息和基本信息")
+    private UserOrgStoreModel storeUserInfo;
+
     @Schema(description = "支付时间")
     private Long payEndTime;
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/pay/BalancePayService.java

@@ -1,5 +1,6 @@
 package com.zhongshu.card.server.core.service.pay;
 
+import com.github.microservice.auth.client.service.OrganizationUserService;
 import com.github.microservice.components.data.base.util.PageEntityUtil;
 import com.github.microservice.core.util.JsonUtil;
 import com.github.microservice.core.util.bean.BeanUtil;
@@ -19,10 +20,12 @@ import com.github.microservice.types.payment.PaymentChannelType;
 import com.github.microservice.types.payment.PaymentType;
 import com.zhongshu.card.client.model.mqtt.SendMessageModel;
 import com.zhongshu.card.client.model.org.UserCountModel;
+import com.zhongshu.card.client.model.org.orgUser.UserOrgStoreModel;
 import com.zhongshu.card.client.model.pay.*;
 import com.zhongshu.card.client.model.wechat.MiniAppUserInfoVo;
 import com.zhongshu.card.client.type.payAccount.RechargeOrderStatus;
 import com.zhongshu.card.client.utils.DateUtils;
+import com.zhongshu.card.server.core.dao.org.OrganizationUserDao;
 import com.zhongshu.card.server.core.dao.org.UserCountDao;
 import com.zhongshu.card.server.core.dao.pay.BalanceRechargeOrderDao;
 import com.zhongshu.card.server.core.domain.org.UserAccount;
@@ -30,6 +33,7 @@ import com.zhongshu.card.server.core.domain.pay.BalanceRechargeOrder;
 import com.zhongshu.card.server.core.domain.pay.PayAccount;
 import com.zhongshu.card.server.core.service.base.SuperService;
 import com.zhongshu.card.server.core.service.mqtt.MqttServiceImpl;
+import com.zhongshu.card.server.core.service.org.OrganizationUserServiceImpl;
 import com.zhongshu.card.server.core.service.paySetting.OrgPayAccountService;
 import com.zhongshu.card.server.core.service.paySetting.ProjectPaySettingServiceImpl;
 import com.zhongshu.card.server.core.util.BeanUtils;
@@ -83,6 +87,9 @@ public class BalancePayService extends SuperService {
     @Autowired
     UserCountDao userCountDao;
 
+    @Autowired
+    OrganizationUserServiceImpl organizationUserService;
+
 
     /**
      * 下单并生成调用支付参数
@@ -119,8 +126,10 @@ public class BalancePayService extends SuperService {
         PayAccount payAccount = payAccountService.getUserChildren(param.getProjectOid(), param.getUserId(), param.getPaymentType().getChannelType());
         UserAccount userAccount = userCountDao.findTopByUserId(param.getUserId());
 
+        UserOrgStoreModel userOrgStoreModel = organizationUserService.getUserInProjectInfo(projectOid, userAccount);
         //创建订单
         BalanceRechargeOrder balanceRechargeOrder = new BalanceRechargeOrder();
+        balanceRechargeOrder.setStoreUserInfo(userOrgStoreModel);
         balanceRechargeOrder.setProjectOid(param.getProjectOid());
         balanceRechargeOrder.setUserId(param.getUserId());
         balanceRechargeOrder.setPaymentType(param.getPaymentType());