lsm/weixin-java-tools
1
0
Fork 0
mirror of https://gitee.com/binary/weixin-java-tools.git synced 2025-04-05 17:38:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🎨 优化部分代码

Browse Source
This commit is contained in:
Binary Wang 2022-04-21 15:07:56 +08:00
parent fa5cac5e5b
commit aea370503e
22 changed files with 87 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMerchantInvoiceService.java
View File

@ -13,7 +13,7 @@ import me.chanjar.weixin.mp.bean.invoice.merchant.*;
* 73100: 开票平台错误
* <p>
* 流程文档: https://developers.weixin.qq.com/doc/offiaccount/WeChat_Invoice/E_Invoice/Vendor_and_Invoicing_Platform_Mode_Instruction.html
* 接口文档: https://developers.weixin.qq.com/doc/offiaccount/WeChat_Invoice/E_Invoice/Vendor_API_List.html
* 接口文档: <a href="https://developers.weixin.qq.com/doc/offiaccount/WeChat_Invoice/E_Invoice/Vendor_API_List.html">https://developers.weixin.qq.com/doc/offiaccount/WeChat_Invoice/E_Invoice/Vendor_API_List.html</a>
*
* @author Mario Luo
*/

5
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/ClearOutInvoiceRequest.java
View File

@ -6,13 +6,18 @@ import java.io.Serializable;
/**
* 发票充红请求参数
*
* @author Mario Luo
*/
@Data
public class ClearOutInvoiceRequest implements Serializable {
private static final long serialVersionUID = 36469746428007271L;
private ClearOutInvoiceInfo invoiceinfo;
@Data
public static class ClearOutInvoiceInfo implements Serializable {
private static final long serialVersionUID = -9119257155033644495L;
/**
* 用户的openid 用户知道是谁在开票

6
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/InvoiceAuthDataRequest.java
View File

@ -1,23 +1,29 @@
package me.chanjar.weixin.mp.bean.invoice.merchant;
import com.google.gson.annotations.SerializedName;
import lombok.Data;
import java.io.Serializable;
/**
* 获取电子开票用户授权数据
*
* @author Mario Luo
*/
@Data
public class InvoiceAuthDataRequest implements Serializable {
private static final long serialVersionUID = -7423619297443219650L;
/**
* 开票平台在微信的标识号，商户需要找开票平台提供
*/
@SerializedName("s_pappid")
private String sPappid;
/**
* 订单id，在商户内单笔开票请求的唯一识别号
*/
@SerializedName("order_id")
private String orderId;
}

11
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/InvoiceAuthDataResult.java
View File

@ -7,9 +7,12 @@ import java.util.List;
/**
* 用户开票认证信息返回结果DTO
*
* @author Mario Luo
*/
@Data
public class InvoiceAuthDataResult implements Serializable {
private static final long serialVersionUID = 7199243456761896912L;
/**
* 订单授权状态，当errcode为0时会出现
@ -28,6 +31,8 @@ public class InvoiceAuthDataResult implements Serializable {
@Data
public static class UserAuthInfo implements Serializable {
private static final long serialVersionUID = 3132380567762544927L;
/**
* 个人抬头
*/
@ -41,6 +46,8 @@ public class InvoiceAuthDataResult implements Serializable {
@Data
public static class UserField implements Serializable {
private static final long serialVersionUID = 2114368427010646381L;
private String title;
private String phone;
private String email;
@ -49,6 +56,8 @@ public class InvoiceAuthDataResult implements Serializable {
@Data
public static class BizField implements Serializable {
private static final long serialVersionUID = 1799355181972008881L;
private String title;
private String taxNo;
private String addr;
@ -60,6 +69,8 @@ public class InvoiceAuthDataResult implements Serializable {
@Data
public static class KeyValuePair implements Serializable {
private static final long serialVersionUID = -1068075389526145791L;
private String key;
private String value;
}

7
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/InvoiceAuthPageRequest.java
View File

@ -1,23 +1,29 @@
package me.chanjar.weixin.mp.bean.invoice.merchant;
import com.google.gson.annotations.SerializedName;
import lombok.Data;
import java.io.Serializable;
/**
* 获取授权地址的输入参数
*
* @author Mario Luo
*/
@Data
public class InvoiceAuthPageRequest implements Serializable {
private static final long serialVersionUID = -804002889404266929L;
/**
* 开票平台在微信的标识号，商户需要找开票平台提供
*/
@SerializedName("s_pappid")
private String sPappid;
/**
* 订单id，在商户内单笔开票请求的唯一识别号
*/
@SerializedName("order_id")
private String orderId;
/**
@ -33,6 +39,7 @@ public class InvoiceAuthPageRequest implements Serializable {
/**
* 授权成功后跳转页面。本字段只有在source为H5的时候需要填写，引导用户在微信中进行下一步流程。app开票因为从外部app拉起微信授权页，授权完成后自动回到原来的app，故无需填写。
*/
@SerializedName("redirect_url")
private String redirectUrl;
/**

3
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/InvoiceAuthPageResult.java
View File

@ -6,9 +6,12 @@ import java.io.Serializable;
/**
* 获取授权链接返回结果DTO
*
* @author Mario Luo
*/
@Data
public class InvoiceAuthPageResult implements Serializable {
private static final long serialVersionUID = 2922797121045894425L;
/**
* 授权页地址

12
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/InvoiceAuthPageSetting.java
View File

@ -5,19 +5,27 @@ import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* @author Mario Luo
*/
@Data
public class InvoiceAuthPageSetting implements Serializable {
private static final long serialVersionUID = 4585269585619597753L;
private AuthField authField;
@Data
public static class AuthField implements Serializable {
private static final long serialVersionUID = 7341329271546930795L;
private UserField userField;
private BizField bizField;
}
@Data
public static class UserField implements Serializable {
private static final long serialVersionUID = -128178697394854697L;
private Integer showTitle;
private Integer showPhone;
private Integer showEmail;
@ -28,6 +36,8 @@ public class InvoiceAuthPageSetting implements Serializable {
@Data
public static class BizField implements Serializable {
private static final long serialVersionUID = -8277885344416192644L;
private Integer showTitle;
private Integer showTaxNo;
private Integer showAddr;
@ -45,6 +55,8 @@ public class InvoiceAuthPageSetting implements Serializable {
@Data
public static class CustomField implements Serializable {
private static final long serialVersionUID = -3838241240210071209L;
/**
* 字段名
*/

6
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/InvoiceRejectRequest.java
View File

@ -1,23 +1,29 @@
package me.chanjar.weixin.mp.bean.invoice.merchant;
import com.google.gson.annotations.SerializedName;
import lombok.Data;
import java.io.Serializable;
/**
* 拒绝开票请求参数
*
* @author Mario Luo
*/
@Data
public class InvoiceRejectRequest implements Serializable {
private static final long serialVersionUID = -5303749544133451879L;
/**
* 开票平台标示
*/
@SerializedName("s_pappid")
private String sPappid;
/**
* 订单id
*/
@SerializedName("order_id")
private String orderId;
/**

5
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/InvoiceResult.java
View File

@ -6,9 +6,12 @@ import java.io.Serializable;
/**
* 电子发票信息查询结果
*
* @author Mario Luo
*/
@Data
public class InvoiceResult implements Serializable {
private static final long serialVersionUID = 7896888653261133444L;
/**
* 发票相关信息
@ -17,6 +20,8 @@ public class InvoiceResult implements Serializable {
@Data
public static class InvoiceDetail implements Serializable {
private static final long serialVersionUID = -3465795497702734126L;
/**
* 发票流水号
*/

7
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/MakeOutInvoiceRequest.java
View File

@ -7,9 +7,12 @@ import java.util.List;
/**
* 开票信息请求参数
*
* @author Mario Luo
*/
@Data
public class MakeOutInvoiceRequest implements Serializable {
private static final long serialVersionUID = 2089481479917841771L;
private InvoiceInfo invoiceinfo;
@ -18,6 +21,8 @@ public class MakeOutInvoiceRequest implements Serializable {
*/
@Data
public static class InvoiceInfo implements Serializable {
private static final long serialVersionUID = 8492738482767944634L;
/**
* 维修openid
*/
@ -145,6 +150,8 @@ public class MakeOutInvoiceRequest implements Serializable {
*/
@Data
public static class InvoiceDetailItem implements Serializable {
private static final long serialVersionUID = 2981363715996297681L;
/**
* 发票性质
*/

5
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/MerchantInvoicePlatformInfo.java
View File

@ -1,14 +1,18 @@
package me.chanjar.weixin.mp.bean.invoice.merchant;
import com.google.gson.annotations.SerializedName;
import lombok.Data;
import java.io.Serializable;
/**
* 商户的开票平台信息
*
* @author Mario Luo
*/
@Data
public class MerchantInvoicePlatformInfo implements Serializable {
private static final long serialVersionUID = -2388214622725430530L;
/**
* 微信支付商户号
@ -18,5 +22,6 @@ public class MerchantInvoicePlatformInfo implements Serializable {
/**
* 为该商户提供开票服务的开票平台 id ，由开票平台提供给商户
*/
@SerializedName("s_pappid")
private String sPappid;
}

3
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/MerchantInvoicePlatformInfoWrapper.java
View File

@ -6,9 +6,12 @@ import java.io.Serializable;
/**
* 设置商户联系信息和发票过时时间参数
*
* @author Mario Luo
*/
@Data
public class MerchantInvoicePlatformInfoWrapper implements Serializable {
private static final long serialVersionUID = 7994013978048258576L;
private MerchantInvoicePlatformInfo paymchInfo;

1
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/reimburse/InvoiceBatchRequest.java
View File

@ -22,7 +22,6 @@ import java.util.List;
@NoArgsConstructor
@AllArgsConstructor
public class InvoiceBatchRequest implements Serializable {
private static final long serialVersionUID = -9121443117105107231L;
/**

5
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/reimburse/InvoiceCommodityInfo.java
View File

@ -2,6 +2,8 @@ package me.chanjar.weixin.mp.bean.invoice.reimburse;
import lombok.Data;
import java.io.Serializable;
/**
* <pre>
* 发票商品信息
@ -10,7 +12,8 @@ import lombok.Data;
* @since 2021-03-23
*/
@Data
public class InvoiceCommodityInfo {
public class InvoiceCommodityInfo implements Serializable {
private static final long serialVersionUID = 5139576099614652523L;
/**
* 项目（商品）名称

4
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/reimburse/InvoiceInfoRequest.java
View File

@ -22,10 +22,8 @@ import java.io.Serializable;
@NoArgsConstructor
@AllArgsConstructor
public class InvoiceInfoRequest implements Serializable {
private static final long serialVersionUID = 7854633127026139444L;
/**
* 发票卡券的card_id
* <pre>
@ -45,8 +43,6 @@ public class InvoiceInfoRequest implements Serializable {
@SerializedName("encrypt_code")
private String encryptCode;
public String toJson() {
return WxMpGsonBuilder.create().toJson(this);
}

5
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/reimburse/InvoiceInfoResponse.java
View File

@ -7,17 +7,20 @@ import lombok.Data;
import me.chanjar.weixin.common.util.json.GsonParser;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
import java.io.Serializable;
import java.util.List;
/**
* <pre>
* 查询报销发票信息响应对象
* </pre>
*
* @author <a href="https://github.com/mr-xiaoyu">xiaoyu</a>
* @since 2021-03-23
*/
@Data
public class InvoiceInfoResponse {
public class InvoiceInfoResponse implements Serializable {
private static final long serialVersionUID = -4835089274990526299L;
/**
* 发票ID

5
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/reimburse/InvoiceUserInfo.java
View File

@ -3,17 +3,20 @@ package me.chanjar.weixin.mp.bean.invoice.reimburse;
import com.google.gson.annotations.SerializedName;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* <pre>
* 用户可在发票票面看到的主要信息
* </pre>
*
* @author <a href="https://github.com/mr-xiaoyu">xiaoyu</a>
* @since 2021-03-23
*/
@Data
public class InvoiceUserInfo {
public class InvoiceUserInfo implements Serializable {
private static final long serialVersionUID = 4970283608560240497L;
/**
* 发票加税合计金额，以分为单位

1
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/reimburse/UpdateInvoiceStatusRequest.java
View File

@ -21,7 +21,6 @@ import java.io.Serializable;
@NoArgsConstructor
@AllArgsConstructor
public class UpdateInvoiceStatusRequest implements Serializable {
private static final long serialVersionUID = -4122242332481909977L;

1
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/reimburse/UpdateStatusBatchRequest.java
View File

@ -22,7 +22,6 @@ import java.util.List;
@NoArgsConstructor
@AllArgsConstructor
public class UpdateStatusBatchRequest implements Serializable {
private static final long serialVersionUID = 7016357689566912199L;
/**
* 用户openid

2
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/PartnerTransactionsRequest.java
View File

@ -11,7 +11,7 @@ import java.util.List;
/**
* 普通支付（电商收付通）API
* <pre>
* 文档地址:https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/pages/e_transactions.shtml
* 文档地址:<a href="https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/pages/e_transactions.shtml">https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/pages/e_transactions.shtml</a>
* </pre>
*
* @author cloudX

2
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/PartnerTransactionsResult.java
View File

@ -12,10 +12,12 @@ import java.util.List;
* <pre>
* 文档地址：https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/ecommerce/e_transactions/chapter3_5.shtml
* </pre>
* @author cloudX
*/
@Data
@NoArgsConstructor
public class PartnerTransactionsResult implements Serializable {
private static final long serialVersionUID = 2371448241965534820L;
/**
* <pre>

2
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/marketing/transfer/PartnerTransferRequest.java
View File

@ -10,7 +10,7 @@ import java.util.List;
/**
* 发起批量转账API
* <pre>
* 文档地址:https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/pay/transfer_partner/chapter3_1.shtml
* 文档地址:<a href="https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/pay/transfer_partner/chapter3_1.shtml">https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/pay/transfer_partner/chapter3_1.shtml</a>
* </pre>
*
* @author xiaoqiang