This commit is contained in:
egzosn
2020-12-01 22:42:52 +08:00
parent 7e05435b1f
commit fc60b4553e
17 changed files with 42 additions and 70 deletions

View File

@@ -4,12 +4,12 @@ import java.util.Date;
import java.util.Map;
/**
* @description:账单接口
* 账单接口
* @author: faymanwang
* @email: 1057438332@qq.com
* @time: 2020/7/31 11:21
* email: 1057438332@qq.com
* time: 2020/7/31 11:21
*/
public interface WxBillService {
public Map<String, Object> downloadbill(Date billDate, String billType, String path);
Map<String, Object> downloadbill(Date billDate, String billType, String path);
}

View File

@@ -626,8 +626,9 @@ public class WxPayService extends BasePayService<WxPayConfigStorage> implements
/**
* GZIP解压缩
*
* @param input
* @return
* @param input 输入流账单
* @return 解压后输入流
* @throws IOException IOException
*/
public static InputStream uncompress(InputStream input) throws IOException {
ByteArrayOutputStream out = new ByteArrayOutputStream();

View File

@@ -11,9 +11,10 @@ import com.egzosn.pay.common.bean.CurType;
/**
* 微信退款结果
* @author Egan
* <pre></pre>
* <pre>
* email egzosn@gmail.com
* date 2020/8/16 21:29
* </pre>
*/
public class WxRefundResult extends BaseRefundResult {
@@ -123,7 +124,7 @@ public class WxRefundResult extends BaseRefundResult {
private BigDecimal refundFee;
/**
* 应结退款金额
* 去掉非充值代金券退款金额后的退款金额,退款金额=申请退款金额-非充值代金券退款金额,退款金额<=申请退款金额
* 去掉非充值代金券退款金额后的退款金额,退款金额=申请退款金额-非充值代金券退款金额,退款金额&lt;=申请退款金额
*/
@JSONField(name = "settlement_refund_fee")
private BigDecimal settlementRefundFee;
@@ -135,7 +136,7 @@ public class WxRefundResult extends BaseRefundResult {
private BigDecimal totalFee;
/**
* 应结订单金额
* 去掉非充值代金券金额后的订单总金额,应结订单金额=订单金额-非充值代金券金额,应结订单金额<=订单金额。
* 去掉非充值代金券金额后的订单总金额,应结订单金额=订单金额-非充值代金券金额,应结订单金额&lt;=订单金额。
*/
@JSONField(name = "settlement_total_fee")
private BigDecimal settlementTotalFee;
@@ -176,13 +177,13 @@ public class WxRefundResult extends BaseRefundResult {
private String couponType0;
/**
* 代金券退款总金额
* 代金券退款金额<=退款金额,退款金额-代金券或立减优惠退款金额为现金,说明详见代金券或立减优惠
* 代金券退款金额&lt;=退款金额,退款金额-代金券或立减优惠退款金额为现金,说明详见代金券或立减优惠
*/
@JSONField(name = "coupon_refund_fee")
private BigDecimal couponRefundFee;
/**
* 单个代金券退款金额
* 代金券退款金额<=退款金额,退款金额-代金券或立减优惠退款金额为现金,说明详见代金券或立减优惠
* 代金券退款金额&lt;=退款金额,退款金额-代金券或立减优惠退款金额为现金,说明详见代金券或立减优惠
* 这里只接收0的其余请自行获取
*/
@JSONField(name = "coupon_refund_fee_0")