diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/mipay/MedInsOrdersRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/mipay/MedInsOrdersRequest.java index 1819b328c..b651100a5 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/mipay/MedInsOrdersRequest.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/mipay/MedInsOrdersRequest.java @@ -12,6 +12,7 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; /** * 医保自费混合收款下单请求 @@ -25,6 +26,7 @@ @Builder(builderMethodName = "newBuilder") @NoArgsConstructor @AllArgsConstructor +@Accessors(chain = true) public class MedInsOrdersRequest { /** @@ -282,72 +284,72 @@ public class MedInsOrdersRequest { * 字段名:总金额 * 变量名:total_fee * 必填:否 - * 类型:long + * 类型:Integer * 描述:总金额 * */ @SerializedName("total_fee") - public Long totalFee; + public Integer totalFee; /** *
    * 字段名:医保统筹基金支付金额
    * 变量名:med_ins_gov_fee
    * 必填:否
-   * 类型:long
+   * 类型:Integer
    * 描述:医保统筹基金支付金额
    * 
*/ @SerializedName("med_ins_gov_fee") - public Long medInsGovFee; + public Integer medInsGovFee; /** *
    * 字段名:医保个人账户支付金额
    * 变量名:med_ins_self_fee
    * 必填:否
-   * 类型:long
+   * 类型:Integer
    * 描述:医保个人账户支付金额
    * 
*/ @SerializedName("med_ins_self_fee") - public Long medInsSelfFee; + public Integer medInsSelfFee; /** *
    * 字段名:医保其他基金支付金额
    * 变量名:med_ins_other_fee
    * 必填:否
-   * 类型:long
+   * 类型:Integer
    * 描述:医保其他基金支付金额
    * 
*/ @SerializedName("med_ins_other_fee") - public Long medInsOtherFee; + public Integer medInsOtherFee; /** *
    * 字段名:医保现金支付金额
    * 变量名:med_ins_cash_fee
    * 必填:否
-   * 类型:long
+   * 类型:Integer
    * 描述:医保现金支付金额
    * 
*/ @SerializedName("med_ins_cash_fee") - public Long medInsCashFee; + public Integer medInsCashFee; /** *
    * 字段名:微信支付现金支付金额
    * 变量名:wechat_pay_cash_fee
    * 必填:否
-   * 类型:long
+   * 类型:Integer
    * 描述:微信支付现金支付金额
    * 
*/ @SerializedName("wechat_pay_cash_fee") - public Long wechatPayCashFee; + public Integer wechatPayCashFee; /** *
@@ -462,6 +464,11 @@ public class MedInsOrdersRequest {
    * 支付人身份信息
    * 
*/ + @Data + @Builder + @NoArgsConstructor + @AllArgsConstructor + @Accessors(chain = true) public static class PersonIdentification { /** *
@@ -507,18 +514,23 @@ public static class PersonIdentification {
    * 现金增加明细实体
    * 
*/ + @Data + @Builder + @NoArgsConstructor + @AllArgsConstructor + @Accessors(chain = true) public static class CashAddEntity { /** *
      * 字段名:现金增加金额
      * 变量名:cash_add_fee
      * 必填:是
-     * 类型:long
+     * 类型:Integer
      * 描述:现金增加金额
      * 
*/ @SerializedName("cash_add_fee") - public Long cashAddFee; + public Integer cashAddFee; /** *
@@ -538,18 +550,23 @@ public static class CashAddEntity {
    * 现金减少明细实体
    * 
*/ + @Data + @Builder + @NoArgsConstructor + @AllArgsConstructor + @Accessors(chain = true) public static class CashReduceEntity { /** *
      * 字段名:现金减少金额
      * 变量名:cash_reduce_fee
      * 必填:是
-     * 类型:long
+     * 类型:Integer
      * 描述:现金减少金额
      * 
*/ @SerializedName("cash_reduce_fee") - public Long cashReduceFee; + public Integer cashReduceFee; /** *
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/mipay/MedInsOrdersResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/mipay/MedInsOrdersResult.java
index 4fc68e279..9a119d872 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/mipay/MedInsOrdersResult.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/mipay/MedInsOrdersResult.java
@@ -65,7 +65,7 @@ public class MedInsOrdersResult {
    * 
*/ @SerializedName("med_ins_pay_status") - public MedInsPayStatusEnum medInsPayStatusEnum; + public MedInsPayStatusEnum medInsPayStatus; /** *
@@ -320,72 +320,72 @@ public class MedInsOrdersResult {
    * 字段名:总金额
    * 变量名:total_fee
    * 必填:否
-   * 类型:long
+   * 类型:Integer
    * 描述:总金额
    * 
*/ @SerializedName("total_fee") - public Long totalFee; + public Integer totalFee; /** *
    * 字段名:医保统筹基金支付金额
    * 变量名:med_ins_gov_fee
    * 必填:否
-   * 类型:long
+   * 类型:Integer
    * 描述:医保统筹基金支付金额
    * 
*/ @SerializedName("med_ins_gov_fee") - public Long medInsGovFee; + public Integer medInsGovFee; /** *
    * 字段名:医保个人账户支付金额
    * 变量名:med_ins_self_fee
    * 必填:否
-   * 类型:long
+   * 类型:Integer
    * 描述:医保个人账户支付金额
    * 
*/ @SerializedName("med_ins_self_fee") - public Long medInsSelfFee; + public Integer medInsSelfFee; /** *
    * 字段名:医保其他基金支付金额
    * 变量名:med_ins_other_fee
    * 必填:否
-   * 类型:long
+   * 类型:Integer
    * 描述:医保其他基金支付金额
    * 
*/ @SerializedName("med_ins_other_fee") - public Long medInsOtherFee; + public Integer medInsOtherFee; /** *
    * 字段名:医保现金支付金额
    * 变量名:med_ins_cash_fee
    * 必填:否
-   * 类型:long
+   * 类型:Integer
    * 描述:医保现金支付金额
    * 
*/ @SerializedName("med_ins_cash_fee") - public Long medInsCashFee; + public Integer medInsCashFee; /** *
    * 字段名:微信支付现金支付金额
    * 变量名:wechat_pay_cash_fee
    * 必填:否
-   * 类型:long
+   * 类型:Integer
    * 描述:微信支付现金支付金额
    * 
*/ @SerializedName("wechat_pay_cash_fee") - public Long wechatPayCashFee; + public Integer wechatPayCashFee; /** *
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/mipay/MedInsRefundNotifyRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/mipay/MedInsRefundNotifyRequest.java
index b6e15a364..cb935b52c 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/mipay/MedInsRefundNotifyRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/mipay/MedInsRefundNotifyRequest.java
@@ -20,16 +20,6 @@
 @AllArgsConstructor
 public class MedInsRefundNotifyRequest {
 
-  /**
-   * 
-   * 字段名:医保自费混合订单号
-   * 必填:是
-   * 类型:string(32)
-   * 描述:医保自费混合订单号
-   * 
- */ - private String mixTradeNo; - /** *
    * 字段名:医疗机构的商户号
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/MiPayService.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/MiPayService.java
index 83b75ad40..5e2f678c1 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/MiPayService.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/MiPayService.java
@@ -87,8 +87,9 @@ public interface MiPayService {
    * 
* * @param request 医保退款通知请求参数 + * @param mixTradeNo 【医保自费混合订单号】 医保自费混合订单号 * @throws WxPayException the wx pay exception */ - void medInsRefundNotify(MedInsRefundNotifyRequest request) throws WxPayException; + void medInsRefundNotify(MedInsRefundNotifyRequest request, String mixTradeNo) throws WxPayException; } diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/MiPayServiceImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/MiPayServiceImpl.java index 3063d7731..769b789fa 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/MiPayServiceImpl.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/MiPayServiceImpl.java @@ -59,8 +59,8 @@ public MiPayNotifyV3Result parseMiPayNotifyV3Result(String notifyData, Signature } @Override - public void medInsRefundNotify(MedInsRefundNotifyRequest request) throws WxPayException { - String url = String.format("%s/v3/med-ins/refunds/notify?mix_trade_no=%s", this.payService.getPayBaseUrl(), request.getMixTradeNo()); + public void medInsRefundNotify(MedInsRefundNotifyRequest request, String mixTradeNo) throws WxPayException { + String url = String.format("%s/v3/med-ins/refunds/notify?mix_trade_no=%s", this.payService.getPayBaseUrl(), mixTradeNo); this.payService.postV3(url, GSON.toJson(request)); } diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/MiPayServiceImplTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/MiPayServiceImplTest.java index 23c3c5681..095d355bd 100644 --- a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/MiPayServiceImplTest.java +++ b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/MiPayServiceImplTest.java @@ -131,13 +131,12 @@ public void medInsRefundNotify() throws WxPayException { // 解析请求参数 MedInsRefundNotifyRequest request = GSON.fromJson(requestParamStr, MedInsRefundNotifyRequest.class); - request.setMixTradeNo(mixTradeNo); MiPayService miPayService = wxPayService.getMiPayService(); try { // 调用医保退款通知方法,预期会失败,因为是模拟数据 - miPayService.medInsRefundNotify(request); + miPayService.medInsRefundNotify(request,mixTradeNo); log.info("医保退款通知调用成功"); } catch (WxPayException e) { // 预期会抛出异常,因为是模拟数据