From 04914f5b01fe29311100cf32551c1b60252986c2 Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Mon, 24 Jan 2022 00:03:05 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20#2518=E3=80=90=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E3=80=91=E8=8E=B7=E5=8F=96=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E7=9A=84=E5=AE=A1=E6=89=B9=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B7=B2=E9=80=80=E5=9B=9E=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../weixin/cp/bean/oa/WxCpApprovalDetail.java | 78 ------------------- .../cp/bean/oa/WxCpApprovalDetailResult.java | 67 ++++++++++++++++ .../weixin/cp/bean/oa/WxCpRecordSpStatus.java | 21 +++-- .../merchant/ClearOutInvoiceRequest.java | 2 - 4 files changed, 80 insertions(+), 88 deletions(-) delete mode 100644 weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApprovalDetail.java diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApprovalDetail.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApprovalDetail.java deleted file mode 100644 index cba31fc27..000000000 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApprovalDetail.java +++ /dev/null @@ -1,78 +0,0 @@ -package me.chanjar.weixin.cp.bean.oa; - -import com.google.gson.annotations.SerializedName; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -/** - * 审批申请详情 - * - * @author element - */ -@Data -public class WxCpApprovalDetail implements Serializable { - private static final long serialVersionUID = 1353393306564207170L; - - /** - * 审批编号 - */ - @SerializedName("sp_no") - private String spNo; - - /** - * 审批申请类型名称（审批模板名称） - */ - @SerializedName("sp_name") - private String spName; - - /** - * 申请单状态：1-审批中；2-已通过；3-已驳回；4-已撤销；6-通过后撤销；7-已删除；10-已支付 - */ - @SerializedName("sp_status") - private WxCpSpStatus spStatus; - - /** - * 审批模板id。可在“获取审批申请详情”、“审批状态变化回调通知”中获得，也可在审批模板的模板编辑页面链接中获得。 - */ - @SerializedName("template_id") - private String templateId; - - /** - * 审批申请提交时间,Unix时间戳 - */ - @SerializedName("apply_time") - private Long applyTime; - - /** - * 申请人信息 - */ - @SerializedName("applyer") - private WxCpApprovalApplier applier; - - /** - * 审批流程信息，可能有多个审批节点 - */ - @SerializedName("sp_record") - private WxCpApprovalRecord[] spRecords; - - /** - * 抄送信息，可能有多个抄送节点 - */ - @SerializedName("notifyer") - private WxCpOperator[] notifiers; - - /** - * 审批申请数据 - */ - @SerializedName("apply_data") - private WxCpApprovalApplyData applyData; - - /** - * 审批申请备注信息，可能有多个备注节点 - */ - @SerializedName("comments") - private List comments; - -} diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApprovalDetailResult.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApprovalDetailResult.java index fdbc096a5..2714cc95f 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApprovalDetailResult.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApprovalDetailResult.java @@ -4,6 +4,7 @@ import com.google.gson.annotations.SerializedName; import lombok.Data; import java.io.Serializable; +import java.util.List; /** * 审批申请详情响应结果 @@ -23,4 +24,70 @@ public class WxCpApprovalDetailResult implements Serializable { @SerializedName("info") private WxCpApprovalDetail info; + @Data + public static class WxCpApprovalDetail implements Serializable { + private static final long serialVersionUID = 1353393306564207170L; + + /** + * 审批编号 + */ + @SerializedName("sp_no") + private String spNo; + + /** + * 审批申请类型名称（审批模板名称） + */ + @SerializedName("sp_name") + private String spName; + + /** + * 申请单状态：1-审批中；2-已通过；3-已驳回；4-已撤销；6-通过后撤销；7-已删除；10-已支付 + */ + @SerializedName("sp_status") + private WxCpSpStatus spStatus; + + /** + * 审批模板id。可在“获取审批申请详情”、“审批状态变化回调通知”中获得，也可在审批模板的模板编辑页面链接中获得。 + */ + @SerializedName("template_id") + private String templateId; + + /** + * 审批申请提交时间,Unix时间戳 + */ + @SerializedName("apply_time") + private Long applyTime; + + /** + * 申请人信息 + */ + @SerializedName("applyer") + private WxCpApprovalApplier applier; + + /** + * 审批流程信息，可能有多个审批节点 + */ + @SerializedName("sp_record") + private WxCpApprovalRecord[] spRecords; + + /** + * 抄送信息，可能有多个抄送节点 + */ + @SerializedName("notifyer") + private WxCpOperator[] notifiers; + + /** + * 审批申请数据 + */ + @SerializedName("apply_data") + private WxCpApprovalApplyData applyData; + + /** + * 审批申请备注信息，可能有多个备注节点 + */ + @SerializedName("comments") + private List comments; + + } + } diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpRecordSpStatus.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpRecordSpStatus.java index 206a0aa04..055871e23 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpRecordSpStatus.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpRecordSpStatus.java @@ -1,14 +1,18 @@ package me.chanjar.weixin.cp.bean.oa; import com.google.gson.annotations.SerializedName; +import lombok.AllArgsConstructor; +import lombok.Getter; /** * 审批记录(节点)分支审批状态 - * - * 1-审批中；2-已同意；3-已驳回；4-已转审 + *

+ * 1-审批中；2-已同意；3-已驳回；4-已转审；11-已退回 * * @author element */ +@AllArgsConstructor +@Getter public enum WxCpRecordSpStatus { /** @@ -30,12 +34,13 @@ public enum WxCpRecordSpStatus { * 已转审 */ @SerializedName("4") - TURNED(4); + TURNED(4), + /** + * 已退回 + */ + @SerializedName("11") + WITHDRAWN(11); - private Integer status; - - private WxCpRecordSpStatus(Integer status) { - this.status = status; - } + private final Integer status; } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/ClearOutInvoiceRequest.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/ClearOutInvoiceRequest.java index 108e76ca2..d0d0f6a9a 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/ClearOutInvoiceRequest.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/ClearOutInvoiceRequest.java @@ -9,8 +9,6 @@ import java.io.Serializable; */ @Data public class ClearOutInvoiceRequest implements Serializable { - - private ClearOutInvoiceInfo invoiceinfo; @Data