Merge remote-tracking branch 'origin/master'

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

@@ -2,6 +2,7 @@ package com.zhongshu.card.client.model.pay;
 
 import com.github.microservice.types.payment.PaymentType;
 import com.zhongshu.card.client.model.org.UserCountModel;
+import com.zhongshu.card.client.model.org.orgUser.UserOrgStoreModel;
 import com.zhongshu.card.client.type.payAccount.RechargeOrderStatus;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -25,9 +26,32 @@ public class RechargeOrderModel {
     @Schema(description = "支付方式")
     private PaymentType paymentType;
 
+    @Schema(description = "支付方式str")
+    private String paymentTypeStr;
+
+    public String getPaymentTypeStr() {
+        if (paymentType != null) {
+            return paymentType.getRemark();
+        }
+        return "";
+    }
+
+    @Schema(description = "支付时间")
+    private Long payEndTime;
+
     @Schema(description = "订单状态")
     private RechargeOrderStatus status;
 
+    @Schema(description = "订单状态")
+    private RechargeOrderStatus statusStr;
+
+    public String getStatusStr() {
+        if (status != null) {
+            return status.getRemark();
+        }
+        return "";
+    }
+
     @Schema(description = "状态说明")
     private String statusDesc;
 
@@ -40,7 +64,8 @@ public class RechargeOrderModel {
     @Schema(description = "描述")
     private String description;
 
-    private UserCountModel userCountModel;
+    @Schema(description = "用户在机构的信息和基本信息")
+    private UserOrgStoreModel storeUserInfo;
 
     private String userName;
 }

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

@@ -25,14 +25,23 @@ public class RechargeSearchParam {
     @Schema(description = "部门名称")
     private String departmentName;
 
+    @Schema(description = "机构id")
+    private String orgId;
+
+    @Schema(description = "部门id")
+    private String departmentId;
+
     @Schema(description = "支付方式")
     private PaymentType paymentType;
 
     @Schema(description = "订单状态")
     private RechargeOrderStatus status;
 
-    @Schema(description = "金额")
-    private BigDecimal total;
+    @Schema(description = "支付金额最小")
+    private BigDecimal minPayAmount;
+
+    @Schema(description = "支付金额最大")
+    private BigDecimal maxPayAmount;
 
     @Schema(description = "订单号")
     private String orderNo;

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

@@ -73,6 +73,9 @@ public class ExpenseFlowPageModel extends SuperModel {
     @Schema(description = "是否退款")
     private Boolean isRefund;
 
+    @Schema(description = "退款订单号")
+    private String refundNo;
+
     @Schema(description = "退款状态")
     private RefundState refundState;
 

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

@@ -36,8 +36,11 @@ public class ExpenseFlowSearchParam {
     @Schema(description = "支付结束时间")
     private Long payEndTime;
 
-    @Schema(description = "支付金额")
-    private BigDecimal payAmount;
+    @Schema(description = "支付金额最小")
+    private BigDecimal minPayAmount;
+
+    @Schema(description = "支付金额最大")
+    private BigDecimal maxPayAmount;
 
     @Schema(description = "订单的总体状态，待付款、支付中、已支付、已退款")
     private OrderState orderState;
@@ -51,6 +54,12 @@ public class ExpenseFlowSearchParam {
     @Schema(description = "机构名称")
     private String userOrgName;
 
+    @Schema(description = "机构id")
+    private String orgId;
+
+    @Schema(description = "部门id")
+    private String departmentId;
+
     @Schema(description = "部门名称")
     private String departmentName;
 

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

@@ -129,6 +129,13 @@ public class BalanceRechargeOrderDaoImpl implements BalanceRechargeOrderDaoExten
             criteria.and("storeUserInfo.departmentName").regex(departmentNamePattern);
         }
 
+        if (StringUtils.isNotBlank(param.getOrgId())){
+            criteria.and("storeUserInfo.orgId").is(param.getOrgId());
+        }
+        if (StringUtils.isNotBlank(param.getDepartmentId())){
+            criteria.and("storeUserInfo.departmentId").is(param.getDepartmentId());
+        }
+
         if (param.getPaymentType()!=null){
             criteria.and("paymentType").is(param.getPaymentType());
         }
@@ -137,8 +144,16 @@ public class BalanceRechargeOrderDaoImpl implements BalanceRechargeOrderDaoExten
             criteria.and("status").is(param.getStatus());
         }
 
-        if (param.getTotal() != null){
-            criteria.and("total").gte(param.getTotal());
+        if (param.getMinPayAmount() != null && param.getMaxPayAmount() == null){
+            criteria.and("total").gte(param.getMinPayAmount());
+        }
+
+        if (param.getMinPayAmount()==null && param.getMaxPayAmount() != null){
+            criteria.and("total").lte(param.getMaxPayAmount());
+        }
+
+        if (param.getMaxPayAmount() != null && param.getMinPayAmount() != null){
+            criteria.and("total").gte(param.getMinPayAmount()).lte(param.getMaxPayAmount());
         }
 
         if (StringUtils.isNotEmpty(param.getOrderNo())){

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

@@ -317,8 +317,17 @@ public class ExpenseFlowDaoImpl extends BaseImpl implements ExpenseFlowDaoExtend
         }
 
         //支付金额
-        if (param.getPayAmount() != null){
-            criteria.and("payAmount").is(param.getPayAmount());
+
+        if (param.getMinPayAmount() != null && param.getMaxPayAmount() == null){
+            criteria.and("payAmount").gte(param.getMinPayAmount());
+        }
+
+        if (param.getMinPayAmount()==null && param.getMaxPayAmount() != null){
+            criteria.and("payAmount").lte(param.getMaxPayAmount());
+        }
+
+        if (param.getMaxPayAmount() != null && param.getMinPayAmount() != null){
+            criteria.and("payAmount").gte(param.getMinPayAmount()).lte(param.getMaxPayAmount());
         }
 
         //订单状态
@@ -387,11 +396,19 @@ public class ExpenseFlowDaoImpl extends BaseImpl implements ExpenseFlowDaoExtend
             criteria.and("storeUserInfo.orgName").regex(userOrgNamePattern);
         }
 
+        if (StringUtils.isNotBlank(param.getOrgId())){
+            criteria.and("storeUserInfo.orgId").is(param.getOrgId());
+        }
+
         if (StringUtils.isNotBlank(param.getDepartmentName())){
             Pattern departmentNamePattern = Pattern.compile("^.*" + param.getDepartmentName() + ".*$");
             criteria.and("storeUserInfo.departmentName").regex(departmentNamePattern);
         }
 
+        if (StringUtils.isNotBlank(param.getDepartmentId())){
+            criteria.and("storeUserInfo.departmentId").is(param.getDepartmentId());
+        }
+
         Query query = new Query(criteria);
         query.with(Sort.by(Sort.Direction.DESC, "createTime"));