Merge branch 'feat_yibao2.0' into test

onemini-hospital-empty/src/main/java/com/ywt/alipaympapi/service/impl/IsvPayServiceImpl.java

@@ -8,6 +8,7 @@ import com.alipay.api.domain.AlipayTradeQueryModel;
 import com.alipay.api.domain.MedicalNationalPayAuthInfo;
 import com.alipay.api.request.AlipayCommerceMedicalAuthinfoAuthQueryRequest;
 import com.alipay.api.request.AlipaySystemOauthTokenRequest;
+import com.alipay.api.request.AlipayTradeAppPayRequest;
 import com.alipay.api.response.AlipayCommerceMedicalAuthinfoAuthQueryResponse;
 import com.alipay.api.response.AlipaySystemOauthTokenResponse;
 import com.alipay.api.response.AlipayTradeQueryResponse;
@@ -691,10 +692,17 @@ public class IsvPayServiceImpl implements IsvPayService {
                         }
                     }
                 }
+                String subject = "门诊缴费";
+                int total = request.getTotal();
                 // 使用支付宝接口下单
                 // 增加医保参数
                 AlipayMpCfg cfg = BizUtil.getCfg(terminal);
-                HashMap<String, String> extMap = new HashMap<>();
+                HashMap<String, String> bizContent = new HashMap<>();
+                bizContent.put("out_trade_no", orderNo);
+                bizContent.put("total_amount", String.format("%.2f", total / 100d));
+                bizContent.put("subject", subject);
+                bizContent.put("product_code", "QUICK_MSECURITY_PAY");
+
                 JSONObject extendParams = new JSONObject();
                 extendParams.put("sys_service_provider_id", cfg.getIsvPid());
                 extendParams.put("IS_INSURANCE_PAY", "T"); //是否使用医保支付
@@ -716,22 +724,24 @@ public class IsvPayServiceImpl implements IsvPayService {
                 medicalRequestExt.put("insurance_pay_scene", "OUTPATIENT");//医保结算场景
                 medicalRequestExt.put("payment_city_code", "440100");//医保结算地城市编码(国标）
                 extendParams.put("medical_request_ext", JSONObject.toJSONString(medicalRequestExt));
-                extMap.put("extend_params", JSONObject.toJSONString(extendParams));
+                bizContent.put("extend_params", JSONObject.toJSONString(extendParams));
 
                 CreateAlipayOrderResponse createPayInsOrderResponse = orderCenterServiceBlockingStub.createAlipayOrder(CreateAlipayOrderRequest.newBuilder()
-                        .setBody("门诊缴费")
+                        .setBody(subject)
                         .setAlipayUid(request.getAlipayUid())
                         .setOrderId(orderId)
                         .setOrderNo(orderNo)
-                        .setAmount(request.getTotal())
+                        .setAmount(total)
                         .setUserId(userId)
                         .setTerminal(ContextHelper.getCurrentTerminalWrapped())
-                        .putAllBizContent(extMap)
+                        .putAllBizContent(bizContent)
+                        .setUseAppPay(true)
                         .build());
                 if (createPayInsOrderResponse.getCode() == ResultCode.SUCCEED_VALUE) {
                     data.setNeedPay(true);//设置是否需要支付宝自费支付
                     data.setOutTradeNo(orderNo);
                     data.setTradeNo(createPayInsOrderResponse.getTradeNo());
+                    data.setOrderStr(createPayInsOrderResponse.getOrderStr());
                     return data;
                 } else {
                     log.error("IsvPayServiceImpl#tradeNoForOrder(reqData={} ):支付宝下单接口返回失败：{}", request.toString(), createPayInsOrderResponse.getInfo());

onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/CreateAlipayOrderRequest.java

@@ -28,6 +28,7 @@ private static final long serialVersionUID = 0L;
     amount_ = 0;
     userId_ = 0;
     terminal_ = 0;
+    useAppPay_ = false;
   }
 
   @java.lang.Override
@@ -118,6 +119,11 @@ private static final long serialVersionUID = 0L;
                 bizContent__.getKey(), bizContent__.getValue());
             break;
           }
+          case 80: {
+
+            useAppPay_ = input.readBool();
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -450,6 +456,19 @@ private static final long serialVersionUID = 0L;
     return map.get(key);
   }
 
+  public static final int USEAPPPAY_FIELD_NUMBER = 10;
+  private boolean useAppPay_;
+  /**
+   * <pre>
+   * 是否使用 alipay.trade.app.pay(app支付接口2.0)
+   * </pre>
+   *
+   * <code>bool useAppPay = 10;</code>
+   */
+  public boolean getUseAppPay() {
+    return useAppPay_;
+  }
+
   private byte memoizedIsInitialized = -1;
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -492,6 +511,9 @@ private static final long serialVersionUID = 0L;
         internalGetBizContent(),
         BizContentDefaultEntryHolder.defaultEntry,
         9);
+    if (useAppPay_ != false) {
+      output.writeBool(10, useAppPay_);
+    }
     unknownFields.writeTo(output);
   }
 
@@ -538,6 +560,10 @@ private static final long serialVersionUID = 0L;
       size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(9, bizContent__);
     }
+    if (useAppPay_ != false) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeBoolSize(10, useAppPay_);
+    }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
@@ -572,6 +598,8 @@ private static final long serialVersionUID = 0L;
         == other.getTerminal());
     result = result && internalGetBizContent().equals(
         other.internalGetBizContent());
+    result = result && (getUseAppPay()
+        == other.getUseAppPay());
     result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
@@ -603,6 +631,9 @@ private static final long serialVersionUID = 0L;
       hash = (37 * hash) + BIZCONTENT_FIELD_NUMBER;
       hash = (53 * hash) + internalGetBizContent().hashCode();
     }
+    hash = (37 * hash) + USEAPPPAY_FIELD_NUMBER;
+    hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+        getUseAppPay());
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -775,6 +806,8 @@ private static final long serialVersionUID = 0L;
       terminal_ = 0;
 
       internalGetMutableBizContent().clear();
+      useAppPay_ = false;
+
       return this;
     }
 
@@ -809,6 +842,7 @@ private static final long serialVersionUID = 0L;
       result.terminal_ = terminal_;
       result.bizContent_ = internalGetBizContent();
       result.bizContent_.makeImmutable();
+      result.useAppPay_ = useAppPay_;
       result.bitField0_ = to_bitField0_;
       onBuilt();
       return result;
@@ -881,6 +915,9 @@ private static final long serialVersionUID = 0L;
       }
       internalGetMutableBizContent().mergeFrom(
           other.internalGetBizContent());
+      if (other.getUseAppPay() != false) {
+        setUseAppPay(other.getUseAppPay());
+      }
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
@@ -1539,6 +1576,44 @@ private static final long serialVersionUID = 0L;
           .putAll(values);
       return this;
     }
+
+    private boolean useAppPay_ ;
+    /**
+     * <pre>
+     * 是否使用 alipay.trade.app.pay(app支付接口2.0)
+     * </pre>
+     *
+     * <code>bool useAppPay = 10;</code>
+     */
+    public boolean getUseAppPay() {
+      return useAppPay_;
+    }
+    /**
+     * <pre>
+     * 是否使用 alipay.trade.app.pay(app支付接口2.0)
+     * </pre>
+     *
+     * <code>bool useAppPay = 10;</code>
+     */
+    public Builder setUseAppPay(boolean value) {
+      
+      useAppPay_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * 是否使用 alipay.trade.app.pay(app支付接口2.0)
+     * </pre>
+     *
+     * <code>bool useAppPay = 10;</code>
+     */
+    public Builder clearUseAppPay() {
+      
+      useAppPay_ = false;
+      onChanged();
+      return this;
+    }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);

onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/CreateAlipayOrderRequestOrBuilder.java

@@ -148,4 +148,13 @@ public interface CreateAlipayOrderRequestOrBuilder extends
 
   java.lang.String getBizContentOrThrow(
       java.lang.String key);
+
+  /**
+   * <pre>
+   * 是否使用 alipay.trade.app.pay(app支付接口2.0)
+   * </pre>
+   *
+   * <code>bool useAppPay = 10;</code>
+   */
+  boolean getUseAppPay();
 }

onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/CreateAlipayOrderResponse.java

@@ -25,6 +25,7 @@ private static final long serialVersionUID = 0L;
     tradeNo_ = "";
     orderId_ = 0;
     orderNo_ = "";
+    orderStr_ = "";
   }
 
   @java.lang.Override
@@ -86,6 +87,12 @@ private static final long serialVersionUID = 0L;
             orderNo_ = s;
             break;
           }
+          case 50: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            orderStr_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -238,6 +245,48 @@ private static final long serialVersionUID = 0L;
     }
   }
 
+  public static final int ORDERSTR_FIELD_NUMBER = 6;
+  private volatile java.lang.Object orderStr_;
+  /**
+   * <pre>
+   * APP 支付返回的订单字符串
+   * </pre>
+   *
+   * <code>string orderStr = 6;</code>
+   */
+  public java.lang.String getOrderStr() {
+    java.lang.Object ref = orderStr_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      orderStr_ = s;
+      return s;
+    }
+  }
+  /**
+   * <pre>
+   * APP 支付返回的订单字符串
+   * </pre>
+   *
+   * <code>string orderStr = 6;</code>
+   */
+  public com.google.protobuf.ByteString
+      getOrderStrBytes() {
+    java.lang.Object ref = orderStr_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      orderStr_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
   private byte memoizedIsInitialized = -1;
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -265,6 +314,9 @@ private static final long serialVersionUID = 0L;
     if (!getOrderNoBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 5, orderNo_);
     }
+    if (!getOrderStrBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 6, orderStr_);
+    }
     unknownFields.writeTo(output);
   }
 
@@ -290,6 +342,9 @@ private static final long serialVersionUID = 0L;
     if (!getOrderNoBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, orderNo_);
     }
+    if (!getOrderStrBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, orderStr_);
+    }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
@@ -316,6 +371,8 @@ private static final long serialVersionUID = 0L;
         == other.getOrderId());
     result = result && getOrderNo()
         .equals(other.getOrderNo());
+    result = result && getOrderStr()
+        .equals(other.getOrderStr());
     result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
@@ -337,6 +394,8 @@ private static final long serialVersionUID = 0L;
     hash = (53 * hash) + getOrderId();
     hash = (37 * hash) + ORDERNO_FIELD_NUMBER;
     hash = (53 * hash) + getOrderNo().hashCode();
+    hash = (37 * hash) + ORDERSTR_FIELD_NUMBER;
+    hash = (53 * hash) + getOrderStr().hashCode();
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -480,6 +539,8 @@ private static final long serialVersionUID = 0L;
 
       orderNo_ = "";
 
+      orderStr_ = "";
+
       return this;
     }
 
@@ -507,6 +568,7 @@ private static final long serialVersionUID = 0L;
       result.tradeNo_ = tradeNo_;
       result.orderId_ = orderId_;
       result.orderNo_ = orderNo_;
+      result.orderStr_ = orderStr_;
       onBuilt();
       return result;
     }
@@ -566,6 +628,10 @@ private static final long serialVersionUID = 0L;
         orderNo_ = other.orderNo_;
         onChanged();
       }
+      if (!other.getOrderStr().isEmpty()) {
+        orderStr_ = other.orderStr_;
+        onChanged();
+      }
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
@@ -871,6 +937,95 @@ private static final long serialVersionUID = 0L;
       onChanged();
       return this;
     }
+
+    private java.lang.Object orderStr_ = "";
+    /**
+     * <pre>
+     * APP 支付返回的订单字符串
+     * </pre>
+     *
+     * <code>string orderStr = 6;</code>
+     */
+    public java.lang.String getOrderStr() {
+      java.lang.Object ref = orderStr_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        orderStr_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * <pre>
+     * APP 支付返回的订单字符串
+     * </pre>
+     *
+     * <code>string orderStr = 6;</code>
+     */
+    public com.google.protobuf.ByteString
+        getOrderStrBytes() {
+      java.lang.Object ref = orderStr_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        orderStr_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * <pre>
+     * APP 支付返回的订单字符串
+     * </pre>
+     *
+     * <code>string orderStr = 6;</code>
+     */
+    public Builder setOrderStr(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      orderStr_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * APP 支付返回的订单字符串
+     * </pre>
+     *
+     * <code>string orderStr = 6;</code>
+     */
+    public Builder clearOrderStr() {
+      
+      orderStr_ = getDefaultInstance().getOrderStr();
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * APP 支付返回的订单字符串
+     * </pre>
+     *
+     * <code>string orderStr = 6;</code>
+     */
+    public Builder setOrderStrBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      orderStr_ = value;
+      onChanged();
+      return this;
+    }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);

onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/CreateAlipayOrderResponseOrBuilder.java

@@ -54,4 +54,22 @@ public interface CreateAlipayOrderResponseOrBuilder extends
    */
   com.google.protobuf.ByteString
       getOrderNoBytes();
+
+  /**
+   * <pre>
+   * APP 支付返回的订单字符串
+   * </pre>
+   *
+   * <code>string orderStr = 6;</code>
+   */
+  java.lang.String getOrderStr();
+  /**
+   * <pre>
+   * APP 支付返回的订单字符串
+   * </pre>
+   *
+   * <code>string orderStr = 6;</code>
+   */
+  com.google.protobuf.ByteString
+      getOrderStrBytes();
 }

onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/Ordercenter.java

@@ -85,6 +85,11 @@ public final class Ordercenter {
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_com_ywt_gapi_ordercenter_RefundRequest_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_com_ywt_gapi_ordercenter_RefundRequest_BizContentEntry_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_com_ywt_gapi_ordercenter_RefundRequest_BizContentEntry_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
     internal_static_com_ywt_gapi_ordercenter_RefundResponse_descriptor;
   static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
@@ -273,139 +278,143 @@ public final class Ordercenter {
       "pe\030\005 \001(\005\022\016\n\006amount\030\006 \001(\005\"J\n\026UpdateOrderI" +
       "nfoRequest\022\017\n\007orderId\030\001 \001(\005\022\016\n\006amount\030\002 " +
       "\001(\005\022\017\n\007payCode\030\003 \001(\t\"5\n\027UpdateOrderInfoR" +
-      "esponse\022\014\n\004code\030\001 \001(\005\022\014\n\004info\030\002 \001(\t\"\274\001\n\r" +
+      "esponse\022\014\n\004code\030\001 \001(\005\022\014\n\004info\030\002 \001(\t\"\274\002\n\r" +
       "RefundRequest\022\017\n\007orderNo\030\001 \001(\t\022\017\n\007orderI" +
       "d\030\002 \001(\005\022\016\n\006amount\030\003 \001(\005\022\014\n\004opBy\030\004 \001(\t\022\022\n" +
       "\nrefundType\030\005 \001(\005\022\032\n\022refundNotifyMethod\030" +
       "\006 \001(\t\022\033\n\023refundNotifyRestUrl\030\007 \001(\t\022\016\n\006re" +
-      "mark\030\010 \001(\t\022\016\n\006custom\030\t \001(\t\">\n\016RefundResp" +
-      "onse\022\014\n\004code\030\001 \001(\005\022\014\n\004info\030\002 \001(\t\022\020\n\010refu" +
-      "ndNo\030\003 \001(\t\"\251\001\n\023RefundNotifyRequest\022\016\n\006am" +
-      "ount\030\001 \001(\005\022\r\n\005bizId\030\002 \001(\005\022\017\n\007orderId\030\003 \001" +
-      "(\005\022\017\n\007orderNo\030\004 \001(\t\022\020\n\010refundNo\030\005 \001(\t\022\024\n" +
-      "\014refundStatus\030\006 \001(\005\022\016\n\006custom\030\007 \001(\t\022\031\n\021r" +
-      "efundSuccessTime\030\010 \001(\003\"\263\001\n\031WechatRefundN" +
-      "otifyRequest\022\020\n\010refundNo\030\001 \001(\t\022\022\n\noutTra" +
-      "deNo\030\002 \001(\t\022\022\n\nrefundDate\030\003 \001(\003\022\030\n\020refund" +
-      "FinishDate\030\004 \001(\003\022\031\n\021refundSuccessTime\030\005 " +
-      "\001(\003\022\021\n\trefundFee\030\006 \001(\005\022\024\n\014refundStatus\030\007" +
-      " \001(\005\"8\n\032WechatRefundNotifyResponse\022\014\n\004co" +
-      "de\030\001 \001(\005\022\014\n\004info\030\002 \001(\t\"\'\n\023GetOrderBillRe" +
-      "quest\022\020\n\010billDate\030\001 \001(\t\"@\n\024GetOrderBillR" +
-      "esponse\022\014\n\004code\030\001 \001(\005\022\014\n\004info\030\002 \001(\t\022\014\n\004d" +
-      "ata\030\003 \001(\t\"a\n\022PrePayByPOSRequest\022\016\n\006amoun" +
-      "t\030\001 \001(\005\022\026\n\016spbillCreateIp\030\002 \001(\t\022\022\n\nbyUse" +
-      "rName\030\003 \001(\t\022\017\n\007orderId\030\004 \001(\005\"D\n\023PrePayBy" +
-      "POSResponse\022\014\n\004code\030\001 \001(\005\022\014\n\004info\030\002 \001(\t\022" +
-      "\021\n\tpaymentNo\030\003 \001(\t\"\277\001\n\025FinishPayByPOSReq" +
-      "uest\022\021\n\tpaymentNo\030\001 \001(\t\022\017\n\007referNo\030\002 \001(\t" +
-      "\022\016\n\006authNo\030\003 \001(\t\022\017\n\007rspCode\030\004 \001(\t\022\016\n\006car" +
-      "dNo\030\005 \001(\t\022\021\n\ttransTime\030\006 \001(\t\022\021\n\ttransDat" +
-      "e\030\007 \001(\t\022\022\n\nterminalId\030\010 \001(\t\022\027\n\017terminalT" +
-      "raceNo\030\t \001(\t\"4\n\026FinishPayByPOSResponse\022\014" +
-      "\n\004code\030\001 \001(\005\022\014\n\004info\030\002 \001(\t\"\245\002\n\022ICBCPayme" +
-      "ntRequest\022\017\n\007payCode\030\001 \001(\t\022\014\n\004body\030\002 \001(\t" +
-      "\022\026\n\016spbillCreateIp\030\003 \001(\t\022\016\n\006openid\030\004 \001(\t" +
-      "\022\016\n\006amount\030\005 \001(\005\022\020\n\010terminal\030\006 \001(\005\022\017\n\007or" +
-      "derId\030\007 \001(\005\022\016\n\006userId\030\010 \001(\005\022\017\n\007payType\030\t" +
-      " \001(\005\022G\n\010subOrder\030\n \003(\01325.com.ywt.gapi.or" +
-      "dercenter.ICBCPaymentRequest.SubOrder\032+\n" +
-      "\010SubOrder\022\016\n\006amount\030\001 \001(\005\022\017\n\007orderId\030\002 \001" +
-      "(\005\"\231\001\n\023ICBCPaymentResponse\022\014\n\004code\030\001 \001(\005" +
-      "\022\014\n\004info\030\002 \001(\t\022\021\n\ttimeStamp\030\003 \001(\t\022\020\n\010non" +
-      "ceStr\030\004 \001(\t\022\017\n\007package\030\005 \001(\t\022\020\n\010signType" +
-      "\030\006 \001(\t\022\017\n\007paySign\030\007 \001(\t\022\r\n\005appId\030\010 \001(\t\"\260" +
-      "\001\n\030ICBCPaymentNotifyRequest\022\025\n\rinternalP" +
-      "ayNo\030\001 \001(\t\022\r\n\005mchId\030\002 \001(\t\022\025\n\rtransaction" +
-      "Id\030\003 \001(\t\022\016\n\006attach\030\004 \001(\t\022\022\n\noutTradeNo\030\005" +
-      " \001(\t\022\013\n\003fee\030\006 \001(\005\022\025\n\rpayFinishDate\030\007 \001(\003" +
-      "\022\017\n\007payDate\030\010 \001(\003\"7\n\031ICBCPaymentNotifyRe" +
-      "sponse\022\014\n\004code\030\001 \001(\005\022\014\n\004info\030\002 \001(\t\"\336\002\n\027I" +
-      "CBCRefundNotifyRequest\022\020\n\010refundNo\030\001 \001(\t" +
-      "\022\022\n\noutTradeNo\030\002 \001(\t\022\022\n\nrefundDate\030\003 \001(\003" +
-      "\022\030\n\020refundFinishDate\030\004 \001(\003\022\031\n\021refundSucc" +
-      "essTime\030\005 \001(\003\022\021\n\trefundFee\030\006 \001(\005\022\024\n\014refu" +
-      "ndStatus\030\007 \001(\005\022P\n\014subOrderList\030\010 \003(\0132:.c" +
-      "om.ywt.gapi.ordercenter.ICBCRefundNotify" +
-      "Request.SubOrder\032Y\n\010SubOrder\022\021\n\trefundFe" +
-      "e\030\001 \001(\005\022\017\n\007orderId\030\002 \001(\005\022\017\n\007payCode\030\003 \001(" +
-      "\t\022\030\n\020orderRefundLogId\030\004 \001(\005\"6\n\030ICBCRefun" +
-      "dNotifyResponse\022\014\n\004code\030\001 \001(\005\022\014\n\004info\030\002 " +
-      "\001(\t\"&\n\023CleanPayLockRequest\022\017\n\007orderId\030\001 " +
-      "\001(\005\"2\n\024CleanPayLockResponse\022\014\n\004code\030\001 \001(" +
-      "\005\022\014\n\004info\030\002 \001(\t\"\'\n\024CheckIsPayingRequest\022" +
-      "\017\n\007orderId\030\001 \001(\005\"C\n\025CheckIsPayingRespons" +
-      "e\022\014\n\004code\030\001 \001(\005\022\014\n\004info\030\002 \001(\t\022\016\n\006paying\030" +
-      "\003 \001(\010\"\253\002\n\030CreateAlipayOrderRequest\022\017\n\007pa" +
-      "yCode\030\001 \001(\t\022\014\n\004body\030\002 \001(\t\022\021\n\talipayUid\030\003" +
-      " \001(\t\022\017\n\007orderId\030\004 \001(\005\022\017\n\007orderNo\030\005 \001(\t\022\016" +
-      "\n\006amount\030\006 \001(\005\022\016\n\006userId\030\007 \001(\005\022\020\n\010termin" +
-      "al\030\010 \001(\005\022V\n\nbizContent\030\t \003(\0132B.com.ywt.g" +
-      "api.ordercenter.CreateAlipayOrderRequest" +
-      ".BizContentEntry\0321\n\017BizContentEntry\022\013\n\003k" +
-      "ey\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"j\n\031CreateAli" +
-      "payOrderResponse\022\014\n\004code\030\001 \001(\005\022\014\n\004info\030\002" +
-      " \001(\t\022\017\n\007tradeNo\030\003 \001(\t\022\017\n\007orderId\030\004 \001(\005\022\017" +
-      "\n\007orderNo\030\005 \001(\t\"+\n\023AlipayNotifyRequest\022\024" +
-      "\n\014callbackData\030\001 \001(\t\"2\n\024AlipayNotifyResp" +
-      "onse\022\014\n\004code\030\001 \001(\005\022\014\n\004info\030\002 \001(\t*|\n\022Paym" +
-      "entChannelEnum\022\n\n\006UNKNOW\020\000\022\n\n\006WeChat\020\001\022\n" +
-      "\n\006AliPay\020\002\022\010\n\004Cash\020\003\022\017\n\013MedicalCard\020\004\022\007\n" +
-      "\003POS\020\005\022\010\n\004FREE\020\006\022\024\n\020MedicalInsurance\020\0072\250" +
-      "\020\n\022OrderCenterService\022j\n\013createOrder\022,.c" +
-      "om.ywt.gapi.ordercenter.CreateOrderReque" +
-      "st\032-.com.ywt.gapi.ordercenter.CreateOrde" +
-      "rResponse\022g\n\npayByAdmin\022+.com.ywt.gapi.o" +
-      "rdercenter.PayByAdminRequest\032,.com.ywt.g" +
-      "api.ordercenter.PayByAdminResponse\022p\n\rwe" +
-      "chatPayment\022..com.ywt.gapi.ordercenter.W" +
-      "echatPaymentRequest\032/.com.ywt.gapi.order" +
-      "center.WechatPaymentResponse\022\202\001\n\023WechatP" +
-      "aymentNotify\0224.com.ywt.gapi.ordercenter." +
-      "WechatPaymentNotifyRequest\0325.com.ywt.gap" +
-      "i.ordercenter.WechatPaymentNotifyRespons" +
-      "e\022m\n\014getOrderInfo\022-.com.ywt.gapi.orderce" +
-      "nter.GetOrderInfoRequest\032..com.ywt.gapi." +
-      "ordercenter.GetOrderInfeResponse\022v\n\017upda" +
-      "teOrderInfo\0220.com.ywt.gapi.ordercenter.U" +
-      "pdateOrderInfoRequest\0321.com.ywt.gapi.ord" +
-      "ercenter.UpdateOrderInfoResponse\022[\n\006refu" +
-      "nd\022\'.com.ywt.gapi.ordercenter.RefundRequ" +
-      "est\032(.com.ywt.gapi.ordercenter.RefundRes" +
-      "ponse\022\177\n\022wechatRefundNotify\0223.com.ywt.ga" +
-      "pi.ordercenter.WechatRefundNotifyRequest" +
-      "\0324.com.ywt.gapi.ordercenter.WechatRefund" +
-      "NotifyResponse\022m\n\014getOrderBill\022-.com.ywt" +
-      ".gapi.ordercenter.GetOrderBillRequest\032.." +
-      "com.ywt.gapi.ordercenter.GetOrderBillRes" +
-      "ponse\022j\n\013prePayByPOS\022,.com.ywt.gapi.orde" +
-      "rcenter.PrePayByPOSRequest\032-.com.ywt.gap" +
-      "i.ordercenter.PrePayByPOSResponse\022s\n\016fin" +
-      "ishPayByPOS\022/.com.ywt.gapi.ordercenter.F" +
-      "inishPayByPOSRequest\0320.com.ywt.gapi.orde" +
-      "rcenter.FinishPayByPOSResponse\022j\n\013icbcPa" +
-      "yment\022,.com.ywt.gapi.ordercenter.ICBCPay" +
-      "mentRequest\032-.com.ywt.gapi.ordercenter.I" +
-      "CBCPaymentResponse\022|\n\021icbcPaymentNotify\022" +
-      "2.com.ywt.gapi.ordercenter.ICBCPaymentNo" +
-      "tifyRequest\0323.com.ywt.gapi.ordercenter.I" +
-      "CBCPaymentNotifyResponse\022y\n\020icbcRefundNo" +
-      "tify\0221.com.ywt.gapi.ordercenter.ICBCRefu" +
-      "ndNotifyRequest\0322.com.ywt.gapi.ordercent" +
-      "er.ICBCRefundNotifyResponse\022m\n\014cleanPayL" +
-      "ock\022-.com.ywt.gapi.ordercenter.CleanPayL" +
-      "ockRequest\032..com.ywt.gapi.ordercenter.Cl" +
-      "eanPayLockResponse\022p\n\rcheckIsPaying\022..co" +
-      "m.ywt.gapi.ordercenter.CheckIsPayingRequ" +
-      "est\032/.com.ywt.gapi.ordercenter.CheckIsPa" +
-      "yingResponse\022|\n\021createAlipayOrder\0222.com." +
-      "ywt.gapi.ordercenter.CreateAlipayOrderRe" +
-      "quest\0323.com.ywt.gapi.ordercenter.CreateA" +
-      "lipayOrderResponse\022m\n\014alipayNotify\022-.com" +
-      ".ywt.gapi.ordercenter.AlipayNotifyReques" +
-      "t\032..com.ywt.gapi.ordercenter.AlipayNotif" +
-      "yResponseB-\n\030com.ywt.gapi.ordercenterP\001Z" +
-      "\014/ordercenter\210\001\001b\006proto3"
+      "mark\030\010 \001(\t\022\016\n\006custom\030\t \001(\t\022K\n\nbizContent" +
+      "\030\n \003(\01327.com.ywt.gapi.ordercenter.Refund" +
+      "Request.BizContentEntry\0321\n\017BizContentEnt" +
+      "ry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\">\n\016Re" +
+      "fundResponse\022\014\n\004code\030\001 \001(\005\022\014\n\004info\030\002 \001(\t" +
+      "\022\020\n\010refundNo\030\003 \001(\t\"\251\001\n\023RefundNotifyReque" +
+      "st\022\016\n\006amount\030\001 \001(\005\022\r\n\005bizId\030\002 \001(\005\022\017\n\007ord" +
+      "erId\030\003 \001(\005\022\017\n\007orderNo\030\004 \001(\t\022\020\n\010refundNo\030" +
+      "\005 \001(\t\022\024\n\014refundStatus\030\006 \001(\005\022\016\n\006custom\030\007 " +
+      "\001(\t\022\031\n\021refundSuccessTime\030\010 \001(\003\"\263\001\n\031Wecha" +
+      "tRefundNotifyRequest\022\020\n\010refundNo\030\001 \001(\t\022\022" +
+      "\n\noutTradeNo\030\002 \001(\t\022\022\n\nrefundDate\030\003 \001(\003\022\030" +
+      "\n\020refundFinishDate\030\004 \001(\003\022\031\n\021refundSucces" +
+      "sTime\030\005 \001(\003\022\021\n\trefundFee\030\006 \001(\005\022\024\n\014refund" +
+      "Status\030\007 \001(\005\"8\n\032WechatRefundNotifyRespon" +
+      "se\022\014\n\004code\030\001 \001(\005\022\014\n\004info\030\002 \001(\t\"\'\n\023GetOrd" +
+      "erBillRequest\022\020\n\010billDate\030\001 \001(\t\"@\n\024GetOr" +
+      "derBillResponse\022\014\n\004code\030\001 \001(\005\022\014\n\004info\030\002 " +
+      "\001(\t\022\014\n\004data\030\003 \001(\t\"a\n\022PrePayByPOSRequest\022" +
+      "\016\n\006amount\030\001 \001(\005\022\026\n\016spbillCreateIp\030\002 \001(\t\022" +
+      "\022\n\nbyUserName\030\003 \001(\t\022\017\n\007orderId\030\004 \001(\005\"D\n\023" +
+      "PrePayByPOSResponse\022\014\n\004code\030\001 \001(\005\022\014\n\004inf" +
+      "o\030\002 \001(\t\022\021\n\tpaymentNo\030\003 \001(\t\"\277\001\n\025FinishPay" +
+      "ByPOSRequest\022\021\n\tpaymentNo\030\001 \001(\t\022\017\n\007refer" +
+      "No\030\002 \001(\t\022\016\n\006authNo\030\003 \001(\t\022\017\n\007rspCode\030\004 \001(" +
+      "\t\022\016\n\006cardNo\030\005 \001(\t\022\021\n\ttransTime\030\006 \001(\t\022\021\n\t" +
+      "transDate\030\007 \001(\t\022\022\n\nterminalId\030\010 \001(\t\022\027\n\017t" +
+      "erminalTraceNo\030\t \001(\t\"4\n\026FinishPayByPOSRe" +
+      "sponse\022\014\n\004code\030\001 \001(\005\022\014\n\004info\030\002 \001(\t\"\245\002\n\022I" +
+      "CBCPaymentRequest\022\017\n\007payCode\030\001 \001(\t\022\014\n\004bo" +
+      "dy\030\002 \001(\t\022\026\n\016spbillCreateIp\030\003 \001(\t\022\016\n\006open" +
+      "id\030\004 \001(\t\022\016\n\006amount\030\005 \001(\005\022\020\n\010terminal\030\006 \001" +
+      "(\005\022\017\n\007orderId\030\007 \001(\005\022\016\n\006userId\030\010 \001(\005\022\017\n\007p" +
+      "ayType\030\t \001(\005\022G\n\010subOrder\030\n \003(\01325.com.ywt" +
+      ".gapi.ordercenter.ICBCPaymentRequest.Sub" +
+      "Order\032+\n\010SubOrder\022\016\n\006amount\030\001 \001(\005\022\017\n\007ord" +
+      "erId\030\002 \001(\005\"\231\001\n\023ICBCPaymentResponse\022\014\n\004co" +
+      "de\030\001 \001(\005\022\014\n\004info\030\002 \001(\t\022\021\n\ttimeStamp\030\003 \001(" +
+      "\t\022\020\n\010nonceStr\030\004 \001(\t\022\017\n\007package\030\005 \001(\t\022\020\n\010" +
+      "signType\030\006 \001(\t\022\017\n\007paySign\030\007 \001(\t\022\r\n\005appId" +
+      "\030\010 \001(\t\"\260\001\n\030ICBCPaymentNotifyRequest\022\025\n\ri" +
+      "nternalPayNo\030\001 \001(\t\022\r\n\005mchId\030\002 \001(\t\022\025\n\rtra" +
+      "nsactionId\030\003 \001(\t\022\016\n\006attach\030\004 \001(\t\022\022\n\noutT" +
+      "radeNo\030\005 \001(\t\022\013\n\003fee\030\006 \001(\005\022\025\n\rpayFinishDa" +
+      "te\030\007 \001(\003\022\017\n\007payDate\030\010 \001(\003\"7\n\031ICBCPayment" +
+      "NotifyResponse\022\014\n\004code\030\001 \001(\005\022\014\n\004info\030\002 \001" +
+      "(\t\"\336\002\n\027ICBCRefundNotifyRequest\022\020\n\010refund" +
+      "No\030\001 \001(\t\022\022\n\noutTradeNo\030\002 \001(\t\022\022\n\nrefundDa" +
+      "te\030\003 \001(\003\022\030\n\020refundFinishDate\030\004 \001(\003\022\031\n\021re" +
+      "fundSuccessTime\030\005 \001(\003\022\021\n\trefundFee\030\006 \001(\005" +
+      "\022\024\n\014refundStatus\030\007 \001(\005\022P\n\014subOrderList\030\010" +
+      " \003(\0132:.com.ywt.gapi.ordercenter.ICBCRefu" +
+      "ndNotifyRequest.SubOrder\032Y\n\010SubOrder\022\021\n\t" +
+      "refundFee\030\001 \001(\005\022\017\n\007orderId\030\002 \001(\005\022\017\n\007payC" +
+      "ode\030\003 \001(\t\022\030\n\020orderRefundLogId\030\004 \001(\005\"6\n\030I" +
+      "CBCRefundNotifyResponse\022\014\n\004code\030\001 \001(\005\022\014\n" +
+      "\004info\030\002 \001(\t\"&\n\023CleanPayLockRequest\022\017\n\007or" +
+      "derId\030\001 \001(\005\"2\n\024CleanPayLockResponse\022\014\n\004c" +
+      "ode\030\001 \001(\005\022\014\n\004info\030\002 \001(\t\"\'\n\024CheckIsPaying" +
+      "Request\022\017\n\007orderId\030\001 \001(\005\"C\n\025CheckIsPayin" +
+      "gResponse\022\014\n\004code\030\001 \001(\005\022\014\n\004info\030\002 \001(\t\022\016\n" +
+      "\006paying\030\003 \001(\010\"\276\002\n\030CreateAlipayOrderReque" +
+      "st\022\017\n\007payCode\030\001 \001(\t\022\014\n\004body\030\002 \001(\t\022\021\n\tali" +
+      "payUid\030\003 \001(\t\022\017\n\007orderId\030\004 \001(\005\022\017\n\007orderNo" +
+      "\030\005 \001(\t\022\016\n\006amount\030\006 \001(\005\022\016\n\006userId\030\007 \001(\005\022\020" +
+      "\n\010terminal\030\010 \001(\005\022V\n\nbizContent\030\t \003(\0132B.c" +
+      "om.ywt.gapi.ordercenter.CreateAlipayOrde" +
+      "rRequest.BizContentEntry\022\021\n\tuseAppPay\030\n " +
+      "\001(\010\0321\n\017BizContentEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005v" +
+      "alue\030\002 \001(\t:\0028\001\"|\n\031CreateAlipayOrderRespo" +
+      "nse\022\014\n\004code\030\001 \001(\005\022\014\n\004info\030\002 \001(\t\022\017\n\007trade" +
+      "No\030\003 \001(\t\022\017\n\007orderId\030\004 \001(\005\022\017\n\007orderNo\030\005 \001" +
+      "(\t\022\020\n\010orderStr\030\006 \001(\t\"+\n\023AlipayNotifyRequ" +
+      "est\022\024\n\014callbackData\030\001 \001(\t\"2\n\024AlipayNotif" +
+      "yResponse\022\014\n\004code\030\001 \001(\005\022\014\n\004info\030\002 \001(\t*|\n" +
+      "\022PaymentChannelEnum\022\n\n\006UNKNOW\020\000\022\n\n\006WeCha" +
+      "t\020\001\022\n\n\006AliPay\020\002\022\010\n\004Cash\020\003\022\017\n\013MedicalCard" +
+      "\020\004\022\007\n\003POS\020\005\022\010\n\004FREE\020\006\022\024\n\020MedicalInsuranc" +
+      "e\020\0072\250\020\n\022OrderCenterService\022j\n\013createOrde" +
+      "r\022,.com.ywt.gapi.ordercenter.CreateOrder" +
+      "Request\032-.com.ywt.gapi.ordercenter.Creat" +
+      "eOrderResponse\022g\n\npayByAdmin\022+.com.ywt.g" +
+      "api.ordercenter.PayByAdminRequest\032,.com." +
+      "ywt.gapi.ordercenter.PayByAdminResponse\022" +
+      "p\n\rwechatPayment\022..com.ywt.gapi.ordercen" +
+      "ter.WechatPaymentRequest\032/.com.ywt.gapi." +
+      "ordercenter.WechatPaymentResponse\022\202\001\n\023We" +
+      "chatPaymentNotify\0224.com.ywt.gapi.orderce" +
+      "nter.WechatPaymentNotifyRequest\0325.com.yw" +
+      "t.gapi.ordercenter.WechatPaymentNotifyRe" +
+      "sponse\022m\n\014getOrderInfo\022-.com.ywt.gapi.or" +
+      "dercenter.GetOrderInfoRequest\032..com.ywt." +
+      "gapi.ordercenter.GetOrderInfeResponse\022v\n" +
+      "\017updateOrderInfo\0220.com.ywt.gapi.ordercen" +
+      "ter.UpdateOrderInfoRequest\0321.com.ywt.gap" +
+      "i.ordercenter.UpdateOrderInfoResponse\022[\n" +
+      "\006refund\022\'.com.ywt.gapi.ordercenter.Refun" +
+      "dRequest\032(.com.ywt.gapi.ordercenter.Refu" +
+      "ndResponse\022\177\n\022wechatRefundNotify\0223.com.y" +
+      "wt.gapi.ordercenter.WechatRefundNotifyRe" +
+      "quest\0324.com.ywt.gapi.ordercenter.WechatR" +
+      "efundNotifyResponse\022m\n\014getOrderBill\022-.co" +
+      "m.ywt.gapi.ordercenter.GetOrderBillReque" +
+      "st\032..com.ywt.gapi.ordercenter.GetOrderBi" +
+      "llResponse\022j\n\013prePayByPOS\022,.com.ywt.gapi" +
+      ".ordercenter.PrePayByPOSRequest\032-.com.yw" +
+      "t.gapi.ordercenter.PrePayByPOSResponse\022s" +
+      "\n\016finishPayByPOS\022/.com.ywt.gapi.ordercen" +
+      "ter.FinishPayByPOSRequest\0320.com.ywt.gapi" +
+      ".ordercenter.FinishPayByPOSResponse\022j\n\013i" +
+      "cbcPayment\022,.com.ywt.gapi.ordercenter.IC" +
+      "BCPaymentRequest\032-.com.ywt.gapi.ordercen" +
+      "ter.ICBCPaymentResponse\022|\n\021icbcPaymentNo" +
+      "tify\0222.com.ywt.gapi.ordercenter.ICBCPaym" +
+      "entNotifyRequest\0323.com.ywt.gapi.ordercen" +
+      "ter.ICBCPaymentNotifyResponse\022y\n\020icbcRef" +
+      "undNotify\0221.com.ywt.gapi.ordercenter.ICB" +
+      "CRefundNotifyRequest\0322.com.ywt.gapi.orde" +
+      "rcenter.ICBCRefundNotifyResponse\022m\n\014clea" +
+      "nPayLock\022-.com.ywt.gapi.ordercenter.Clea" +
+      "nPayLockRequest\032..com.ywt.gapi.ordercent" +
+      "er.CleanPayLockResponse\022p\n\rcheckIsPaying" +
+      "\022..com.ywt.gapi.ordercenter.CheckIsPayin" +
+      "gRequest\032/.com.ywt.gapi.ordercenter.Chec" +
+      "kIsPayingResponse\022|\n\021createAlipayOrder\0222" +
+      ".com.ywt.gapi.ordercenter.CreateAlipayOr" +
+      "derRequest\0323.com.ywt.gapi.ordercenter.Cr" +
+      "eateAlipayOrderResponse\022m\n\014alipayNotify\022" +
+      "-.com.ywt.gapi.ordercenter.AlipayNotifyR" +
+      "equest\032..com.ywt.gapi.ordercenter.Alipay" +
+      "NotifyResponseB-\n\030com.ywt.gapi.ordercent" +
+      "erP\001Z\014/ordercenter\210\001\001b\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
@@ -502,7 +511,13 @@ public final class Ordercenter {
     internal_static_com_ywt_gapi_ordercenter_RefundRequest_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_com_ywt_gapi_ordercenter_RefundRequest_descriptor,
-        new java.lang.String[] { "OrderNo", "OrderId", "Amount", "OpBy", "RefundType", "RefundNotifyMethod", "RefundNotifyRestUrl", "Remark", "Custom", });
+        new java.lang.String[] { "OrderNo", "OrderId", "Amount", "OpBy", "RefundType", "RefundNotifyMethod", "RefundNotifyRestUrl", "Remark", "Custom", "BizContent", });
+    internal_static_com_ywt_gapi_ordercenter_RefundRequest_BizContentEntry_descriptor =
+      internal_static_com_ywt_gapi_ordercenter_RefundRequest_descriptor.getNestedTypes().get(0);
+    internal_static_com_ywt_gapi_ordercenter_RefundRequest_BizContentEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_com_ywt_gapi_ordercenter_RefundRequest_BizContentEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_com_ywt_gapi_ordercenter_RefundResponse_descriptor =
       getDescriptor().getMessageTypes().get(14);
     internal_static_com_ywt_gapi_ordercenter_RefundResponse_fieldAccessorTable = new
@@ -640,7 +655,7 @@ public final class Ordercenter {
     internal_static_com_ywt_gapi_ordercenter_CreateAlipayOrderRequest_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_com_ywt_gapi_ordercenter_CreateAlipayOrderRequest_descriptor,
-        new java.lang.String[] { "PayCode", "Body", "AlipayUid", "OrderId", "OrderNo", "Amount", "UserId", "Terminal", "BizContent", });
+        new java.lang.String[] { "PayCode", "Body", "AlipayUid", "OrderId", "OrderNo", "Amount", "UserId", "Terminal", "BizContent", "UseAppPay", });
     internal_static_com_ywt_gapi_ordercenter_CreateAlipayOrderRequest_BizContentEntry_descriptor =
       internal_static_com_ywt_gapi_ordercenter_CreateAlipayOrderRequest_descriptor.getNestedTypes().get(0);
     internal_static_com_ywt_gapi_ordercenter_CreateAlipayOrderRequest_BizContentEntry_fieldAccessorTable = new
@@ -652,7 +667,7 @@ public final class Ordercenter {
     internal_static_com_ywt_gapi_ordercenter_CreateAlipayOrderResponse_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_com_ywt_gapi_ordercenter_CreateAlipayOrderResponse_descriptor,
-        new java.lang.String[] { "Code", "Info", "TradeNo", "OrderId", "OrderNo", });
+        new java.lang.String[] { "Code", "Info", "TradeNo", "OrderId", "OrderNo", "OrderStr", });
     internal_static_com_ywt_gapi_ordercenter_AlipayNotifyRequest_descriptor =
       getDescriptor().getMessageTypes().get(36);
     internal_static_com_ywt_gapi_ordercenter_AlipayNotifyRequest_fieldAccessorTable = new

onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/RefundRequest.java

@@ -113,6 +113,19 @@ private static final long serialVersionUID = 0L;
             custom_ = s;
             break;
           }
+          case 82: {
+            if (!((mutable_bitField0_ & 0x00000200) == 0x00000200)) {
+              bizContent_ = com.google.protobuf.MapField.newMapField(
+                  BizContentDefaultEntryHolder.defaultEntry);
+              mutable_bitField0_ |= 0x00000200;
+            }
+            com.google.protobuf.MapEntry<java.lang.String, java.lang.String>
+            bizContent__ = input.readMessage(
+                BizContentDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+            bizContent_.getMutableMap().put(
+                bizContent__.getKey(), bizContent__.getValue());
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -130,6 +143,17 @@ private static final long serialVersionUID = 0L;
     return com.ywt.gapi.ordercenter.Ordercenter.internal_static_com_ywt_gapi_ordercenter_RefundRequest_descriptor;
   }
 
+  @SuppressWarnings({"rawtypes"})
+  protected com.google.protobuf.MapField internalGetMapField(
+      int number) {
+    switch (number) {
+      case 10:
+        return internalGetBizContent();
+      default:
+        throw new RuntimeException(
+            "Invalid map field number: " + number);
+    }
+  }
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.ywt.gapi.ordercenter.Ordercenter.internal_static_com_ywt_gapi_ordercenter_RefundRequest_fieldAccessorTable
@@ -137,6 +161,7 @@ private static final long serialVersionUID = 0L;
             com.ywt.gapi.ordercenter.RefundRequest.class, com.ywt.gapi.ordercenter.RefundRequest.Builder.class);
   }
 
+  private int bitField0_;
   public static final int ORDERNO_FIELD_NUMBER = 1;
   private volatile java.lang.Object orderNo_;
   /**
@@ -420,6 +445,98 @@ private static final long serialVersionUID = 0L;
     }
   }
 
+  public static final int BIZCONTENT_FIELD_NUMBER = 10;
+  private static final class BizContentDefaultEntryHolder {
+    static final com.google.protobuf.MapEntry<
+        java.lang.String, java.lang.String> defaultEntry =
+            com.google.protobuf.MapEntry
+            .<java.lang.String, java.lang.String>newDefaultInstance(
+                com.ywt.gapi.ordercenter.Ordercenter.internal_static_com_ywt_gapi_ordercenter_RefundRequest_BizContentEntry_descriptor, 
+                com.google.protobuf.WireFormat.FieldType.STRING,
+                "",
+                com.google.protobuf.WireFormat.FieldType.STRING,
+                "");
+  }
+  private com.google.protobuf.MapField<
+      java.lang.String, java.lang.String> bizContent_;
+  private com.google.protobuf.MapField<java.lang.String, java.lang.String>
+  internalGetBizContent() {
+    if (bizContent_ == null) {
+      return com.google.protobuf.MapField.emptyMapField(
+          BizContentDefaultEntryHolder.defaultEntry);
+    }
+    return bizContent_;
+  }
+
+  public int getBizContentCount() {
+    return internalGetBizContent().getMap().size();
+  }
+  /**
+   * <pre>
+   * map 类型业务自定义参数，目前供支付宝医保使用
+   * </pre>
+   *
+   * <code>map&lt;string, string&gt; bizContent = 10;</code>
+   */
+
+  public boolean containsBizContent(
+      java.lang.String key) {
+    if (key == null) { throw new java.lang.NullPointerException(); }
+    return internalGetBizContent().getMap().containsKey(key);
+  }
+  /**
+   * Use {@link #getBizContentMap()} instead.
+   */
+  @java.lang.Deprecated
+  public java.util.Map<java.lang.String, java.lang.String> getBizContent() {
+    return getBizContentMap();
+  }
+  /**
+   * <pre>
+   * map 类型业务自定义参数，目前供支付宝医保使用
+   * </pre>
+   *
+   * <code>map&lt;string, string&gt; bizContent = 10;</code>
+   */
+
+  public java.util.Map<java.lang.String, java.lang.String> getBizContentMap() {
+    return internalGetBizContent().getMap();
+  }
+  /**
+   * <pre>
+   * map 类型业务自定义参数，目前供支付宝医保使用
+   * </pre>
+   *
+   * <code>map&lt;string, string&gt; bizContent = 10;</code>
+   */
+
+  public java.lang.String getBizContentOrDefault(
+      java.lang.String key,
+      java.lang.String defaultValue) {
+    if (key == null) { throw new java.lang.NullPointerException(); }
+    java.util.Map<java.lang.String, java.lang.String> map =
+        internalGetBizContent().getMap();
+    return map.containsKey(key) ? map.get(key) : defaultValue;
+  }
+  /**
+   * <pre>
+   * map 类型业务自定义参数，目前供支付宝医保使用
+   * </pre>
+   *
+   * <code>map&lt;string, string&gt; bizContent = 10;</code>
+   */
+
+  public java.lang.String getBizContentOrThrow(
+      java.lang.String key) {
+    if (key == null) { throw new java.lang.NullPointerException(); }
+    java.util.Map<java.lang.String, java.lang.String> map =
+        internalGetBizContent().getMap();
+    if (!map.containsKey(key)) {
+      throw new java.lang.IllegalArgumentException();
+    }
+    return map.get(key);
+  }
+
   private byte memoizedIsInitialized = -1;
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -459,6 +576,12 @@ private static final long serialVersionUID = 0L;
     if (!getCustomBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 9, custom_);
     }
+    com.google.protobuf.GeneratedMessageV3
+      .serializeStringMapTo(
+        output,
+        internalGetBizContent(),
+        BizContentDefaultEntryHolder.defaultEntry,
+        10);
     unknownFields.writeTo(output);
   }
 
@@ -497,6 +620,16 @@ private static final long serialVersionUID = 0L;
     if (!getCustomBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, custom_);
     }
+    for (java.util.Map.Entry<java.lang.String, java.lang.String> entry
+         : internalGetBizContent().getMap().entrySet()) {
+      com.google.protobuf.MapEntry<java.lang.String, java.lang.String>
+      bizContent__ = BizContentDefaultEntryHolder.defaultEntry.newBuilderForType()
+          .setKey(entry.getKey())
+          .setValue(entry.getValue())
+          .build();
+      size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(10, bizContent__);
+    }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
@@ -531,6 +664,8 @@ private static final long serialVersionUID = 0L;
         .equals(other.getRemark());
     result = result && getCustom()
         .equals(other.getCustom());
+    result = result && internalGetBizContent().equals(
+        other.internalGetBizContent());
     result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
@@ -560,6 +695,10 @@ private static final long serialVersionUID = 0L;
     hash = (53 * hash) + getRemark().hashCode();
     hash = (37 * hash) + CUSTOM_FIELD_NUMBER;
     hash = (53 * hash) + getCustom().hashCode();
+    if (!internalGetBizContent().getMap().isEmpty()) {
+      hash = (37 * hash) + BIZCONTENT_FIELD_NUMBER;
+      hash = (53 * hash) + internalGetBizContent().hashCode();
+    }
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -669,6 +808,28 @@ private static final long serialVersionUID = 0L;
       return com.ywt.gapi.ordercenter.Ordercenter.internal_static_com_ywt_gapi_ordercenter_RefundRequest_descriptor;
     }
 
+    @SuppressWarnings({"rawtypes"})
+    protected com.google.protobuf.MapField internalGetMapField(
+        int number) {
+      switch (number) {
+        case 10:
+          return internalGetBizContent();
+        default:
+          throw new RuntimeException(
+              "Invalid map field number: " + number);
+      }
+    }
+    @SuppressWarnings({"rawtypes"})
+    protected com.google.protobuf.MapField internalGetMutableMapField(
+        int number) {
+      switch (number) {
+        case 10:
+          return internalGetMutableBizContent();
+        default:
+          throw new RuntimeException(
+              "Invalid map field number: " + number);
+      }
+    }
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.ywt.gapi.ordercenter.Ordercenter.internal_static_com_ywt_gapi_ordercenter_RefundRequest_fieldAccessorTable
@@ -711,6 +872,7 @@ private static final long serialVersionUID = 0L;
 
       custom_ = "";
 
+      internalGetMutableBizContent().clear();
       return this;
     }
 
@@ -733,6 +895,8 @@ private static final long serialVersionUID = 0L;
 
     public com.ywt.gapi.ordercenter.RefundRequest buildPartial() {
       com.ywt.gapi.ordercenter.RefundRequest result = new com.ywt.gapi.ordercenter.RefundRequest(this);
+      int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
       result.orderNo_ = orderNo_;
       result.orderId_ = orderId_;
       result.amount_ = amount_;
@@ -742,6 +906,9 @@ private static final long serialVersionUID = 0L;
       result.refundNotifyRestUrl_ = refundNotifyRestUrl_;
       result.remark_ = remark_;
       result.custom_ = custom_;
+      result.bizContent_ = internalGetBizContent();
+      result.bizContent_.makeImmutable();
+      result.bitField0_ = to_bitField0_;
       onBuilt();
       return result;
     }
@@ -816,6 +983,8 @@ private static final long serialVersionUID = 0L;
         custom_ = other.custom_;
         onChanged();
       }
+      internalGetMutableBizContent().mergeFrom(
+          other.internalGetBizContent());
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
@@ -842,6 +1011,7 @@ private static final long serialVersionUID = 0L;
       }
       return this;
     }
+    private int bitField0_;
 
     private java.lang.Object orderNo_ = "";
     /**
@@ -1470,6 +1640,157 @@ private static final long serialVersionUID = 0L;
       onChanged();
       return this;
     }
+
+    private com.google.protobuf.MapField<
+        java.lang.String, java.lang.String> bizContent_;
+    private com.google.protobuf.MapField<java.lang.String, java.lang.String>
+    internalGetBizContent() {
+      if (bizContent_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            BizContentDefaultEntryHolder.defaultEntry);
+      }
+      return bizContent_;
+    }
+    private com.google.protobuf.MapField<java.lang.String, java.lang.String>
+    internalGetMutableBizContent() {
+      onChanged();;
+      if (bizContent_ == null) {
+        bizContent_ = com.google.protobuf.MapField.newMapField(
+            BizContentDefaultEntryHolder.defaultEntry);
+      }
+      if (!bizContent_.isMutable()) {
+        bizContent_ = bizContent_.copy();
+      }
+      return bizContent_;
+    }
+
+    public int getBizContentCount() {
+      return internalGetBizContent().getMap().size();
+    }
+    /**
+     * <pre>
+     * map 类型业务自定义参数，目前供支付宝医保使用
+     * </pre>
+     *
+     * <code>map&lt;string, string&gt; bizContent = 10;</code>
+     */
+
+    public boolean containsBizContent(
+        java.lang.String key) {
+      if (key == null) { throw new java.lang.NullPointerException(); }
+      return internalGetBizContent().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getBizContentMap()} instead.
+     */
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.String, java.lang.String> getBizContent() {
+      return getBizContentMap();
+    }
+    /**
+     * <pre>
+     * map 类型业务自定义参数，目前供支付宝医保使用
+     * </pre>
+     *
+     * <code>map&lt;string, string&gt; bizContent = 10;</code>
+     */
+
+    public java.util.Map<java.lang.String, java.lang.String> getBizContentMap() {
+      return internalGetBizContent().getMap();
+    }
+    /**
+     * <pre>
+     * map 类型业务自定义参数，目前供支付宝医保使用
+     * </pre>
+     *
+     * <code>map&lt;string, string&gt; bizContent = 10;</code>
+     */
+
+    public java.lang.String getBizContentOrDefault(
+        java.lang.String key,
+        java.lang.String defaultValue) {
+      if (key == null) { throw new java.lang.NullPointerException(); }
+      java.util.Map<java.lang.String, java.lang.String> map =
+          internalGetBizContent().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <pre>
+     * map 类型业务自定义参数，目前供支付宝医保使用
+     * </pre>
+     *
+     * <code>map&lt;string, string&gt; bizContent = 10;</code>
+     */
+
+    public java.lang.String getBizContentOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new java.lang.NullPointerException(); }
+      java.util.Map<java.lang.String, java.lang.String> map =
+          internalGetBizContent().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public Builder clearBizContent() {
+      internalGetMutableBizContent().getMutableMap()
+          .clear();
+      return this;
+    }
+    /**
+     * <pre>
+     * map 类型业务自定义参数，目前供支付宝医保使用
+     * </pre>
+     *
+     * <code>map&lt;string, string&gt; bizContent = 10;</code>
+     */
+
+    public Builder removeBizContent(
+        java.lang.String key) {
+      if (key == null) { throw new java.lang.NullPointerException(); }
+      internalGetMutableBizContent().getMutableMap()
+          .remove(key);
+      return this;
+    }
+    /**
+     * Use alternate mutation accessors instead.
+     */
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.String, java.lang.String>
+    getMutableBizContent() {
+      return internalGetMutableBizContent().getMutableMap();
+    }
+    /**
+     * <pre>
+     * map 类型业务自定义参数，目前供支付宝医保使用
+     * </pre>
+     *
+     * <code>map&lt;string, string&gt; bizContent = 10;</code>
+     */
+    public Builder putBizContent(
+        java.lang.String key,
+        java.lang.String value) {
+      if (key == null) { throw new java.lang.NullPointerException(); }
+      if (value == null) { throw new java.lang.NullPointerException(); }
+      internalGetMutableBizContent().getMutableMap()
+          .put(key, value);
+      return this;
+    }
+    /**
+     * <pre>
+     * map 类型业务自定义参数，目前供支付宝医保使用
+     * </pre>
+     *
+     * <code>map&lt;string, string&gt; bizContent = 10;</code>
+     */
+
+    public Builder putAllBizContent(
+        java.util.Map<java.lang.String, java.lang.String> values) {
+      internalGetMutableBizContent().getMutableMap()
+          .putAll(values);
+      return this;
+    }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);

onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/RefundRequestOrBuilder.java

@@ -133,4 +133,58 @@ public interface RefundRequestOrBuilder extends
    */
   com.google.protobuf.ByteString
       getCustomBytes();
+
+  /**
+   * <pre>
+   * map 类型业务自定义参数，目前供支付宝医保使用
+   * </pre>
+   *
+   * <code>map&lt;string, string&gt; bizContent = 10;</code>
+   */
+  int getBizContentCount();
+  /**
+   * <pre>
+   * map 类型业务自定义参数，目前供支付宝医保使用
+   * </pre>
+   *
+   * <code>map&lt;string, string&gt; bizContent = 10;</code>
+   */
+  boolean containsBizContent(
+      java.lang.String key);
+  /**
+   * Use {@link #getBizContentMap()} instead.
+   */
+  @java.lang.Deprecated
+  java.util.Map<java.lang.String, java.lang.String>
+  getBizContent();
+  /**
+   * <pre>
+   * map 类型业务自定义参数，目前供支付宝医保使用
+   * </pre>
+   *
+   * <code>map&lt;string, string&gt; bizContent = 10;</code>
+   */
+  java.util.Map<java.lang.String, java.lang.String>
+  getBizContentMap();
+  /**
+   * <pre>
+   * map 类型业务自定义参数，目前供支付宝医保使用
+   * </pre>
+   *
+   * <code>map&lt;string, string&gt; bizContent = 10;</code>
+   */
+
+  java.lang.String getBizContentOrDefault(
+      java.lang.String key,
+      java.lang.String defaultValue);
+  /**
+   * <pre>
+   * map 类型业务自定义参数，目前供支付宝医保使用
+   * </pre>
+   *
+   * <code>map&lt;string, string&gt; bizContent = 10;</code>
+   */
+
+  java.lang.String getBizContentOrThrow(
+      java.lang.String key);
 }

onemini-hospital-sdk/src/main/java/com/ywt/response/pay/TradeNoForOrderResponseData.java

@@ -8,4 +8,5 @@ public class TradeNoForOrderResponseData implements IsvResponseData {
     private boolean needPay;//是否需要另行支付标识，如全部支付金额已通过其他途径结算，则此字段返回false，此时商家订单号及支付宝订单号均为空，小程序端不再发起支付，直接进入完成页面
     private String outTradeNo;//商家订单号(区别于支付宝订单号)
     private String tradeNo;//支付宝订单号
+    private String orderStr;
 }