转账审批

gic-platform-finance-api/src/main/java/com/gic/finance/constant/EnterprisePlatformTypeEnum.java

+package com.gic.finance.constant;
+/**
+ * 商户类型
+ * @ClassName: EnterprisePlatformTypeEnum

+ * @Description: 

+ * @author guojuxing

+ * @date 2019/8/13 10:54 AM

+ */
+public enum EnterprisePlatformTypeEnum {
+
+    GIC(1, "GIC"),
+    HAO_BAN(2, "好办");
+
+    private int code;
+    private String message;
+
+    private EnterprisePlatformTypeEnum(int code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public static String getMessageByCode(Integer code) {
+        if (code == null) {
+            return "未知";
+        }
+        for (EnterprisePlatformTypeEnum typeEnum : values()) {
+            if (code.intValue() == typeEnum.getCode()) {
+                return typeEnum.getMessage();
+            }
+        }
+        return "未知";
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+}

gic-platform-finance-api/src/main/java/com/gic/finance/constant/InitiatorTypeEnum.java

+package com.gic.finance.constant;
+/**
+ * 发起审批方类型
+ * @ClassName: InitiatorTypeEnum

+ * @Description: 

+ * @author guojuxing

+ * @date 2019/8/13 10:56 AM

+ */
+public enum InitiatorTypeEnum {
+    ENTERPRISE(1, "商户"),
+    OPERATION(2, "运维后台");
+
+    private int code;
+    private String message;
+
+    private InitiatorTypeEnum(int code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public static String getMessageByCode(Integer code) {
+        if (code == null) {
+            return "未知";
+        }
+        for (InitiatorTypeEnum typeEnum : values()) {
+            if (code.intValue() == typeEnum.getCode()) {
+                return typeEnum.getMessage();
+            }
+        }
+        return "未知";
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+}

gic-platform-finance-api/src/main/java/com/gic/finance/qo/TransferListQueryQO.java

+package com.gic.finance.qo;
+
+import com.gic.enterprise.qo.PageQO;
+/**
+ * 转账审批列表查询条件
+ * @ClassName: TransferListQueryQO

+ * @Description: 

+ * @author guojuxing

+ * @date 2019/8/13 11:23 AM

+ */
+public class TransferListQueryQO extends PageQO{
+    private static final long serialVersionUID = -1713673945449020165L;
+    /**
+     * 输入流水号/商户名称/公司名称/验证码
+     */
+    private String search;
+    /**
+     * 审批状态
+     */
+    private Integer approvalStatus;
+
+    /**
+     * 商户
+     */
+    private Integer enterpriseId;
+    /**
+     * 平台类型 1：GIC 2：好办
+     */
+    private Integer platformType;
+
+
+    public String getSearch() {
+        return search;
+    }
+
+    public void setSearch(String search) {
+        this.search = search;
+    }
+
+    public Integer getApprovalStatus() {
+        return approvalStatus;
+    }
+
+    public void setApprovalStatus(Integer approvalStatus) {
+        this.approvalStatus = approvalStatus;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public Integer getPlatformType() {
+        return platformType;
+    }
+
+    public void setPlatformType(Integer platformType) {
+        this.platformType = platformType;
+    }
+}

gic-platform-finance-api/src/main/java/com/gic/finance/service/TransferAccountsApprovalApiService.java

@@ -3,6 +3,7 @@ package com.gic.finance.service;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.finance.dto.TransferAccountsApprovalDTO;
+import com.gic.finance.qo.TransferListQueryQO;
 
 /**
  * 转账审批
@@ -34,6 +35,16 @@ public interface TransferAccountsApprovalApiService {
     ServiceResponse<TransferAccountsApprovalDTO> getById(Integer transferApprovalId);
 
     /**
+     * 根据订单流水号查询单条数据
+     * @Title: getByOrderNumber

+     * @Description:
+    
 * @author guojuxing
+     * @param orderNumber

+     * @return  com.gic.api.base.commons.ServiceResponse<com.gic.finance.dto.TransferAccountsApprovalDTO>

+    
 */
+    ServiceResponse<TransferAccountsApprovalDTO> getByOrderNumber(String orderNumber);
+
+    /**
      * 审批通过操作
      * @Title: agreeApproval

      * @Description: 
@@ -55,20 +66,22 @@ public interface TransferAccountsApprovalApiService {
     ServiceResponse<Void> rejectApproval(Integer transferApprovalId);
 
     /**
+     * 取消审批
+     * @Title: cancelApproval

+     * @Description:
+    
 * @author guojuxing
+     * @param transferApprovalId

+     * @return  com.gic.api.base.commons.ServiceResponse<java.lang.Void>

+    
 */
+    ServiceResponse<Void> cancelApproval(Integer transferApprovalId);
+
+    /**
+     * 分页查询
      * @Title: listTransferAccountsApproval

-     * @Description: 
-    
 * @author guojuxing 
-     * @param search
-     * @param approvalStatus
-     * @param enterpriseId
-     * @param pageNum
-     * @param pageSize

+     * @Description:
+    
 * @author guojuxing
+     * @param params

      * @return  com.gic.api.base.commons.ServiceResponse<com.gic.api.base.commons.Page<com.gic.finance.dto.TransferAccountsApprovalDTO>>

     
 */
-    ServiceResponse<Page<TransferAccountsApprovalDTO>> listTransferAccountsApproval(String search, Integer approvalStatus,
-                                                                                        Integer enterpriseId,
-                                                                                        Integer pageNum, Integer pageSize);
-
-    ServiceResponse<TransferAccountsApprovalDTO> getDetailById(Integer transferApprovalId);
-
+    ServiceResponse<Page<TransferAccountsApprovalDTO>> listTransferAccountsApproval(TransferListQueryQO params);
 }