FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/ExpenseFlowPageModel.java

@@ -5,6 +5,7 @@ import com.github.microservice.types.deviceUse.DeviceType;
 import com.github.microservice.types.payment.PaymentDeviceType;
 import com.github.microservice.types.payment.PaymentType;
 import com.zhongshu.card.client.model.base.SuperModel;
+import com.zhongshu.card.client.model.org.orgUser.UserOrgStoreModel;
 import com.zhongshu.card.client.model.school.AreaSimpleModel;
 import com.zhongshu.card.client.model.school.CardInfoModel;
 import com.zhongshu.card.client.model.school.CardInfoSimpleModel;
@@ -56,6 +57,9 @@ public class ExpenseFlowPageModel extends SuperModel {
     @Schema(description = "用户名称")
     private String userName;
 
+    @Schema(description = "用户在机构的信息和基本信息")
+    private UserOrgStoreModel storeUserInfo;
+
     @Schema(description = "消费机设备ID")
     private String deviceId;
 

FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/ExpenseFlowSearchParam.java

@@ -45,6 +45,15 @@ public class ExpenseFlowSearchParam {
     @Schema(description = "姓名")
     private String userName;
 
+    @Schema(description = "用户编号")
+    private String userCode;
+
+    @Schema(description = "机构名称")
+    private String userOrgName;
+
+    @Schema(description = "部门名称")
+    private String departmentName;
+
     @Schema(description = "设备编号")
     private String deviceId;
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/payment/impl/ExpenseFlowDaoImpl.java

@@ -377,6 +377,21 @@ public class ExpenseFlowDaoImpl extends BaseImpl implements ExpenseFlowDaoExtend
         if (param.getRefundStartTime() != null && param.getRefundEndTime() != null) {
             criteria.and("refundTime").gte(param.getRefundStartTime()).lte(param.getRefundEndTime());
         }
+
+        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);
+        }
+
         Query query = new Query(criteria);
         query.with(Sort.by(Sort.Direction.DESC, "createTime"));