浏览代码

fix 新增挂号和支付接口

DYH2020 2 年之前
父节点
当前提交
8e084b8334
共有 50 个文件被更改,包括 689 次插入1050 次删除
  1. 35 5
      onemini-hospital-empty/src/main/java/com/ywt/alipaympapi/service/impl/IsvPayServiceImpl.java
  2. 2 162
      onemini-hospital-empty/src/main/java/com/ywt/alipaympapi/service/impl/IsvRegisterServiceImpl.java
  3. 9 20
      onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/AlipayNotifyRequest.java
  4. 9 20
      onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/AlipayNotifyResponse.java
  5. 9 20
      onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/CheckIsPayingRequest.java
  6. 9 20
      onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/CheckIsPayingResponse.java
  7. 9 20
      onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/CleanPayLockRequest.java
  8. 9 20
      onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/CleanPayLockResponse.java
  9. 9 20
      onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/CreateAlipayOrderRequest.java
  10. 194 20
      onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/CreateAlipayOrderResponse.java
  11. 15 0
      onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/CreateAlipayOrderResponseOrBuilder.java
  12. 9 20
      onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/CreateOrderRequest.java
  13. 9 20
      onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/CreateOrderResponse.java
  14. 9 20
      onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/FinishPayByPOSRequest.java
  15. 9 20
      onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/FinishPayByPOSResponse.java
  16. 9 20
      onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/GetOrderBillRequest.java
  17. 9 20
      onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/GetOrderBillResponse.java
  18. 9 20
      onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/GetOrderInfeResponse.java
  19. 9 20
      onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/GetOrderInfoRequest.java
  20. 9 20
      onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/ICBCPaymentNotifyRequest.java
  21. 9 20
      onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/ICBCPaymentNotifyResponse.java
  22. 18 40
      onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/ICBCPaymentRequest.java
  23. 9 20
      onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/ICBCPaymentResponse.java
  24. 18 40
      onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/ICBCRefundNotifyRequest.java
  25. 9 20
      onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/ICBCRefundNotifyResponse.java
  26. 1 1
      onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/OrderCenterServiceGrpc.java
  27. 74 73
      onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/Ordercenter.java
  28. 9 20
      onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/PayByAdminRequest.java
  29. 9 20
      onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/PayByAdminResponse.java
  30. 9 20
      onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/PaymentCallbackNotifyRequest.java
  31. 9 20
      onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/PrePayByPOSRequest.java
  32. 9 20
      onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/PrePayByPOSResponse.java
  33. 9 20
      onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/RefundNotifyRequest.java
  34. 9 20
      onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/RefundRequest.java
  35. 9 20
      onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/RefundResponse.java
  36. 9 20
      onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/UpdateOrderInfoRequest.java
  37. 9 20
      onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/UpdateOrderInfoResponse.java
  38. 9 20
      onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/WechatPaymentNotifyRequest.java
  39. 9 20
      onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/WechatPaymentNotifyResponse.java
  40. 9 20
      onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/WechatPaymentRequest.java
  41. 9 20
      onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/WechatPaymentResponse.java
  42. 9 20
      onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/WechatRefundNotifyRequest.java
  43. 9 20
      onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/WechatRefundNotifyResponse.java
  44. 2 3
      onemini-hospital-sdk/src/main/java/com/ywt/alipaympapi/controller/AppointmentController.java
  45. 1 1
      onemini-hospital-sdk/src/main/java/com/ywt/alipaympapi/controller/PlanController.java
  46. 8 3
      onemini-hospital-sdk/src/main/java/com/ywt/alipaympapi/controller/TradeController.java
  47. 1 1
      onemini-hospital-sdk/src/main/java/com/ywt/alipaympapi/service/IsvPayService.java
  48. 1 1
      onemini-hospital-sdk/src/main/java/com/ywt/alipaympapi/service/IsvRegisterService.java
  49. 3 0
      onemini-hospital-sdk/src/main/java/com/ywt/request/pay/OutTradeNoRequest.java
  50. 1 0
      onemini-hospital-sdk/src/main/java/com/ywt/response/pay/TradeNoResponseData.java

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

@@ -16,6 +16,11 @@ import com.ywt.gapi.order.GetOutpatientOrderListRequest;
 import com.ywt.gapi.order.GetOutpatientOrderListResponse;
 import com.ywt.gapi.order.OrderServiceGrpc;
 import com.ywt.gapi.order.OutpatientOrder;
+import com.ywt.gapi.ordercenter.CreateAlipayOrderRequest;
+import com.ywt.gapi.ordercenter.CreateAlipayOrderResponse;
+import com.ywt.gapi.ordercenter.OrderCenterServiceGrpc;
+import com.ywt.gapi.system.GetConfigByTypeRequest;
+import com.ywt.gapi.system.GetConfigByTypeResponse;
 import com.ywt.gapi.taihe.outpaitent.*;
 import com.ywt.gapi.taihe.outpaitent.BaseResult;
 import com.ywt.gapi.third.taihe.*;
@@ -24,6 +29,7 @@ import com.ywt.gapi.third.taihe.GetOutpatientListResponse;
 import com.ywt.model.PageVO;
 import com.ywt.model.Pagination;
 import com.ywt.request.pay.*;
+import com.ywt.response.inpatient.DepositTradeResponseData;
 import com.ywt.response.pay.*;
 import com.ywt.alipaympapi.service.IsvPayService;
 import com.ywt.response.report.QueryReportListResponseData;
@@ -49,7 +55,6 @@ public class IsvPayServiceImpl implements IsvPayService {
     private static final int TYPE_PAID_ZFB = 1;
 
 
-
     @Autowired
     private TaiheServiceGrpc.TaiheServiceBlockingStub taiheServiceBlockingStub;
 
@@ -61,10 +66,35 @@ public class IsvPayServiceImpl implements IsvPayService {
 
     @Autowired
     private OrderServiceGrpc.OrderServiceBlockingStub orderServiceBlockingStub;
+    @Autowired
+    private OrderCenterServiceGrpc.OrderCenterServiceBlockingStub orderCenterServiceBlockingStub;
 
+    // 商家订单号获取
     @Override
-    public TradeNoResponseData queryTradeNo(OutTradeNoRequest request) {
-        return null;
+    public TradeNoResponseData queryTradeNo(OutTradeNoRequest request) throws Exception {
+        int orderId = Integer.parseInt(request.getOrderId());
+        if (orderId <= 0) {
+            throw new AppMessageException("该订单不存在");
+        }
+        int userId = Integer.parseInt(request.getUserId());
+        int amount = BizUtil.yuan2Cent(request.getAmount());
+
+        CreateAlipayOrderResponse response = orderCenterServiceBlockingStub.createAlipayOrder(CreateAlipayOrderRequest.newBuilder()
+                .setBody("预约挂号")
+                .setAlipayUid(request.getAlipayUid())
+                .setOrderId(orderId)
+                .setOrderNo("")
+                .setAmount(amount)
+                .setUserId(userId)
+                .setTerminal(ContextHelper.getCurrentTerminalWrapped())
+                .build());
+        if (response.getCode() != ResultCode.SUCCEED_VALUE)
+            throw new AppMessageException("支付宝下单:" + response.getInfo());
+        TradeNoResponseData data = new TradeNoResponseData();
+        data.setOrderId(orderId);
+        data.setOutTradeNo(response.getOrderNo());
+        data.setTradeNo(response.getTradeNo());
+        return data;
     }
 
     @Override
@@ -85,10 +115,10 @@ public class IsvPayServiceImpl implements IsvPayService {
     public PayDetailResponseData queryPayDetail(PayDetailRequest request) throws Exception {
         int userId = ContextHelper.getCurrentUserIdWrapped();
         int hospitalId = BizUtil.getCurrentHospitalId();
-        if(Checker.isNone(request.getStatus())){
+        if (Checker.isNone(request.getStatus())) {
             throw new RuntimeException("订单状态不能为空");
         }
-        if(request.getStatus() == TYPE_UNPAID_ZFB){
+        if (request.getStatus() == TYPE_UNPAID_ZFB) {
             PayDetailResponseData da = new PayDetailResponseData();
             da.setDepName(Checker.getStringValue(request.getDepName()));
             da.setAge(request.getAge().toString());

+ 2 - 162
onemini-hospital-empty/src/main/java/com/ywt/alipaympapi/service/impl/IsvRegisterServiceImpl.java

@@ -21,14 +21,12 @@ import com.ywt.gapi.system.*;
 import com.ywt.gapi.taihe.register.*;
 import com.ywt.gapi.third.taihe.*;
 import com.ywt.gapi.user.*;
-import com.ywt.model.BaseResponse;
 import com.ywt.model.PageVO;
 import com.ywt.model.Pagination;
 import com.ywt.request.queue.QueryQueueListRequest;
 import com.ywt.request.register.*;
 import com.ywt.response.queue.QueryQueueListResponse;
 import com.ywt.response.register.*;
-import com.ywt.response.report.QueryReportListResponseData;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -37,7 +35,6 @@ import redis.clients.jedis.JedisCommands;
 import java.time.LocalDate;
 import java.util.*;
 import java.util.stream.Collectors;
-import java.util.stream.IntStream;
 
 @Service
 @Slf4j
@@ -428,165 +425,7 @@ public class IsvRegisterServiceImpl implements IsvRegisterService {
 
     @Override
     public List<QueryDoctorOrderSourceListResponseData> queryDoctorOrderSourceList(QueryDoctorOrderSourceListRequest request) throws Exception {
-        int hospitalId = BizUtil.getCurrentHospitalId();
-        String deptCode = request.getDepCode();
-        String doctorCode = request.getDoctorCode();
-        String serviceDate = request.getServiceDate();
-        Integer period = request.getPeriod();
-        if (StringHelper.isNullOrWhiteSpace(deptCode)) {
-            throw new AppMessageException("科室不存在");
-        }
-        if (StringHelper.isNullOrWhiteSpace(doctorCode)) {
-            throw new AppMessageException("医生不存在");
-        }
-        if (hospitalId <= 0) {
-            hospitalId = BizUtil.getHospitalIdByTerminalId(BizUtil.getCurrentTerminalWrapped());
-        }
-        List<QueryDoctorScheduleListResponseData> dataList = new LinkedList<>();
-        if (!StringHelper.isNullOrWhiteSpace(serviceDate)) {
-            Date date = DateUtil.parseDate(serviceDate, "yyyy-MM-dd");
-            if (date == null) {
-                throw new AppMessageException("invalid serviceDate");
-            }
-            //查询医生某一天的排班分时信息
-            if (period == null) {
-                throw new AppMessageException("请选择时段");
-            }
-            if (DatePeriodEnum.valueOf(period) == null) {
-                throw new AppMessageException("时段不存在");
-            }
-            String strDate = DateUtil.formatDate(date, "yyyy-MM-dd");
-            QueryDoctorScheduleListResponseData map = getScheduleTimeInfoResponse(deptCode, doctorCode, strDate, period, hospitalId);
-            if (map != null) {
-                dataList.add(map);
-            }
-        } else {
-            //取医生8天排班的分时信息
-            int[] periods = {DatePeriodEnum.MORNING.getValue(), DatePeriodEnum.AFTERNOON.getValue()};
-            Calendar calendar = Calendar.getInstance();
-
-            for (int offset = 0; offset < 8; offset++) {
-                calendar.add(Calendar.DATE, 1);
-                String strDate = DateUtil.formatDate(calendar.getTime(), "yyyy-MM-dd");
-
-                for (int p : periods) {
-                    QueryDoctorScheduleListResponseData map = getScheduleTimeInfoResponse(deptCode, doctorCode, strDate, p, hospitalId);
-
-                    if (map != null) {
-                        dataList.add(map);
-                    }
-                }
-            }
-        }
-        String deptName = "";
-        String doctorName = "";
-        String avatar = "";
-        String doctorTitle = "";
-        String doctorSpec = "";
-        double fee = 0;     //单位:元
-        int regFee = 0;     //单位:分
-        int treatFee = 0;   //单位:分
-        int amount = 0;     //单位:分
-        String feeStr = "";
-        String regFeeStr = "";
-        String treatFeeStr = "";
-        int doctorId = 0;
-
-        if (dataList.size() > 0) {
-            QueryDoctorScheduleListResponseData map = dataList.get(0);
-            String strDate = map.getServiceDate();
-            GetScheduleListRequest getScheduleListRequest = GetScheduleListRequest.newBuilder()
-                    .setDeptCode(deptCode)
-                    .setDoctorCode(doctorCode)
-                    .setServiceDate(strDate)
-                    .setHospitalId(hospitalId)
-                    .build();
-            GetScheduleListResponse getScheduleListResponse = taiheServiceBlockingStub.getScheduleList(getScheduleListRequest);
-
-            if (getScheduleListResponse.getCode() == ResultCode.SUCCEED_VALUE) {
-                List<Schedule> scheduleList = getScheduleListResponse.getSchedulesList();
-                if (scheduleList.size() > 0) {
-                    Schedule schedule = scheduleList.stream().filter(s -> s.getDatePeriod() == Checker.getIntegerValue(period)).findFirst().orElse(null);
-                    if (schedule != null) {
-                        deptName = schedule.getDeptName();
-                        doctorName = schedule.getDoctorName();
-                        avatar = schedule.getAvatar();
-                        doctorTitle = schedule.getDoctorTitle();
-                        doctorSpec = schedule.getDoctorSpec();
-                        amount = schedule.getFee();
-                        fee = schedule.getFee() / 100d;
-                        regFee = schedule.getRegFee();
-                        treatFee = schedule.getCheckupFee();
-                    } else {
-                        throw new AppMessageException("当前时间段没有匹配的排班数据");
-                    }
-                }
-            }
-        }
-
-        GetDoctorByHisCodeResponse getDoctorByHisCodeResponse = getDoctorByHisCode(doctorCode, hospitalId);
-        if (getDoctorByHisCodeResponse.getResult().getCode() == ResultCode.SUCCEED) {
-            if (!StringHelper.isNullOrWhiteSpace(getDoctorByHisCodeResponse.getAvatar())) {
-                avatar = getDoctorByHisCodeResponse.getAvatar();
-            } else {
-                avatar = ConstantDef.DOCTOR_AVATAR_URL;
-            }
-
-            doctorId = getDoctorByHisCodeResponse.getDoctorId();
-        }
-
-        if (systemSrv.checkIsNetDept(deptCode, hospitalId)) {
-            //南方医院太和分院(互联网医院名医诊区)
-            // v3.2.0 线下就诊费用单独设置
-            // v3.3.8 即使咨询关闭,仍然可以线下问诊,问诊费用要正常显示
-            DoctorRequest doctorRequest = DoctorRequest.newBuilder()
-                    .setUserid(doctorId)
-                    .build();
-            DoctorInfoResponse doctorInfoResponse = doctorServiceBlockingStub.getDoctorInfo(doctorRequest);
-            if (doctorInfoResponse.getResult().getCode() != ResultCode.SUCCEED) {
-                throw new AppMessageException(String.format("无法获取医生信息: %s", doctorInfoResponse.getResult().getInfo()));
-            }
-            // 线下就诊费用跟问诊费分开,线下就诊费用读取 offline_fee 字段
-            int consultFee = Checker.getIntegerValue(doctorInfoResponse.getInfo().getOfflineFee());
-            amount = consultFee;
-            fee = consultFee / 100d;
-            regFee = 0;
-            treatFee = 0;
-        }
 
-//        amount = 1;
-//        fee = 0.01;
-//        regFee = 0;
-//        treatFee = 1;//测试
-
-        feeStr = String.format("¥%.2f", fee);
-        regFeeStr = String.format("¥%.2f", regFee / 100d);
-        treatFeeStr = String.format("¥%.2f", treatFee / 100d);
-
-        Map<String, Object> data = new HashMap<>();
-        data.put("list", dataList);
-        data.put("hospitalName", BizUtil.getHospitalNameByIdSimply(hospitalId));
-        data.put("deptCode", deptCode);
-        data.put("deptName", deptName);
-        data.put("doctorCode", doctorCode);
-        data.put("doctorName", doctorName);
-        data.put("avatar", avatar);
-        data.put("doctorTitle", doctorTitle);
-        data.put("doctorSpec", doctorSpec);
-        data.put("amount", amount);
-        data.put("fee", fee);
-        data.put("regFee", regFee);
-        data.put("treatFee", treatFee);
-        data.put("feeStr", feeStr);
-        data.put("regFeeStr", regFeeStr);
-        data.put("treatFeeStr", treatFeeStr);
-        data.put("doctorId", doctorId);        //医生ID
-
-        // todo:20210527 为了提高预约挂号速度,弄一个列表用作缓冲
-//        String userKey = String.format(ConstantDef.YWT_COVID19_LIST_KEY, userService.getCurrentOpenId());
-//        if (!checkExistYwtCovid19ListKey(userKey)) {
-//            return response.failedWithParameterError("请稍后再查询,谢谢!");
-//        }
         return null;
     }
 
@@ -730,7 +569,7 @@ public class IsvRegisterServiceImpl implements IsvRegisterService {
                 source = TerminalEnum.TaiheWxOfficial.getValue();
                 break;
         }
-        int paymentChannel = total > 0 ? PaymentChannelEnum.WX_PAY.getValue() : PaymentChannelEnum.FREE.getValue();
+        int paymentChannel = total > 0 ? PaymentChannelEnum.ALI_PAY.getValue() : PaymentChannelEnum.FREE.getValue();
 
         CreateTaiheRegisteredOrderRequest req = CreateTaiheRegisteredOrderRequest.newBuilder()
                 .setHospitalId(hospitalId)
@@ -769,6 +608,7 @@ public class IsvRegisterServiceImpl implements IsvRegisterService {
         return null;
     }
 
+    // 预约单详情
     @Override
     public QueryOrderDetailResponseData queryOrderDetail(QueryOrderDetailRequest request) throws Exception {
         if (Checker.isNone(request.getOrderId())) {

+ 9 - 20
onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/AlipayNotifyRequest.java

@@ -16,7 +16,6 @@ public  final class AlipayNotifyRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.ordercenter.AlipayNotifyRequest)
     AlipayNotifyRequestOrBuilder {
-private static final long serialVersionUID = 0L;
   // Use AlipayNotifyRequest.newBuilder() to construct.
   private AlipayNotifyRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -28,19 +27,14 @@ private static final long serialVersionUID = 0L;
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return this.unknownFields;
+    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
   }
   private AlipayNotifyRequest(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -50,8 +44,7 @@ private static final long serialVersionUID = 0L;
             done = true;
             break;
           default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
+            if (!input.skipField(tag)) {
               done = true;
             }
             break;
@@ -70,7 +63,6 @@ private static final long serialVersionUID = 0L;
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
-      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -143,7 +135,6 @@ private static final long serialVersionUID = 0L;
     if (!getCallbackDataBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, callbackData_);
     }
-    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -154,11 +145,11 @@ private static final long serialVersionUID = 0L;
     if (!getCallbackDataBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, callbackData_);
     }
-    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
+  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -172,7 +163,6 @@ private static final long serialVersionUID = 0L;
     boolean result = true;
     result = result && getCallbackData()
         .equals(other.getCallbackData());
-    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -354,7 +344,7 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -367,12 +357,12 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        int index, Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -390,7 +380,6 @@ private static final long serialVersionUID = 0L;
         callbackData_ = other.callbackData_;
         onChanged();
       }
-      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -507,12 +496,12 @@ private static final long serialVersionUID = 0L;
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return this;
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
+      return this;
     }
 
 
@@ -535,7 +524,7 @@ private static final long serialVersionUID = 0L;
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AlipayNotifyRequest(input, extensionRegistry);
+        return new AlipayNotifyRequest(input, extensionRegistry);
     }
   };
 

+ 9 - 20
onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/AlipayNotifyResponse.java

@@ -10,7 +10,6 @@ public  final class AlipayNotifyResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.ordercenter.AlipayNotifyResponse)
     AlipayNotifyResponseOrBuilder {
-private static final long serialVersionUID = 0L;
   // Use AlipayNotifyResponse.newBuilder() to construct.
   private AlipayNotifyResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -23,19 +22,14 @@ private static final long serialVersionUID = 0L;
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return this.unknownFields;
+    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
   }
   private AlipayNotifyResponse(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -45,8 +39,7 @@ private static final long serialVersionUID = 0L;
             done = true;
             break;
           default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
+            if (!input.skipField(tag)) {
               done = true;
             }
             break;
@@ -70,7 +63,6 @@ private static final long serialVersionUID = 0L;
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
-      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -147,7 +139,6 @@ private static final long serialVersionUID = 0L;
     if (!getInfoBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, info_);
     }
-    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -162,11 +153,11 @@ private static final long serialVersionUID = 0L;
     if (!getInfoBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, info_);
     }
-    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
+  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -182,7 +173,6 @@ private static final long serialVersionUID = 0L;
         == other.getCode());
     result = result && getInfo()
         .equals(other.getInfo());
-    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -363,7 +353,7 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -376,12 +366,12 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        int index, Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -402,7 +392,6 @@ private static final long serialVersionUID = 0L;
         info_ = other.info_;
         onChanged();
       }
-      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -525,12 +514,12 @@ private static final long serialVersionUID = 0L;
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return this;
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
+      return this;
     }
 
 
@@ -553,7 +542,7 @@ private static final long serialVersionUID = 0L;
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AlipayNotifyResponse(input, extensionRegistry);
+        return new AlipayNotifyResponse(input, extensionRegistry);
     }
   };
 

+ 9 - 20
onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/CheckIsPayingRequest.java

@@ -14,7 +14,6 @@ public  final class CheckIsPayingRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.ordercenter.CheckIsPayingRequest)
     CheckIsPayingRequestOrBuilder {
-private static final long serialVersionUID = 0L;
   // Use CheckIsPayingRequest.newBuilder() to construct.
   private CheckIsPayingRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -26,19 +25,14 @@ private static final long serialVersionUID = 0L;
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return this.unknownFields;
+    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
   }
   private CheckIsPayingRequest(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -48,8 +42,7 @@ private static final long serialVersionUID = 0L;
             done = true;
             break;
           default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
+            if (!input.skipField(tag)) {
               done = true;
             }
             break;
@@ -67,7 +60,6 @@ private static final long serialVersionUID = 0L;
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
-      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -107,7 +99,6 @@ private static final long serialVersionUID = 0L;
     if (orderId_ != 0) {
       output.writeInt32(1, orderId_);
     }
-    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -119,11 +110,11 @@ private static final long serialVersionUID = 0L;
       size += com.google.protobuf.CodedOutputStream
         .computeInt32Size(1, orderId_);
     }
-    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
+  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -137,7 +128,6 @@ private static final long serialVersionUID = 0L;
     boolean result = true;
     result = result && (getOrderId()
         == other.getOrderId());
-    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -317,7 +307,7 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -330,12 +320,12 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        int index, Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -352,7 +342,6 @@ private static final long serialVersionUID = 0L;
       if (other.getOrderId() != 0) {
         setOrderId(other.getOrderId());
       }
-      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -406,12 +395,12 @@ private static final long serialVersionUID = 0L;
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return this;
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
+      return this;
     }
 
 
@@ -434,7 +423,7 @@ private static final long serialVersionUID = 0L;
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CheckIsPayingRequest(input, extensionRegistry);
+        return new CheckIsPayingRequest(input, extensionRegistry);
     }
   };
 

+ 9 - 20
onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/CheckIsPayingResponse.java

@@ -14,7 +14,6 @@ public  final class CheckIsPayingResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.ordercenter.CheckIsPayingResponse)
     CheckIsPayingResponseOrBuilder {
-private static final long serialVersionUID = 0L;
   // Use CheckIsPayingResponse.newBuilder() to construct.
   private CheckIsPayingResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -28,19 +27,14 @@ private static final long serialVersionUID = 0L;
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return this.unknownFields;
+    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
   }
   private CheckIsPayingResponse(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -50,8 +44,7 @@ private static final long serialVersionUID = 0L;
             done = true;
             break;
           default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
+            if (!input.skipField(tag)) {
               done = true;
             }
             break;
@@ -80,7 +73,6 @@ private static final long serialVersionUID = 0L;
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
-      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -173,7 +165,6 @@ private static final long serialVersionUID = 0L;
     if (paying_ != false) {
       output.writeBool(3, paying_);
     }
-    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -192,11 +183,11 @@ private static final long serialVersionUID = 0L;
       size += com.google.protobuf.CodedOutputStream
         .computeBoolSize(3, paying_);
     }
-    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
+  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -214,7 +205,6 @@ private static final long serialVersionUID = 0L;
         .equals(other.getInfo());
     result = result && (getPaying()
         == other.getPaying());
-    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -405,7 +395,7 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -418,12 +408,12 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        int index, Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -447,7 +437,6 @@ private static final long serialVersionUID = 0L;
       if (other.getPaying() != false) {
         setPaying(other.getPaying());
       }
-      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -608,12 +597,12 @@ private static final long serialVersionUID = 0L;
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return this;
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
+      return this;
     }
 
 
@@ -636,7 +625,7 @@ private static final long serialVersionUID = 0L;
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CheckIsPayingResponse(input, extensionRegistry);
+        return new CheckIsPayingResponse(input, extensionRegistry);
     }
   };
 

+ 9 - 20
onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/CleanPayLockRequest.java

@@ -14,7 +14,6 @@ public  final class CleanPayLockRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.ordercenter.CleanPayLockRequest)
     CleanPayLockRequestOrBuilder {
-private static final long serialVersionUID = 0L;
   // Use CleanPayLockRequest.newBuilder() to construct.
   private CleanPayLockRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -26,19 +25,14 @@ private static final long serialVersionUID = 0L;
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return this.unknownFields;
+    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
   }
   private CleanPayLockRequest(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -48,8 +42,7 @@ private static final long serialVersionUID = 0L;
             done = true;
             break;
           default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
+            if (!input.skipField(tag)) {
               done = true;
             }
             break;
@@ -67,7 +60,6 @@ private static final long serialVersionUID = 0L;
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
-      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -107,7 +99,6 @@ private static final long serialVersionUID = 0L;
     if (orderId_ != 0) {
       output.writeInt32(1, orderId_);
     }
-    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -119,11 +110,11 @@ private static final long serialVersionUID = 0L;
       size += com.google.protobuf.CodedOutputStream
         .computeInt32Size(1, orderId_);
     }
-    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
+  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -137,7 +128,6 @@ private static final long serialVersionUID = 0L;
     boolean result = true;
     result = result && (getOrderId()
         == other.getOrderId());
-    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -317,7 +307,7 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -330,12 +320,12 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        int index, Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -352,7 +342,6 @@ private static final long serialVersionUID = 0L;
       if (other.getOrderId() != 0) {
         setOrderId(other.getOrderId());
       }
-      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -406,12 +395,12 @@ private static final long serialVersionUID = 0L;
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return this;
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
+      return this;
     }
 
 
@@ -434,7 +423,7 @@ private static final long serialVersionUID = 0L;
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CleanPayLockRequest(input, extensionRegistry);
+        return new CleanPayLockRequest(input, extensionRegistry);
     }
   };
 

+ 9 - 20
onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/CleanPayLockResponse.java

@@ -14,7 +14,6 @@ public  final class CleanPayLockResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.ordercenter.CleanPayLockResponse)
     CleanPayLockResponseOrBuilder {
-private static final long serialVersionUID = 0L;
   // Use CleanPayLockResponse.newBuilder() to construct.
   private CleanPayLockResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -27,19 +26,14 @@ private static final long serialVersionUID = 0L;
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return this.unknownFields;
+    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
   }
   private CleanPayLockResponse(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -49,8 +43,7 @@ private static final long serialVersionUID = 0L;
             done = true;
             break;
           default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
+            if (!input.skipField(tag)) {
               done = true;
             }
             break;
@@ -74,7 +67,6 @@ private static final long serialVersionUID = 0L;
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
-      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -151,7 +143,6 @@ private static final long serialVersionUID = 0L;
     if (!getInfoBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, info_);
     }
-    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -166,11 +157,11 @@ private static final long serialVersionUID = 0L;
     if (!getInfoBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, info_);
     }
-    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
+  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -186,7 +177,6 @@ private static final long serialVersionUID = 0L;
         == other.getCode());
     result = result && getInfo()
         .equals(other.getInfo());
-    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -371,7 +361,7 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -384,12 +374,12 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        int index, Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -410,7 +400,6 @@ private static final long serialVersionUID = 0L;
         info_ = other.info_;
         onChanged();
       }
-      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -533,12 +522,12 @@ private static final long serialVersionUID = 0L;
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return this;
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
+      return this;
     }
 
 
@@ -561,7 +550,7 @@ private static final long serialVersionUID = 0L;
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CleanPayLockResponse(input, extensionRegistry);
+        return new CleanPayLockResponse(input, extensionRegistry);
     }
   };
 

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

@@ -14,7 +14,6 @@ public  final class CreateAlipayOrderRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.ordercenter.CreateAlipayOrderRequest)
     CreateAlipayOrderRequestOrBuilder {
-private static final long serialVersionUID = 0L;
   // Use CreateAlipayOrderRequest.newBuilder() to construct.
   private CreateAlipayOrderRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -33,19 +32,14 @@ private static final long serialVersionUID = 0L;
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return this.unknownFields;
+    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
   }
   private CreateAlipayOrderRequest(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -55,8 +49,7 @@ private static final long serialVersionUID = 0L;
             done = true;
             break;
           default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
+            if (!input.skipField(tag)) {
               done = true;
             }
             break;
@@ -113,7 +106,6 @@ private static final long serialVersionUID = 0L;
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
-      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -385,7 +377,6 @@ private static final long serialVersionUID = 0L;
     if (terminal_ != 0) {
       output.writeInt32(8, terminal_);
     }
-    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -421,11 +412,11 @@ private static final long serialVersionUID = 0L;
       size += com.google.protobuf.CodedOutputStream
         .computeInt32Size(8, terminal_);
     }
-    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
+  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -453,7 +444,6 @@ private static final long serialVersionUID = 0L;
         == other.getUserId());
     result = result && (getTerminal()
         == other.getTerminal());
-    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -668,7 +658,7 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -681,12 +671,12 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        int index, Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -728,7 +718,6 @@ private static final long serialVersionUID = 0L;
       if (other.getTerminal() != 0) {
         setTerminal(other.getTerminal());
       }
-      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1264,12 +1253,12 @@ private static final long serialVersionUID = 0L;
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return this;
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
+      return this;
     }
 
 
@@ -1292,7 +1281,7 @@ private static final long serialVersionUID = 0L;
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateAlipayOrderRequest(input, extensionRegistry);
+        return new CreateAlipayOrderRequest(input, extensionRegistry);
     }
   };
 

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

@@ -14,7 +14,6 @@ public  final class CreateAlipayOrderResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.ordercenter.CreateAlipayOrderResponse)
     CreateAlipayOrderResponseOrBuilder {
-private static final long serialVersionUID = 0L;
   // Use CreateAlipayOrderResponse.newBuilder() to construct.
   private CreateAlipayOrderResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -23,24 +22,21 @@ private static final long serialVersionUID = 0L;
     code_ = 0;
     info_ = "";
     tradeNo_ = "";
+    orderId_ = 0;
+    orderNo_ = "";
   }
 
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return this.unknownFields;
+    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
   }
   private CreateAlipayOrderResponse(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -50,8 +46,7 @@ private static final long serialVersionUID = 0L;
             done = true;
             break;
           default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
+            if (!input.skipField(tag)) {
               done = true;
             }
             break;
@@ -73,6 +68,17 @@ private static final long serialVersionUID = 0L;
             tradeNo_ = s;
             break;
           }
+          case 32: {
+
+            orderId_ = input.readInt32();
+            break;
+          }
+          case 42: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            orderNo_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -81,7 +87,6 @@ private static final long serialVersionUID = 0L;
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
-      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -182,6 +187,49 @@ private static final long serialVersionUID = 0L;
     }
   }
 
+  public static final int ORDERID_FIELD_NUMBER = 4;
+  private int orderId_;
+  /**
+   * <code>int32 orderId = 4;</code>
+   */
+  public int getOrderId() {
+    return orderId_;
+  }
+
+  public static final int ORDERNO_FIELD_NUMBER = 5;
+  private volatile java.lang.Object orderNo_;
+  /**
+   * <code>string orderNo = 5;</code>
+   */
+  public java.lang.String getOrderNo() {
+    java.lang.Object ref = orderNo_;
+    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();
+      orderNo_ = s;
+      return s;
+    }
+  }
+  /**
+   * <code>string orderNo = 5;</code>
+   */
+  public com.google.protobuf.ByteString
+      getOrderNoBytes() {
+    java.lang.Object ref = orderNo_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      orderNo_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
   private byte memoizedIsInitialized = -1;
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -203,7 +251,12 @@ private static final long serialVersionUID = 0L;
     if (!getTradeNoBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 3, tradeNo_);
     }
-    unknownFields.writeTo(output);
+    if (orderId_ != 0) {
+      output.writeInt32(4, orderId_);
+    }
+    if (!getOrderNoBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 5, orderNo_);
+    }
   }
 
   public int getSerializedSize() {
@@ -221,11 +274,18 @@ private static final long serialVersionUID = 0L;
     if (!getTradeNoBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, tradeNo_);
     }
-    size += unknownFields.getSerializedSize();
+    if (orderId_ != 0) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt32Size(4, orderId_);
+    }
+    if (!getOrderNoBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, orderNo_);
+    }
     memoizedSize = size;
     return size;
   }
 
+  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -243,7 +303,10 @@ private static final long serialVersionUID = 0L;
         .equals(other.getInfo());
     result = result && getTradeNo()
         .equals(other.getTradeNo());
-    result = result && unknownFields.equals(other.unknownFields);
+    result = result && (getOrderId()
+        == other.getOrderId());
+    result = result && getOrderNo()
+        .equals(other.getOrderNo());
     return result;
   }
 
@@ -260,6 +323,10 @@ private static final long serialVersionUID = 0L;
     hash = (53 * hash) + getInfo().hashCode();
     hash = (37 * hash) + TRADENO_FIELD_NUMBER;
     hash = (53 * hash) + getTradeNo().hashCode();
+    hash = (37 * hash) + ORDERID_FIELD_NUMBER;
+    hash = (53 * hash) + getOrderId();
+    hash = (37 * hash) + ORDERNO_FIELD_NUMBER;
+    hash = (53 * hash) + getOrderNo().hashCode();
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -399,6 +466,10 @@ private static final long serialVersionUID = 0L;
 
       tradeNo_ = "";
 
+      orderId_ = 0;
+
+      orderNo_ = "";
+
       return this;
     }
 
@@ -424,6 +495,8 @@ private static final long serialVersionUID = 0L;
       result.code_ = code_;
       result.info_ = info_;
       result.tradeNo_ = tradeNo_;
+      result.orderId_ = orderId_;
+      result.orderNo_ = orderNo_;
       onBuilt();
       return result;
     }
@@ -433,7 +506,7 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -446,12 +519,12 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        int index, Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -476,7 +549,13 @@ private static final long serialVersionUID = 0L;
         tradeNo_ = other.tradeNo_;
         onChanged();
       }
-      this.mergeUnknownFields(other.unknownFields);
+      if (other.getOrderId() != 0) {
+        setOrderId(other.getOrderId());
+      }
+      if (!other.getOrderNo().isEmpty()) {
+        orderNo_ = other.orderNo_;
+        onChanged();
+      }
       onChanged();
       return this;
     }
@@ -686,14 +765,109 @@ private static final long serialVersionUID = 0L;
       onChanged();
       return this;
     }
+
+    private int orderId_ ;
+    /**
+     * <code>int32 orderId = 4;</code>
+     */
+    public int getOrderId() {
+      return orderId_;
+    }
+    /**
+     * <code>int32 orderId = 4;</code>
+     */
+    public Builder setOrderId(int value) {
+      
+      orderId_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <code>int32 orderId = 4;</code>
+     */
+    public Builder clearOrderId() {
+      
+      orderId_ = 0;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object orderNo_ = "";
+    /**
+     * <code>string orderNo = 5;</code>
+     */
+    public java.lang.String getOrderNo() {
+      java.lang.Object ref = orderNo_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        orderNo_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * <code>string orderNo = 5;</code>
+     */
+    public com.google.protobuf.ByteString
+        getOrderNoBytes() {
+      java.lang.Object ref = orderNo_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        orderNo_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * <code>string orderNo = 5;</code>
+     */
+    public Builder setOrderNo(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      orderNo_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <code>string orderNo = 5;</code>
+     */
+    public Builder clearOrderNo() {
+      
+      orderNo_ = getDefaultInstance().getOrderNo();
+      onChanged();
+      return this;
+    }
+    /**
+     * <code>string orderNo = 5;</code>
+     */
+    public Builder setOrderNoBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      orderNo_ = value;
+      onChanged();
+      return this;
+    }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return this;
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
+      return this;
     }
 
 
@@ -716,7 +890,7 @@ private static final long serialVersionUID = 0L;
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateAlipayOrderResponse(input, extensionRegistry);
+        return new CreateAlipayOrderResponse(input, extensionRegistry);
     }
   };
 

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

@@ -39,4 +39,19 @@ public interface CreateAlipayOrderResponseOrBuilder extends
    */
   com.google.protobuf.ByteString
       getTradeNoBytes();
+
+  /**
+   * <code>int32 orderId = 4;</code>
+   */
+  int getOrderId();
+
+  /**
+   * <code>string orderNo = 5;</code>
+   */
+  java.lang.String getOrderNo();
+  /**
+   * <code>string orderNo = 5;</code>
+   */
+  com.google.protobuf.ByteString
+      getOrderNoBytes();
 }

+ 9 - 20
onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/CreateOrderRequest.java

@@ -14,7 +14,6 @@ public  final class CreateOrderRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.ordercenter.CreateOrderRequest)
     CreateOrderRequestOrBuilder {
-private static final long serialVersionUID = 0L;
   // Use CreateOrderRequest.newBuilder() to construct.
   private CreateOrderRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -40,19 +39,14 @@ private static final long serialVersionUID = 0L;
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return this.unknownFields;
+    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
   }
   private CreateOrderRequest(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -62,8 +56,7 @@ private static final long serialVersionUID = 0L;
             done = true;
             break;
           default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
+            if (!input.skipField(tag)) {
               done = true;
             }
             break;
@@ -160,7 +153,6 @@ private static final long serialVersionUID = 0L;
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
-      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -629,7 +621,6 @@ private static final long serialVersionUID = 0L;
     if (!getRefundNotifyRestUrlBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 15, refundNotifyRestUrl_);
     }
-    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -688,11 +679,11 @@ private static final long serialVersionUID = 0L;
     if (!getRefundNotifyRestUrlBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(15, refundNotifyRestUrl_);
     }
-    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
+  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -734,7 +725,6 @@ private static final long serialVersionUID = 0L;
         == other.getTerminal());
     result = result && getRefundNotifyRestUrl()
         .equals(other.getRefundNotifyRestUrl());
-    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -984,7 +974,7 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -997,12 +987,12 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        int index, Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -1070,7 +1060,6 @@ private static final long serialVersionUID = 0L;
         refundNotifyRestUrl_ = other.refundNotifyRestUrl_;
         onChanged();
       }
-      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1967,12 +1956,12 @@ private static final long serialVersionUID = 0L;
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return this;
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
+      return this;
     }
 
 
@@ -1995,7 +1984,7 @@ private static final long serialVersionUID = 0L;
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateOrderRequest(input, extensionRegistry);
+        return new CreateOrderRequest(input, extensionRegistry);
     }
   };
 

+ 9 - 20
onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/CreateOrderResponse.java

@@ -14,7 +14,6 @@ public  final class CreateOrderResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.ordercenter.CreateOrderResponse)
     CreateOrderResponseOrBuilder {
-private static final long serialVersionUID = 0L;
   // Use CreateOrderResponse.newBuilder() to construct.
   private CreateOrderResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -29,19 +28,14 @@ private static final long serialVersionUID = 0L;
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return this.unknownFields;
+    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
   }
   private CreateOrderResponse(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -51,8 +45,7 @@ private static final long serialVersionUID = 0L;
             done = true;
             break;
           default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
+            if (!input.skipField(tag)) {
               done = true;
             }
             break;
@@ -87,7 +80,6 @@ private static final long serialVersionUID = 0L;
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
-      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -213,7 +205,6 @@ private static final long serialVersionUID = 0L;
     if (!getOrderNoBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 4, orderNo_);
     }
-    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -235,11 +226,11 @@ private static final long serialVersionUID = 0L;
     if (!getOrderNoBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, orderNo_);
     }
-    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
+  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -259,7 +250,6 @@ private static final long serialVersionUID = 0L;
         == other.getOrderId());
     result = result && getOrderNo()
         .equals(other.getOrderNo());
-    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -454,7 +444,7 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -467,12 +457,12 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        int index, Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -500,7 +490,6 @@ private static final long serialVersionUID = 0L;
         orderNo_ = other.orderNo_;
         onChanged();
       }
-      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -718,12 +707,12 @@ private static final long serialVersionUID = 0L;
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return this;
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
+      return this;
     }
 
 
@@ -746,7 +735,7 @@ private static final long serialVersionUID = 0L;
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateOrderResponse(input, extensionRegistry);
+        return new CreateOrderResponse(input, extensionRegistry);
     }
   };
 

+ 9 - 20
onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/FinishPayByPOSRequest.java

@@ -14,7 +14,6 @@ public  final class FinishPayByPOSRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.ordercenter.FinishPayByPOSRequest)
     FinishPayByPOSRequestOrBuilder {
-private static final long serialVersionUID = 0L;
   // Use FinishPayByPOSRequest.newBuilder() to construct.
   private FinishPayByPOSRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -34,19 +33,14 @@ private static final long serialVersionUID = 0L;
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return this.unknownFields;
+    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
   }
   private FinishPayByPOSRequest(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -56,8 +50,7 @@ private static final long serialVersionUID = 0L;
             done = true;
             break;
           default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
+            if (!input.skipField(tag)) {
               done = true;
             }
             break;
@@ -124,7 +117,6 @@ private static final long serialVersionUID = 0L;
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
-      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -557,7 +549,6 @@ private static final long serialVersionUID = 0L;
     if (!getTerminalTraceNoBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 9, terminalTraceNo_);
     }
-    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -592,11 +583,11 @@ private static final long serialVersionUID = 0L;
     if (!getTerminalTraceNoBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, terminalTraceNo_);
     }
-    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
+  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -626,7 +617,6 @@ private static final long serialVersionUID = 0L;
         .equals(other.getTerminalId());
     result = result && getTerminalTraceNo()
         .equals(other.getTerminalTraceNo());
-    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -846,7 +836,7 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -859,12 +849,12 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        int index, Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -914,7 +904,6 @@ private static final long serialVersionUID = 0L;
         terminalTraceNo_ = other.terminalTraceNo_;
         onChanged();
       }
-      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1743,12 +1732,12 @@ private static final long serialVersionUID = 0L;
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return this;
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
+      return this;
     }
 
 
@@ -1771,7 +1760,7 @@ private static final long serialVersionUID = 0L;
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new FinishPayByPOSRequest(input, extensionRegistry);
+        return new FinishPayByPOSRequest(input, extensionRegistry);
     }
   };
 

+ 9 - 20
onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/FinishPayByPOSResponse.java

@@ -14,7 +14,6 @@ public  final class FinishPayByPOSResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.ordercenter.FinishPayByPOSResponse)
     FinishPayByPOSResponseOrBuilder {
-private static final long serialVersionUID = 0L;
   // Use FinishPayByPOSResponse.newBuilder() to construct.
   private FinishPayByPOSResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -27,19 +26,14 @@ private static final long serialVersionUID = 0L;
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return this.unknownFields;
+    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
   }
   private FinishPayByPOSResponse(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -49,8 +43,7 @@ private static final long serialVersionUID = 0L;
             done = true;
             break;
           default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
+            if (!input.skipField(tag)) {
               done = true;
             }
             break;
@@ -74,7 +67,6 @@ private static final long serialVersionUID = 0L;
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
-      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -151,7 +143,6 @@ private static final long serialVersionUID = 0L;
     if (!getInfoBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, info_);
     }
-    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -166,11 +157,11 @@ private static final long serialVersionUID = 0L;
     if (!getInfoBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, info_);
     }
-    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
+  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -186,7 +177,6 @@ private static final long serialVersionUID = 0L;
         == other.getCode());
     result = result && getInfo()
         .equals(other.getInfo());
-    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -371,7 +361,7 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -384,12 +374,12 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        int index, Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -410,7 +400,6 @@ private static final long serialVersionUID = 0L;
         info_ = other.info_;
         onChanged();
       }
-      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -533,12 +522,12 @@ private static final long serialVersionUID = 0L;
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return this;
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
+      return this;
     }
 
 
@@ -561,7 +550,7 @@ private static final long serialVersionUID = 0L;
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new FinishPayByPOSResponse(input, extensionRegistry);
+        return new FinishPayByPOSResponse(input, extensionRegistry);
     }
   };
 

+ 9 - 20
onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/GetOrderBillRequest.java

@@ -14,7 +14,6 @@ public  final class GetOrderBillRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.ordercenter.GetOrderBillRequest)
     GetOrderBillRequestOrBuilder {
-private static final long serialVersionUID = 0L;
   // Use GetOrderBillRequest.newBuilder() to construct.
   private GetOrderBillRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -26,19 +25,14 @@ private static final long serialVersionUID = 0L;
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return this.unknownFields;
+    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
   }
   private GetOrderBillRequest(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -48,8 +42,7 @@ private static final long serialVersionUID = 0L;
             done = true;
             break;
           default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
+            if (!input.skipField(tag)) {
               done = true;
             }
             break;
@@ -68,7 +61,6 @@ private static final long serialVersionUID = 0L;
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
-      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -141,7 +133,6 @@ private static final long serialVersionUID = 0L;
     if (!getBillDateBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, billDate_);
     }
-    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -152,11 +143,11 @@ private static final long serialVersionUID = 0L;
     if (!getBillDateBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, billDate_);
     }
-    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
+  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -170,7 +161,6 @@ private static final long serialVersionUID = 0L;
     boolean result = true;
     result = result && getBillDate()
         .equals(other.getBillDate());
-    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -350,7 +340,7 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -363,12 +353,12 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        int index, Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -386,7 +376,6 @@ private static final long serialVersionUID = 0L;
         billDate_ = other.billDate_;
         onChanged();
       }
-      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -503,12 +492,12 @@ private static final long serialVersionUID = 0L;
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return this;
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
+      return this;
     }
 
 
@@ -531,7 +520,7 @@ private static final long serialVersionUID = 0L;
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetOrderBillRequest(input, extensionRegistry);
+        return new GetOrderBillRequest(input, extensionRegistry);
     }
   };
 

+ 9 - 20
onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/GetOrderBillResponse.java

@@ -14,7 +14,6 @@ public  final class GetOrderBillResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.ordercenter.GetOrderBillResponse)
     GetOrderBillResponseOrBuilder {
-private static final long serialVersionUID = 0L;
   // Use GetOrderBillResponse.newBuilder() to construct.
   private GetOrderBillResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -28,19 +27,14 @@ private static final long serialVersionUID = 0L;
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return this.unknownFields;
+    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
   }
   private GetOrderBillResponse(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -50,8 +44,7 @@ private static final long serialVersionUID = 0L;
             done = true;
             break;
           default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
+            if (!input.skipField(tag)) {
               done = true;
             }
             break;
@@ -81,7 +74,6 @@ private static final long serialVersionUID = 0L;
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
-      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -203,7 +195,6 @@ private static final long serialVersionUID = 0L;
     if (!getDataBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 3, data_);
     }
-    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -221,11 +212,11 @@ private static final long serialVersionUID = 0L;
     if (!getDataBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, data_);
     }
-    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
+  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -243,7 +234,6 @@ private static final long serialVersionUID = 0L;
         .equals(other.getInfo());
     result = result && getData()
         .equals(other.getData());
-    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -433,7 +423,7 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -446,12 +436,12 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        int index, Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -476,7 +466,6 @@ private static final long serialVersionUID = 0L;
         data_ = other.data_;
         onChanged();
       }
-      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -688,12 +677,12 @@ private static final long serialVersionUID = 0L;
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return this;
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
+      return this;
     }
 
 
@@ -716,7 +705,7 @@ private static final long serialVersionUID = 0L;
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetOrderBillResponse(input, extensionRegistry);
+        return new GetOrderBillResponse(input, extensionRegistry);
     }
   };
 

+ 9 - 20
onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/GetOrderInfeResponse.java

@@ -14,7 +14,6 @@ public  final class GetOrderInfeResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.ordercenter.GetOrderInfeResponse)
     GetOrderInfeResponseOrBuilder {
-private static final long serialVersionUID = 0L;
   // Use GetOrderInfeResponse.newBuilder() to construct.
   private GetOrderInfeResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -31,19 +30,14 @@ private static final long serialVersionUID = 0L;
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return this.unknownFields;
+    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
   }
   private GetOrderInfeResponse(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -53,8 +47,7 @@ private static final long serialVersionUID = 0L;
             done = true;
             break;
           default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
+            if (!input.skipField(tag)) {
               done = true;
             }
             break;
@@ -99,7 +92,6 @@ private static final long serialVersionUID = 0L;
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
-      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -249,7 +241,6 @@ private static final long serialVersionUID = 0L;
     if (amount_ != 0) {
       output.writeInt32(6, amount_);
     }
-    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -279,11 +270,11 @@ private static final long serialVersionUID = 0L;
       size += com.google.protobuf.CodedOutputStream
         .computeInt32Size(6, amount_);
     }
-    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
+  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -307,7 +298,6 @@ private static final long serialVersionUID = 0L;
         == other.getOrderType());
     result = result && (getAmount()
         == other.getAmount());
-    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -512,7 +502,7 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -525,12 +515,12 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        int index, Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -564,7 +554,6 @@ private static final long serialVersionUID = 0L;
       if (other.getAmount() != 0) {
         setAmount(other.getAmount());
       }
-      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -834,12 +823,12 @@ private static final long serialVersionUID = 0L;
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return this;
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
+      return this;
     }
 
 
@@ -862,7 +851,7 @@ private static final long serialVersionUID = 0L;
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetOrderInfeResponse(input, extensionRegistry);
+        return new GetOrderInfeResponse(input, extensionRegistry);
     }
   };
 

+ 9 - 20
onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/GetOrderInfoRequest.java

@@ -14,7 +14,6 @@ public  final class GetOrderInfoRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.ordercenter.GetOrderInfoRequest)
     GetOrderInfoRequestOrBuilder {
-private static final long serialVersionUID = 0L;
   // Use GetOrderInfoRequest.newBuilder() to construct.
   private GetOrderInfoRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -27,19 +26,14 @@ private static final long serialVersionUID = 0L;
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return this.unknownFields;
+    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
   }
   private GetOrderInfoRequest(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -49,8 +43,7 @@ private static final long serialVersionUID = 0L;
             done = true;
             break;
           default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
+            if (!input.skipField(tag)) {
               done = true;
             }
             break;
@@ -74,7 +67,6 @@ private static final long serialVersionUID = 0L;
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
-      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -151,7 +143,6 @@ private static final long serialVersionUID = 0L;
     if (!getOrderNoBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, orderNo_);
     }
-    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -166,11 +157,11 @@ private static final long serialVersionUID = 0L;
     if (!getOrderNoBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, orderNo_);
     }
-    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
+  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -186,7 +177,6 @@ private static final long serialVersionUID = 0L;
         == other.getOrderId());
     result = result && getOrderNo()
         .equals(other.getOrderNo());
-    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -371,7 +361,7 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -384,12 +374,12 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        int index, Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -410,7 +400,6 @@ private static final long serialVersionUID = 0L;
         orderNo_ = other.orderNo_;
         onChanged();
       }
-      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -533,12 +522,12 @@ private static final long serialVersionUID = 0L;
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return this;
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
+      return this;
     }
 
 
@@ -561,7 +550,7 @@ private static final long serialVersionUID = 0L;
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetOrderInfoRequest(input, extensionRegistry);
+        return new GetOrderInfoRequest(input, extensionRegistry);
     }
   };
 

+ 9 - 20
onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/ICBCPaymentNotifyRequest.java

@@ -14,7 +14,6 @@ public  final class ICBCPaymentNotifyRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.ordercenter.ICBCPaymentNotifyRequest)
     ICBCPaymentNotifyRequestOrBuilder {
-private static final long serialVersionUID = 0L;
   // Use ICBCPaymentNotifyRequest.newBuilder() to construct.
   private ICBCPaymentNotifyRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -33,19 +32,14 @@ private static final long serialVersionUID = 0L;
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return this.unknownFields;
+    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
   }
   private ICBCPaymentNotifyRequest(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -55,8 +49,7 @@ private static final long serialVersionUID = 0L;
             done = true;
             break;
           default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
+            if (!input.skipField(tag)) {
               done = true;
             }
             break;
@@ -114,7 +107,6 @@ private static final long serialVersionUID = 0L;
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
-      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -415,7 +407,6 @@ private static final long serialVersionUID = 0L;
     if (payDate_ != 0L) {
       output.writeInt64(8, payDate_);
     }
-    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -450,11 +441,11 @@ private static final long serialVersionUID = 0L;
       size += com.google.protobuf.CodedOutputStream
         .computeInt64Size(8, payDate_);
     }
-    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
+  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -482,7 +473,6 @@ private static final long serialVersionUID = 0L;
         == other.getPayFinishDate());
     result = result && (getPayDate()
         == other.getPayDate());
-    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -699,7 +689,7 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -712,12 +702,12 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        int index, Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -760,7 +750,6 @@ private static final long serialVersionUID = 0L;
       if (other.getPayDate() != 0L) {
         setPayDate(other.getPayDate());
       }
-      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1347,12 +1336,12 @@ private static final long serialVersionUID = 0L;
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return this;
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
+      return this;
     }
 
 
@@ -1375,7 +1364,7 @@ private static final long serialVersionUID = 0L;
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ICBCPaymentNotifyRequest(input, extensionRegistry);
+        return new ICBCPaymentNotifyRequest(input, extensionRegistry);
     }
   };
 

+ 9 - 20
onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/ICBCPaymentNotifyResponse.java

@@ -14,7 +14,6 @@ public  final class ICBCPaymentNotifyResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.ordercenter.ICBCPaymentNotifyResponse)
     ICBCPaymentNotifyResponseOrBuilder {
-private static final long serialVersionUID = 0L;
   // Use ICBCPaymentNotifyResponse.newBuilder() to construct.
   private ICBCPaymentNotifyResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -27,19 +26,14 @@ private static final long serialVersionUID = 0L;
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return this.unknownFields;
+    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
   }
   private ICBCPaymentNotifyResponse(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -49,8 +43,7 @@ private static final long serialVersionUID = 0L;
             done = true;
             break;
           default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
+            if (!input.skipField(tag)) {
               done = true;
             }
             break;
@@ -74,7 +67,6 @@ private static final long serialVersionUID = 0L;
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
-      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -151,7 +143,6 @@ private static final long serialVersionUID = 0L;
     if (!getInfoBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, info_);
     }
-    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -166,11 +157,11 @@ private static final long serialVersionUID = 0L;
     if (!getInfoBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, info_);
     }
-    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
+  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -186,7 +177,6 @@ private static final long serialVersionUID = 0L;
         == other.getCode());
     result = result && getInfo()
         .equals(other.getInfo());
-    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -371,7 +361,7 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -384,12 +374,12 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        int index, Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -410,7 +400,6 @@ private static final long serialVersionUID = 0L;
         info_ = other.info_;
         onChanged();
       }
-      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -533,12 +522,12 @@ private static final long serialVersionUID = 0L;
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return this;
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
+      return this;
     }
 
 
@@ -561,7 +550,7 @@ private static final long serialVersionUID = 0L;
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ICBCPaymentNotifyResponse(input, extensionRegistry);
+        return new ICBCPaymentNotifyResponse(input, extensionRegistry);
     }
   };
 

+ 18 - 40
onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/ICBCPaymentRequest.java

@@ -14,7 +14,6 @@ public  final class ICBCPaymentRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.ordercenter.ICBCPaymentRequest)
     ICBCPaymentRequestOrBuilder {
-private static final long serialVersionUID = 0L;
   // Use ICBCPaymentRequest.newBuilder() to construct.
   private ICBCPaymentRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -35,19 +34,14 @@ private static final long serialVersionUID = 0L;
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return this.unknownFields;
+    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
   }
   private ICBCPaymentRequest(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -57,8 +51,7 @@ private static final long serialVersionUID = 0L;
             done = true;
             break;
           default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
+            if (!input.skipField(tag)) {
               done = true;
             }
             break;
@@ -132,7 +125,6 @@ private static final long serialVersionUID = 0L;
       if (((mutable_bitField0_ & 0x00000200) == 0x00000200)) {
         subOrder_ = java.util.Collections.unmodifiableList(subOrder_);
       }
-      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -181,7 +173,6 @@ private static final long serialVersionUID = 0L;
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:com.ywt.gapi.ordercenter.ICBCPaymentRequest.SubOrder)
       SubOrderOrBuilder {
-  private static final long serialVersionUID = 0L;
     // Use SubOrder.newBuilder() to construct.
     private SubOrder(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -194,19 +185,14 @@ private static final long serialVersionUID = 0L;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return this.unknownFields;
+      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
     }
     private SubOrder(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -216,8 +202,7 @@ private static final long serialVersionUID = 0L;
               done = true;
               break;
             default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
+              if (!input.skipField(tag)) {
                 done = true;
               }
               break;
@@ -240,7 +225,6 @@ private static final long serialVersionUID = 0L;
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
-        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -300,7 +284,6 @@ private static final long serialVersionUID = 0L;
       if (orderId_ != 0) {
         output.writeInt32(2, orderId_);
       }
-      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -316,11 +299,11 @@ private static final long serialVersionUID = 0L;
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(2, orderId_);
       }
-      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
+    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -336,7 +319,6 @@ private static final long serialVersionUID = 0L;
           == other.getAmount());
       result = result && (getOrderId()
           == other.getOrderId());
-      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -521,7 +503,7 @@ private static final long serialVersionUID = 0L;
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
+          Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -534,12 +516,12 @@ private static final long serialVersionUID = 0L;
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, java.lang.Object value) {
+          int index, Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
+          Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -559,7 +541,6 @@ private static final long serialVersionUID = 0L;
         if (other.getOrderId() != 0) {
           setOrderId(other.getOrderId());
         }
-        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -663,12 +644,12 @@ private static final long serialVersionUID = 0L;
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.setUnknownFieldsProto3(unknownFields);
+        return this;
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.mergeUnknownFields(unknownFields);
+        return this;
       }
 
 
@@ -691,7 +672,7 @@ private static final long serialVersionUID = 0L;
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new SubOrder(input, extensionRegistry);
+          return new SubOrder(input, extensionRegistry);
       }
     };
 
@@ -1041,7 +1022,6 @@ private static final long serialVersionUID = 0L;
     for (int i = 0; i < subOrder_.size(); i++) {
       output.writeMessage(10, subOrder_.get(i));
     }
-    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -1085,11 +1065,11 @@ private static final long serialVersionUID = 0L;
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(10, subOrder_.get(i));
     }
-    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
+  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -1121,7 +1101,6 @@ private static final long serialVersionUID = 0L;
         == other.getPayType());
     result = result && getSubOrderList()
         .equals(other.getSubOrderList());
-    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -1364,7 +1343,7 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -1377,12 +1356,12 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        int index, Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -1453,7 +1432,6 @@ private static final long serialVersionUID = 0L;
           }
         }
       }
-      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -2340,12 +2318,12 @@ private static final long serialVersionUID = 0L;
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return this;
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
+      return this;
     }
 
 
@@ -2368,7 +2346,7 @@ private static final long serialVersionUID = 0L;
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ICBCPaymentRequest(input, extensionRegistry);
+        return new ICBCPaymentRequest(input, extensionRegistry);
     }
   };
 

+ 9 - 20
onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/ICBCPaymentResponse.java

@@ -14,7 +14,6 @@ public  final class ICBCPaymentResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.ordercenter.ICBCPaymentResponse)
     ICBCPaymentResponseOrBuilder {
-private static final long serialVersionUID = 0L;
   // Use ICBCPaymentResponse.newBuilder() to construct.
   private ICBCPaymentResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -33,19 +32,14 @@ private static final long serialVersionUID = 0L;
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return this.unknownFields;
+    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
   }
   private ICBCPaymentResponse(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -55,8 +49,7 @@ private static final long serialVersionUID = 0L;
             done = true;
             break;
           default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
+            if (!input.skipField(tag)) {
               done = true;
             }
             break;
@@ -116,7 +109,6 @@ private static final long serialVersionUID = 0L;
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
-      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -415,7 +407,6 @@ private static final long serialVersionUID = 0L;
     if (!getAppIdBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 8, appId_);
     }
-    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -448,11 +439,11 @@ private static final long serialVersionUID = 0L;
     if (!getAppIdBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, appId_);
     }
-    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
+  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -480,7 +471,6 @@ private static final long serialVersionUID = 0L;
         .equals(other.getPaySign());
     result = result && getAppId()
         .equals(other.getAppId());
-    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -695,7 +685,7 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -708,12 +698,12 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        int index, Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -758,7 +748,6 @@ private static final long serialVersionUID = 0L;
         appId_ = other.appId_;
         onChanged();
       }
-      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1295,12 +1284,12 @@ private static final long serialVersionUID = 0L;
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return this;
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
+      return this;
     }
 
 
@@ -1323,7 +1312,7 @@ private static final long serialVersionUID = 0L;
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ICBCPaymentResponse(input, extensionRegistry);
+        return new ICBCPaymentResponse(input, extensionRegistry);
     }
   };
 

+ 18 - 40
onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/ICBCRefundNotifyRequest.java

@@ -14,7 +14,6 @@ public  final class ICBCRefundNotifyRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.ordercenter.ICBCRefundNotifyRequest)
     ICBCRefundNotifyRequestOrBuilder {
-private static final long serialVersionUID = 0L;
   // Use ICBCRefundNotifyRequest.newBuilder() to construct.
   private ICBCRefundNotifyRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -33,19 +32,14 @@ private static final long serialVersionUID = 0L;
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return this.unknownFields;
+    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
   }
   private ICBCRefundNotifyRequest(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -55,8 +49,7 @@ private static final long serialVersionUID = 0L;
             done = true;
             break;
           default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
+            if (!input.skipField(tag)) {
               done = true;
             }
             break;
@@ -118,7 +111,6 @@ private static final long serialVersionUID = 0L;
       if (((mutable_bitField0_ & 0x00000080) == 0x00000080)) {
         subOrderList_ = java.util.Collections.unmodifiableList(subOrderList_);
       }
-      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -194,7 +186,6 @@ private static final long serialVersionUID = 0L;
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:com.ywt.gapi.ordercenter.ICBCRefundNotifyRequest.SubOrder)
       SubOrderOrBuilder {
-  private static final long serialVersionUID = 0L;
     // Use SubOrder.newBuilder() to construct.
     private SubOrder(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -209,19 +200,14 @@ private static final long serialVersionUID = 0L;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return this.unknownFields;
+      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
     }
     private SubOrder(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -231,8 +217,7 @@ private static final long serialVersionUID = 0L;
               done = true;
               break;
             default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
+              if (!input.skipField(tag)) {
                 done = true;
               }
               break;
@@ -266,7 +251,6 @@ private static final long serialVersionUID = 0L;
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
-        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -387,7 +371,6 @@ private static final long serialVersionUID = 0L;
       if (orderRefundLogId_ != 0) {
         output.writeInt32(4, orderRefundLogId_);
       }
-      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -410,11 +393,11 @@ private static final long serialVersionUID = 0L;
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(4, orderRefundLogId_);
       }
-      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
+    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -434,7 +417,6 @@ private static final long serialVersionUID = 0L;
           .equals(other.getPayCode());
       result = result && (getOrderRefundLogId()
           == other.getOrderRefundLogId());
-      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -629,7 +611,7 @@ private static final long serialVersionUID = 0L;
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
+          Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -642,12 +624,12 @@ private static final long serialVersionUID = 0L;
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, java.lang.Object value) {
+          int index, Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
+          Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -674,7 +656,6 @@ private static final long serialVersionUID = 0L;
         if (other.getOrderRefundLogId() != 0) {
           setOrderRefundLogId(other.getOrderRefundLogId());
         }
-        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -905,12 +886,12 @@ private static final long serialVersionUID = 0L;
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.setUnknownFieldsProto3(unknownFields);
+        return this;
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.mergeUnknownFields(unknownFields);
+        return this;
       }
 
 
@@ -933,7 +914,7 @@ private static final long serialVersionUID = 0L;
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new SubOrder(input, extensionRegistry);
+          return new SubOrder(input, extensionRegistry);
       }
     };
 
@@ -1173,7 +1154,6 @@ private static final long serialVersionUID = 0L;
     for (int i = 0; i < subOrderList_.size(); i++) {
       output.writeMessage(8, subOrderList_.get(i));
     }
-    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -1211,11 +1191,11 @@ private static final long serialVersionUID = 0L;
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(8, subOrderList_.get(i));
     }
-    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
+  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -1243,7 +1223,6 @@ private static final long serialVersionUID = 0L;
         == other.getRefundStatus());
     result = result && getSubOrderListList()
         .equals(other.getSubOrderListList());
-    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -1479,7 +1458,7 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -1492,12 +1471,12 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        int index, Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -1560,7 +1539,6 @@ private static final long serialVersionUID = 0L;
           }
         }
       }
-      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -2197,12 +2175,12 @@ private static final long serialVersionUID = 0L;
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return this;
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
+      return this;
     }
 
 
@@ -2225,7 +2203,7 @@ private static final long serialVersionUID = 0L;
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ICBCRefundNotifyRequest(input, extensionRegistry);
+        return new ICBCRefundNotifyRequest(input, extensionRegistry);
     }
   };
 

+ 9 - 20
onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/ICBCRefundNotifyResponse.java

@@ -14,7 +14,6 @@ public  final class ICBCRefundNotifyResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.ordercenter.ICBCRefundNotifyResponse)
     ICBCRefundNotifyResponseOrBuilder {
-private static final long serialVersionUID = 0L;
   // Use ICBCRefundNotifyResponse.newBuilder() to construct.
   private ICBCRefundNotifyResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -27,19 +26,14 @@ private static final long serialVersionUID = 0L;
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return this.unknownFields;
+    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
   }
   private ICBCRefundNotifyResponse(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -49,8 +43,7 @@ private static final long serialVersionUID = 0L;
             done = true;
             break;
           default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
+            if (!input.skipField(tag)) {
               done = true;
             }
             break;
@@ -74,7 +67,6 @@ private static final long serialVersionUID = 0L;
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
-      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -151,7 +143,6 @@ private static final long serialVersionUID = 0L;
     if (!getInfoBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, info_);
     }
-    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -166,11 +157,11 @@ private static final long serialVersionUID = 0L;
     if (!getInfoBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, info_);
     }
-    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
+  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -186,7 +177,6 @@ private static final long serialVersionUID = 0L;
         == other.getCode());
     result = result && getInfo()
         .equals(other.getInfo());
-    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -371,7 +361,7 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -384,12 +374,12 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        int index, Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -410,7 +400,6 @@ private static final long serialVersionUID = 0L;
         info_ = other.info_;
         onChanged();
       }
-      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -533,12 +522,12 @@ private static final long serialVersionUID = 0L;
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return this;
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
+      return this;
     }
 
 
@@ -561,7 +550,7 @@ private static final long serialVersionUID = 0L;
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ICBCRefundNotifyResponse(input, extensionRegistry);
+        return new ICBCRefundNotifyResponse(input, extensionRegistry);
     }
   };
 

+ 1 - 1
onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/OrderCenterServiceGrpc.java

@@ -21,7 +21,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
  * </pre>
  */
 @javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 1.7.0)",
+    value = "by gRPC proto compiler (version 1.7.2-SNAPSHOT)",
     comments = "Source: ordercenter.proto")
 public final class OrderCenterServiceGrpc {
 

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

@@ -232,7 +232,7 @@ public final class Ordercenter {
       "\033statusChangedCallbackMethod\030\n \001(\t\022\016\n\006cu" +
       "stom\030\013 \001(\t\022\017\n\007payCode\030\014 \001(\t\022\017\n\007payBody\030\r" +
       " \001(\t\022\020\n\010terminal\030\016 \001(\005\022\033\n\023refundNotifyRe" +
-      "stUrl\030\017 \001(\t\"S\n\023CreateOrderResponse\022\014\n\004co" +
+      "stUrl\030\017 \001(\t\"S\n\023CreateOrderResponse\022\014\n\004co",
       "de\030\001 \001(\005\022\014\n\004info\030\002 \001(\t\022\017\n\007orderId\030\003 \001(\005\022" +
       "\017\n\007orderNo\030\004 \001(\t\"\275\002\n\034PaymentCallbackNoti" +
       "fyRequest\022\017\n\007orderNo\030\001 \001(\t\022\017\n\007orderId\030\002 " +
@@ -242,7 +242,7 @@ public final class Ordercenter {
       "(\005\022\016\n\006openid\030\n \001(\t\022\026\n\016paymentChannel\030\013 \001" +
       "(\005\022\025\n\roneTimeCustom\030\014 \001(\t\022\027\n\017wxTransacti" +
       "onId\030\r \001(\t\022\025\n\rpayFinishDate\030\016 \001(\003\022\025\n\rali" +
-      "payTradeNo\030\017 \001(\t\"\210\001\n\021PayByAdminRequest\022\016" +
+      "payTradeNo\030\017 \001(\t\"\210\001\n\021PayByAdminRequest\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\026\n\016paymentChannel\030\004 \001" +
       "(\005\022\017\n\007orderId\030\005 \001(\005\022\016\n\006custom\030\006 \001(\t\"0\n\022P" +
@@ -252,7 +252,7 @@ public final class Ordercenter {
       "\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\007orderId\030\007 \001(\005\022\016\n\006user" +
       "Id\030\010 \001(\005\"\233\001\n\025WechatPaymentResponse\022\014\n\004co" +
-      "de\030\001 \001(\005\022\014\n\004info\030\002 \001(\t\022\021\n\ttimeStamp\030\003 \001(" +
+      "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\"\262\001\n\032WechatPaymentNotifyRequest\022\025\n" +
@@ -262,7 +262,7 @@ public final class Ordercenter {
       "Date\030\007 \001(\003\022\017\n\007payDate\030\010 \001(\003\"9\n\033WechatPay" +
       "mentNotifyResponse\022\014\n\004code\030\001 \001(\005\022\014\n\004info" +
       "\030\002 \001(\t\"7\n\023GetOrderInfoRequest\022\017\n\007orderId" +
-      "\030\001 \001(\005\022\017\n\007orderNo\030\002 \001(\t\"w\n\024GetOrderInfeR" +
+      "\030\001 \001(\005\022\017\n\007orderNo\030\002 \001(\t\"w\n\024GetOrderInfeR",
       "esponse\022\014\n\004code\030\001 \001(\005\022\014\n\004info\030\002 \001(\t\022\017\n\007o" +
       "rderNo\030\003 \001(\t\022\017\n\007orderId\030\004 \001(\005\022\021\n\torderTy" +
       "pe\030\005 \001(\005\022\016\n\006amount\030\006 \001(\005\"J\n\026UpdateOrderI" +
@@ -272,7 +272,7 @@ public final class Ordercenter {
       "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" +
+      "\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" +
@@ -282,7 +282,7 @@ public final class Ordercenter {
       "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 " +
+      "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" +
@@ -292,7 +292,7 @@ public final class Ordercenter {
       "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" +
+      "\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" +
@@ -302,7 +302,7 @@ public final class Ordercenter {
       "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" +
+      "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" +
@@ -312,7 +312,7 @@ public final class Ordercenter {
       "\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" +
+      "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" +
@@ -322,7 +322,7 @@ public final class Ordercenter {
       "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" +
+      "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 " +
@@ -332,71 +332,72 @@ public final class Ordercenter {
       "\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\"\240\001\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" +
+      "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\"H\n\031CreateAlipayOrderResponse\022\014\n" +
+      "al\030\010 \001(\005\"j\n\031CreateAlipayOrderResponse\022\014\n" +
       "\004code\030\001 \001(\005\022\014\n\004info\030\002 \001(\t\022\017\n\007tradeNo\030\003 \001" +
-      "(\t\"+\n\023AlipayNotifyRequest\022\024\n\014callbackDat" +
-      "a\030\001 \001(\t\"2\n\024AlipayNotifyResponse\022\014\n\004code\030" +
-      "\001 \001(\005\022\014\n\004info\030\002 \001(\t*|\n\022PaymentChannelEnu" +
-      "m\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\004FRE" +
-      "E\020\006\022\024\n\020MedicalInsurance\020\0072\250\020\n\022OrderCente" +
-      "rService\022j\n\013createOrder\022,.com.ywt.gapi.o" +
-      "rdercenter.CreateOrderRequest\032-.com.ywt." +
-      "gapi.ordercenter.CreateOrderResponse\022g\n\n" +
-      "payByAdmin\022+.com.ywt.gapi.ordercenter.Pa" +
-      "yByAdminRequest\032,.com.ywt.gapi.ordercent" +
-      "er.PayByAdminResponse\022p\n\rwechatPayment\022." +
-      ".com.ywt.gapi.ordercenter.WechatPaymentR" +
-      "equest\032/.com.ywt.gapi.ordercenter.Wechat" +
-      "PaymentResponse\022\202\001\n\023WechatPaymentNotify\022" +
-      "4.com.ywt.gapi.ordercenter.WechatPayment" +
-      "NotifyRequest\0325.com.ywt.gapi.ordercenter" +
-      ".WechatPaymentNotifyResponse\022m\n\014getOrder" +
-      "Info\022-.com.ywt.gapi.ordercenter.GetOrder" +
-      "InfoRequest\032..com.ywt.gapi.ordercenter.G" +
-      "etOrderInfeResponse\022v\n\017updateOrderInfo\0220" +
-      ".com.ywt.gapi.ordercenter.UpdateOrderInf" +
-      "oRequest\0321.com.ywt.gapi.ordercenter.Upda" +
-      "teOrderInfoResponse\022[\n\006refund\022\'.com.ywt." +
-      "gapi.ordercenter.RefundRequest\032(.com.ywt" +
-      ".gapi.ordercenter.RefundResponse\022\177\n\022wech" +
-      "atRefundNotify\0223.com.ywt.gapi.ordercente" +
-      "r.WechatRefundNotifyRequest\0324.com.ywt.ga" +
-      "pi.ordercenter.WechatRefundNotifyRespons" +
-      "e\022m\n\014getOrderBill\022-.com.ywt.gapi.orderce" +
-      "nter.GetOrderBillRequest\032..com.ywt.gapi." +
-      "ordercenter.GetOrderBillResponse\022j\n\013preP" +
-      "ayByPOS\022,.com.ywt.gapi.ordercenter.PrePa" +
-      "yByPOSRequest\032-.com.ywt.gapi.ordercenter" +
-      ".PrePayByPOSResponse\022s\n\016finishPayByPOS\022/" +
-      ".com.ywt.gapi.ordercenter.FinishPayByPOS" +
-      "Request\0320.com.ywt.gapi.ordercenter.Finis" +
-      "hPayByPOSResponse\022j\n\013icbcPayment\022,.com.y" +
-      "wt.gapi.ordercenter.ICBCPaymentRequest\032-" +
-      ".com.ywt.gapi.ordercenter.ICBCPaymentRes" +
-      "ponse\022|\n\021icbcPaymentNotify\0222.com.ywt.gap" +
-      "i.ordercenter.ICBCPaymentNotifyRequest\0323" +
-      ".com.ywt.gapi.ordercenter.ICBCPaymentNot" +
-      "ifyResponse\022y\n\020icbcRefundNotify\0221.com.yw" +
-      "t.gapi.ordercenter.ICBCRefundNotifyReque" +
-      "st\0322.com.ywt.gapi.ordercenter.ICBCRefund" +
-      "NotifyResponse\022m\n\014cleanPayLock\022-.com.ywt" +
-      ".gapi.ordercenter.CleanPayLockRequest\032.." +
-      "com.ywt.gapi.ordercenter.CleanPayLockRes" +
-      "ponse\022p\n\rcheckIsPaying\022..com.ywt.gapi.or" +
-      "dercenter.CheckIsPayingRequest\032/.com.ywt" +
-      ".gapi.ordercenter.CheckIsPayingResponse\022" +
-      "|\n\021createAlipayOrder\0222.com.ywt.gapi.orde" +
-      "rcenter.CreateAlipayOrderRequest\0323.com.y" +
-      "wt.gapi.ordercenter.CreateAlipayOrderRes" +
-      "ponse\022m\n\014alipayNotify\022-.com.ywt.gapi.ord" +
-      "ercenter.AlipayNotifyRequest\032..com.ywt.g" +
-      "api.ordercenter.AlipayNotifyResponseB-\n\030" +
-      "com.ywt.gapi.ordercenterP\001Z\014/ordercenter" +
-      "\210\001\001b\006proto3"
+      "(\t\022\017\n\007orderId\030\004 \001(\005\022\017\n\007orderNo\030\005 \001(\t\"+\n\023" +
+      "AlipayNotifyRequest\022\024\n\014callbackData\030\001 \001(" +
+      "\t\"2\n\024AlipayNotifyResponse\022\014\n\004code\030\001 \001(\005\022" +
+      "\014\n\004info\030\002 \001(\t*|\n\022PaymentChannelEnum\022\n\n\006U" +
+      "NKNOW\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\022OrderCenterServi" +
+      "ce\022j\n\013createOrder\022,.com.ywt.gapi.orderce" +
+      "nter.CreateOrderRequest\032-.com.ywt.gapi.o" +
+      "rdercenter.CreateOrderResponse\022g\n\npayByA" +
+      "dmin\022+.com.ywt.gapi.ordercenter.PayByAdm" +
+      "inRequest\032,.com.ywt.gapi.ordercenter.Pay" +
+      "ByAdminResponse\022p\n\rwechatPayment\022..com.y" +
+      "wt.gapi.ordercenter.WechatPaymentRequest" +
+      "\032/.com.ywt.gapi.ordercenter.WechatPaymen" +
+      "tResponse\022\202\001\n\023WechatPaymentNotify\0224.com.",
+      "ywt.gapi.ordercenter.WechatPaymentNotify" +
+      "Request\0325.com.ywt.gapi.ordercenter.Wecha" +
+      "tPaymentNotifyResponse\022m\n\014getOrderInfo\022-" +
+      ".com.ywt.gapi.ordercenter.GetOrderInfoRe" +
+      "quest\032..com.ywt.gapi.ordercenter.GetOrde" +
+      "rInfeResponse\022v\n\017updateOrderInfo\0220.com.y" +
+      "wt.gapi.ordercenter.UpdateOrderInfoReque" +
+      "st\0321.com.ywt.gapi.ordercenter.UpdateOrde" +
+      "rInfoResponse\022[\n\006refund\022\'.com.ywt.gapi.o" +
+      "rdercenter.RefundRequest\032(.com.ywt.gapi.",
+      "ordercenter.RefundResponse\022\177\n\022wechatRefu" +
+      "ndNotify\0223.com.ywt.gapi.ordercenter.Wech" +
+      "atRefundNotifyRequest\0324.com.ywt.gapi.ord" +
+      "ercenter.WechatRefundNotifyResponse\022m\n\014g" +
+      "etOrderBill\022-.com.ywt.gapi.ordercenter.G" +
+      "etOrderBillRequest\032..com.ywt.gapi.orderc" +
+      "enter.GetOrderBillResponse\022j\n\013prePayByPO" +
+      "S\022,.com.ywt.gapi.ordercenter.PrePayByPOS" +
+      "Request\032-.com.ywt.gapi.ordercenter.PrePa" +
+      "yByPOSResponse\022s\n\016finishPayByPOS\022/.com.y",
+      "wt.gapi.ordercenter.FinishPayByPOSReques" +
+      "t\0320.com.ywt.gapi.ordercenter.FinishPayBy" +
+      "POSResponse\022j\n\013icbcPayment\022,.com.ywt.gap" +
+      "i.ordercenter.ICBCPaymentRequest\032-.com.y" +
+      "wt.gapi.ordercenter.ICBCPaymentResponse\022" +
+      "|\n\021icbcPaymentNotify\0222.com.ywt.gapi.orde" +
+      "rcenter.ICBCPaymentNotifyRequest\0323.com.y" +
+      "wt.gapi.ordercenter.ICBCPaymentNotifyRes" +
+      "ponse\022y\n\020icbcRefundNotify\0221.com.ywt.gapi" +
+      ".ordercenter.ICBCRefundNotifyRequest\0322.c",
+      "om.ywt.gapi.ordercenter.ICBCRefundNotify" +
+      "Response\022m\n\014cleanPayLock\022-.com.ywt.gapi." +
+      "ordercenter.CleanPayLockRequest\032..com.yw" +
+      "t.gapi.ordercenter.CleanPayLockResponse\022" +
+      "p\n\rcheckIsPaying\022..com.ywt.gapi.ordercen" +
+      "ter.CheckIsPayingRequest\032/.com.ywt.gapi." +
+      "ordercenter.CheckIsPayingResponse\022|\n\021cre" +
+      "ateAlipayOrder\0222.com.ywt.gapi.ordercente" +
+      "r.CreateAlipayOrderRequest\0323.com.ywt.gap" +
+      "i.ordercenter.CreateAlipayOrderResponse\022",
+      "m\n\014alipayNotify\022-.com.ywt.gapi.ordercent" +
+      "er.AlipayNotifyRequest\032..com.ywt.gapi.or" +
+      "dercenter.AlipayNotifyResponseB-\n\030com.yw" +
+      "t.gapi.ordercenterP\001Z\014/ordercenter\210\001\001b\006p" +
+      "roto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
@@ -637,7 +638,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", });
+        new java.lang.String[] { "Code", "Info", "TradeNo", "OrderId", "OrderNo", });
     internal_static_com_ywt_gapi_ordercenter_AlipayNotifyRequest_descriptor =
       getDescriptor().getMessageTypes().get(36);
     internal_static_com_ywt_gapi_ordercenter_AlipayNotifyRequest_fieldAccessorTable = new

+ 9 - 20
onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/PayByAdminRequest.java

@@ -14,7 +14,6 @@ public  final class PayByAdminRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.ordercenter.PayByAdminRequest)
     PayByAdminRequestOrBuilder {
-private static final long serialVersionUID = 0L;
   // Use PayByAdminRequest.newBuilder() to construct.
   private PayByAdminRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -31,19 +30,14 @@ private static final long serialVersionUID = 0L;
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return this.unknownFields;
+    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
   }
   private PayByAdminRequest(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -53,8 +47,7 @@ private static final long serialVersionUID = 0L;
             done = true;
             break;
           default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
+            if (!input.skipField(tag)) {
               done = true;
             }
             break;
@@ -100,7 +93,6 @@ private static final long serialVersionUID = 0L;
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
-      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -311,7 +303,6 @@ private static final long serialVersionUID = 0L;
     if (!getCustomBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 6, custom_);
     }
-    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -340,11 +331,11 @@ private static final long serialVersionUID = 0L;
     if (!getCustomBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, custom_);
     }
-    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
+  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -368,7 +359,6 @@ private static final long serialVersionUID = 0L;
         == other.getOrderId());
     result = result && getCustom()
         .equals(other.getCustom());
-    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -573,7 +563,7 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -586,12 +576,12 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        int index, Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -626,7 +616,6 @@ private static final long serialVersionUID = 0L;
         custom_ = other.custom_;
         onChanged();
       }
-      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1035,12 +1024,12 @@ private static final long serialVersionUID = 0L;
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return this;
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
+      return this;
     }
 
 
@@ -1063,7 +1052,7 @@ private static final long serialVersionUID = 0L;
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PayByAdminRequest(input, extensionRegistry);
+        return new PayByAdminRequest(input, extensionRegistry);
     }
   };
 

+ 9 - 20
onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/PayByAdminResponse.java

@@ -14,7 +14,6 @@ public  final class PayByAdminResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.ordercenter.PayByAdminResponse)
     PayByAdminResponseOrBuilder {
-private static final long serialVersionUID = 0L;
   // Use PayByAdminResponse.newBuilder() to construct.
   private PayByAdminResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -27,19 +26,14 @@ private static final long serialVersionUID = 0L;
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return this.unknownFields;
+    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
   }
   private PayByAdminResponse(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -49,8 +43,7 @@ private static final long serialVersionUID = 0L;
             done = true;
             break;
           default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
+            if (!input.skipField(tag)) {
               done = true;
             }
             break;
@@ -74,7 +67,6 @@ private static final long serialVersionUID = 0L;
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
-      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -151,7 +143,6 @@ private static final long serialVersionUID = 0L;
     if (!getInfoBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, info_);
     }
-    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -166,11 +157,11 @@ private static final long serialVersionUID = 0L;
     if (!getInfoBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, info_);
     }
-    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
+  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -186,7 +177,6 @@ private static final long serialVersionUID = 0L;
         == other.getCode());
     result = result && getInfo()
         .equals(other.getInfo());
-    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -371,7 +361,7 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -384,12 +374,12 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        int index, Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -410,7 +400,6 @@ private static final long serialVersionUID = 0L;
         info_ = other.info_;
         onChanged();
       }
-      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -533,12 +522,12 @@ private static final long serialVersionUID = 0L;
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return this;
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
+      return this;
     }
 
 
@@ -561,7 +550,7 @@ private static final long serialVersionUID = 0L;
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PayByAdminResponse(input, extensionRegistry);
+        return new PayByAdminResponse(input, extensionRegistry);
     }
   };
 

+ 9 - 20
onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/PaymentCallbackNotifyRequest.java

@@ -14,7 +14,6 @@ public  final class PaymentCallbackNotifyRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.ordercenter.PaymentCallbackNotifyRequest)
     PaymentCallbackNotifyRequestOrBuilder {
-private static final long serialVersionUID = 0L;
   // Use PaymentCallbackNotifyRequest.newBuilder() to construct.
   private PaymentCallbackNotifyRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -40,19 +39,14 @@ private static final long serialVersionUID = 0L;
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return this.unknownFields;
+    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
   }
   private PaymentCallbackNotifyRequest(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -62,8 +56,7 @@ private static final long serialVersionUID = 0L;
             done = true;
             break;
           default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
+            if (!input.skipField(tag)) {
               done = true;
             }
             break;
@@ -159,7 +152,6 @@ private static final long serialVersionUID = 0L;
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
-      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -639,7 +631,6 @@ private static final long serialVersionUID = 0L;
     if (!getAlipayTradeNoBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 15, alipayTradeNo_);
     }
-    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -699,11 +690,11 @@ private static final long serialVersionUID = 0L;
     if (!getAlipayTradeNoBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(15, alipayTradeNo_);
     }
-    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
+  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -745,7 +736,6 @@ private static final long serialVersionUID = 0L;
         == other.getPayFinishDate());
     result = result && getAlipayTradeNo()
         .equals(other.getAlipayTradeNo());
-    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -996,7 +986,7 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -1009,12 +999,12 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        int index, Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -1081,7 +1071,6 @@ private static final long serialVersionUID = 0L;
         alipayTradeNo_ = other.alipayTradeNo_;
         onChanged();
       }
-      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -2031,12 +2020,12 @@ private static final long serialVersionUID = 0L;
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return this;
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
+      return this;
     }
 
 
@@ -2059,7 +2048,7 @@ private static final long serialVersionUID = 0L;
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PaymentCallbackNotifyRequest(input, extensionRegistry);
+        return new PaymentCallbackNotifyRequest(input, extensionRegistry);
     }
   };
 

+ 9 - 20
onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/PrePayByPOSRequest.java

@@ -14,7 +14,6 @@ public  final class PrePayByPOSRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.ordercenter.PrePayByPOSRequest)
     PrePayByPOSRequestOrBuilder {
-private static final long serialVersionUID = 0L;
   // Use PrePayByPOSRequest.newBuilder() to construct.
   private PrePayByPOSRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -29,19 +28,14 @@ private static final long serialVersionUID = 0L;
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return this.unknownFields;
+    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
   }
   private PrePayByPOSRequest(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -51,8 +45,7 @@ private static final long serialVersionUID = 0L;
             done = true;
             break;
           default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
+            if (!input.skipField(tag)) {
               done = true;
             }
             break;
@@ -87,7 +80,6 @@ private static final long serialVersionUID = 0L;
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
-      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -237,7 +229,6 @@ private static final long serialVersionUID = 0L;
     if (orderId_ != 0) {
       output.writeInt32(4, orderId_);
     }
-    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -259,11 +250,11 @@ private static final long serialVersionUID = 0L;
       size += com.google.protobuf.CodedOutputStream
         .computeInt32Size(4, orderId_);
     }
-    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
+  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -283,7 +274,6 @@ private static final long serialVersionUID = 0L;
         .equals(other.getByUserName());
     result = result && (getOrderId()
         == other.getOrderId());
-    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -478,7 +468,7 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -491,12 +481,12 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        int index, Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -524,7 +514,6 @@ private static final long serialVersionUID = 0L;
       if (other.getOrderId() != 0) {
         setOrderId(other.getOrderId());
       }
-      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -806,12 +795,12 @@ private static final long serialVersionUID = 0L;
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return this;
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
+      return this;
     }
 
 
@@ -834,7 +823,7 @@ private static final long serialVersionUID = 0L;
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PrePayByPOSRequest(input, extensionRegistry);
+        return new PrePayByPOSRequest(input, extensionRegistry);
     }
   };
 

+ 9 - 20
onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/PrePayByPOSResponse.java

@@ -14,7 +14,6 @@ public  final class PrePayByPOSResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.ordercenter.PrePayByPOSResponse)
     PrePayByPOSResponseOrBuilder {
-private static final long serialVersionUID = 0L;
   // Use PrePayByPOSResponse.newBuilder() to construct.
   private PrePayByPOSResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -28,19 +27,14 @@ private static final long serialVersionUID = 0L;
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return this.unknownFields;
+    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
   }
   private PrePayByPOSResponse(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -50,8 +44,7 @@ private static final long serialVersionUID = 0L;
             done = true;
             break;
           default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
+            if (!input.skipField(tag)) {
               done = true;
             }
             break;
@@ -81,7 +74,6 @@ private static final long serialVersionUID = 0L;
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
-      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -203,7 +195,6 @@ private static final long serialVersionUID = 0L;
     if (!getPaymentNoBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 3, paymentNo_);
     }
-    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -221,11 +212,11 @@ private static final long serialVersionUID = 0L;
     if (!getPaymentNoBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, paymentNo_);
     }
-    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
+  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -243,7 +234,6 @@ private static final long serialVersionUID = 0L;
         .equals(other.getInfo());
     result = result && getPaymentNo()
         .equals(other.getPaymentNo());
-    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -433,7 +423,7 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -446,12 +436,12 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        int index, Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -476,7 +466,6 @@ private static final long serialVersionUID = 0L;
         paymentNo_ = other.paymentNo_;
         onChanged();
       }
-      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -688,12 +677,12 @@ private static final long serialVersionUID = 0L;
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return this;
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
+      return this;
     }
 
 
@@ -716,7 +705,7 @@ private static final long serialVersionUID = 0L;
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PrePayByPOSResponse(input, extensionRegistry);
+        return new PrePayByPOSResponse(input, extensionRegistry);
     }
   };
 

+ 9 - 20
onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/RefundNotifyRequest.java

@@ -14,7 +14,6 @@ public  final class RefundNotifyRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.ordercenter.RefundNotifyRequest)
     RefundNotifyRequestOrBuilder {
-private static final long serialVersionUID = 0L;
   // Use RefundNotifyRequest.newBuilder() to construct.
   private RefundNotifyRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -33,19 +32,14 @@ private static final long serialVersionUID = 0L;
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return this.unknownFields;
+    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
   }
   private RefundNotifyRequest(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -55,8 +49,7 @@ private static final long serialVersionUID = 0L;
             done = true;
             break;
           default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
+            if (!input.skipField(tag)) {
               done = true;
             }
             break;
@@ -112,7 +105,6 @@ private static final long serialVersionUID = 0L;
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
-      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -339,7 +331,6 @@ private static final long serialVersionUID = 0L;
     if (refundSuccessTime_ != 0L) {
       output.writeInt64(8, refundSuccessTime_);
     }
-    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -376,11 +367,11 @@ private static final long serialVersionUID = 0L;
       size += com.google.protobuf.CodedOutputStream
         .computeInt64Size(8, refundSuccessTime_);
     }
-    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
+  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -408,7 +399,6 @@ private static final long serialVersionUID = 0L;
         .equals(other.getCustom());
     result = result && (getRefundSuccessTime()
         == other.getRefundSuccessTime());
-    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -624,7 +614,7 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -637,12 +627,12 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        int index, Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -683,7 +673,6 @@ private static final long serialVersionUID = 0L;
       if (other.getRefundSuccessTime() != 0L) {
         setRefundSuccessTime(other.getRefundSuccessTime());
       }
-      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1124,12 +1113,12 @@ private static final long serialVersionUID = 0L;
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return this;
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
+      return this;
     }
 
 
@@ -1152,7 +1141,7 @@ private static final long serialVersionUID = 0L;
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RefundNotifyRequest(input, extensionRegistry);
+        return new RefundNotifyRequest(input, extensionRegistry);
     }
   };
 

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

@@ -14,7 +14,6 @@ public  final class RefundRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.ordercenter.RefundRequest)
     RefundRequestOrBuilder {
-private static final long serialVersionUID = 0L;
   // Use RefundRequest.newBuilder() to construct.
   private RefundRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -34,19 +33,14 @@ private static final long serialVersionUID = 0L;
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return this.unknownFields;
+    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
   }
   private RefundRequest(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -56,8 +50,7 @@ private static final long serialVersionUID = 0L;
             done = true;
             break;
           default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
+            if (!input.skipField(tag)) {
               done = true;
             }
             break;
@@ -121,7 +114,6 @@ private static final long serialVersionUID = 0L;
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
-      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -459,7 +451,6 @@ private static final long serialVersionUID = 0L;
     if (!getCustomBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 9, custom_);
     }
-    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -497,11 +488,11 @@ private static final long serialVersionUID = 0L;
     if (!getCustomBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, custom_);
     }
-    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
+  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -531,7 +522,6 @@ private static final long serialVersionUID = 0L;
         .equals(other.getRemark());
     result = result && getCustom()
         .equals(other.getCustom());
-    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -751,7 +741,7 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -764,12 +754,12 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        int index, Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -816,7 +806,6 @@ private static final long serialVersionUID = 0L;
         custom_ = other.custom_;
         onChanged();
       }
-      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1472,12 +1461,12 @@ private static final long serialVersionUID = 0L;
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return this;
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
+      return this;
     }
 
 
@@ -1500,7 +1489,7 @@ private static final long serialVersionUID = 0L;
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RefundRequest(input, extensionRegistry);
+        return new RefundRequest(input, extensionRegistry);
     }
   };
 

+ 9 - 20
onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/RefundResponse.java

@@ -14,7 +14,6 @@ public  final class RefundResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.ordercenter.RefundResponse)
     RefundResponseOrBuilder {
-private static final long serialVersionUID = 0L;
   // Use RefundResponse.newBuilder() to construct.
   private RefundResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -28,19 +27,14 @@ private static final long serialVersionUID = 0L;
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return this.unknownFields;
+    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
   }
   private RefundResponse(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -50,8 +44,7 @@ private static final long serialVersionUID = 0L;
             done = true;
             break;
           default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
+            if (!input.skipField(tag)) {
               done = true;
             }
             break;
@@ -81,7 +74,6 @@ private static final long serialVersionUID = 0L;
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
-      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -203,7 +195,6 @@ private static final long serialVersionUID = 0L;
     if (!getRefundNoBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 3, refundNo_);
     }
-    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -221,11 +212,11 @@ private static final long serialVersionUID = 0L;
     if (!getRefundNoBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, refundNo_);
     }
-    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
+  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -243,7 +234,6 @@ private static final long serialVersionUID = 0L;
         .equals(other.getInfo());
     result = result && getRefundNo()
         .equals(other.getRefundNo());
-    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -433,7 +423,7 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -446,12 +436,12 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        int index, Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -476,7 +466,6 @@ private static final long serialVersionUID = 0L;
         refundNo_ = other.refundNo_;
         onChanged();
       }
-      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -688,12 +677,12 @@ private static final long serialVersionUID = 0L;
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return this;
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
+      return this;
     }
 
 
@@ -716,7 +705,7 @@ private static final long serialVersionUID = 0L;
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RefundResponse(input, extensionRegistry);
+        return new RefundResponse(input, extensionRegistry);
     }
   };
 

+ 9 - 20
onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/UpdateOrderInfoRequest.java

@@ -14,7 +14,6 @@ public  final class UpdateOrderInfoRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.ordercenter.UpdateOrderInfoRequest)
     UpdateOrderInfoRequestOrBuilder {
-private static final long serialVersionUID = 0L;
   // Use UpdateOrderInfoRequest.newBuilder() to construct.
   private UpdateOrderInfoRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -28,19 +27,14 @@ private static final long serialVersionUID = 0L;
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return this.unknownFields;
+    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
   }
   private UpdateOrderInfoRequest(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -50,8 +44,7 @@ private static final long serialVersionUID = 0L;
             done = true;
             break;
           default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
+            if (!input.skipField(tag)) {
               done = true;
             }
             break;
@@ -80,7 +73,6 @@ private static final long serialVersionUID = 0L;
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
-      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -169,7 +161,6 @@ private static final long serialVersionUID = 0L;
     if (!getPayCodeBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 3, payCode_);
     }
-    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -188,11 +179,11 @@ private static final long serialVersionUID = 0L;
     if (!getPayCodeBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, payCode_);
     }
-    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
+  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -210,7 +201,6 @@ private static final long serialVersionUID = 0L;
         == other.getAmount());
     result = result && getPayCode()
         .equals(other.getPayCode());
-    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -400,7 +390,7 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -413,12 +403,12 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        int index, Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -442,7 +432,6 @@ private static final long serialVersionUID = 0L;
         payCode_ = other.payCode_;
         onChanged();
       }
-      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -591,12 +580,12 @@ private static final long serialVersionUID = 0L;
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return this;
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
+      return this;
     }
 
 
@@ -619,7 +608,7 @@ private static final long serialVersionUID = 0L;
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateOrderInfoRequest(input, extensionRegistry);
+        return new UpdateOrderInfoRequest(input, extensionRegistry);
     }
   };
 

+ 9 - 20
onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/UpdateOrderInfoResponse.java

@@ -14,7 +14,6 @@ public  final class UpdateOrderInfoResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.ordercenter.UpdateOrderInfoResponse)
     UpdateOrderInfoResponseOrBuilder {
-private static final long serialVersionUID = 0L;
   // Use UpdateOrderInfoResponse.newBuilder() to construct.
   private UpdateOrderInfoResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -27,19 +26,14 @@ private static final long serialVersionUID = 0L;
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return this.unknownFields;
+    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
   }
   private UpdateOrderInfoResponse(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -49,8 +43,7 @@ private static final long serialVersionUID = 0L;
             done = true;
             break;
           default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
+            if (!input.skipField(tag)) {
               done = true;
             }
             break;
@@ -74,7 +67,6 @@ private static final long serialVersionUID = 0L;
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
-      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -151,7 +143,6 @@ private static final long serialVersionUID = 0L;
     if (!getInfoBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, info_);
     }
-    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -166,11 +157,11 @@ private static final long serialVersionUID = 0L;
     if (!getInfoBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, info_);
     }
-    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
+  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -186,7 +177,6 @@ private static final long serialVersionUID = 0L;
         == other.getCode());
     result = result && getInfo()
         .equals(other.getInfo());
-    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -371,7 +361,7 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -384,12 +374,12 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        int index, Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -410,7 +400,6 @@ private static final long serialVersionUID = 0L;
         info_ = other.info_;
         onChanged();
       }
-      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -533,12 +522,12 @@ private static final long serialVersionUID = 0L;
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return this;
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
+      return this;
     }
 
 
@@ -561,7 +550,7 @@ private static final long serialVersionUID = 0L;
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateOrderInfoResponse(input, extensionRegistry);
+        return new UpdateOrderInfoResponse(input, extensionRegistry);
     }
   };
 

+ 9 - 20
onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/WechatPaymentNotifyRequest.java

@@ -14,7 +14,6 @@ public  final class WechatPaymentNotifyRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.ordercenter.WechatPaymentNotifyRequest)
     WechatPaymentNotifyRequestOrBuilder {
-private static final long serialVersionUID = 0L;
   // Use WechatPaymentNotifyRequest.newBuilder() to construct.
   private WechatPaymentNotifyRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -33,19 +32,14 @@ private static final long serialVersionUID = 0L;
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return this.unknownFields;
+    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
   }
   private WechatPaymentNotifyRequest(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -55,8 +49,7 @@ private static final long serialVersionUID = 0L;
             done = true;
             break;
           default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
+            if (!input.skipField(tag)) {
               done = true;
             }
             break;
@@ -114,7 +107,6 @@ private static final long serialVersionUID = 0L;
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
-      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -415,7 +407,6 @@ private static final long serialVersionUID = 0L;
     if (payDate_ != 0L) {
       output.writeInt64(8, payDate_);
     }
-    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -450,11 +441,11 @@ private static final long serialVersionUID = 0L;
       size += com.google.protobuf.CodedOutputStream
         .computeInt64Size(8, payDate_);
     }
-    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
+  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -482,7 +473,6 @@ private static final long serialVersionUID = 0L;
         == other.getPayFinishDate());
     result = result && (getPayDate()
         == other.getPayDate());
-    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -699,7 +689,7 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -712,12 +702,12 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        int index, Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -760,7 +750,6 @@ private static final long serialVersionUID = 0L;
       if (other.getPayDate() != 0L) {
         setPayDate(other.getPayDate());
       }
-      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1347,12 +1336,12 @@ private static final long serialVersionUID = 0L;
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return this;
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
+      return this;
     }
 
 
@@ -1375,7 +1364,7 @@ private static final long serialVersionUID = 0L;
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new WechatPaymentNotifyRequest(input, extensionRegistry);
+        return new WechatPaymentNotifyRequest(input, extensionRegistry);
     }
   };
 

+ 9 - 20
onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/WechatPaymentNotifyResponse.java

@@ -14,7 +14,6 @@ public  final class WechatPaymentNotifyResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.ordercenter.WechatPaymentNotifyResponse)
     WechatPaymentNotifyResponseOrBuilder {
-private static final long serialVersionUID = 0L;
   // Use WechatPaymentNotifyResponse.newBuilder() to construct.
   private WechatPaymentNotifyResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -27,19 +26,14 @@ private static final long serialVersionUID = 0L;
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return this.unknownFields;
+    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
   }
   private WechatPaymentNotifyResponse(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -49,8 +43,7 @@ private static final long serialVersionUID = 0L;
             done = true;
             break;
           default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
+            if (!input.skipField(tag)) {
               done = true;
             }
             break;
@@ -74,7 +67,6 @@ private static final long serialVersionUID = 0L;
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
-      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -151,7 +143,6 @@ private static final long serialVersionUID = 0L;
     if (!getInfoBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, info_);
     }
-    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -166,11 +157,11 @@ private static final long serialVersionUID = 0L;
     if (!getInfoBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, info_);
     }
-    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
+  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -186,7 +177,6 @@ private static final long serialVersionUID = 0L;
         == other.getCode());
     result = result && getInfo()
         .equals(other.getInfo());
-    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -371,7 +361,7 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -384,12 +374,12 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        int index, Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -410,7 +400,6 @@ private static final long serialVersionUID = 0L;
         info_ = other.info_;
         onChanged();
       }
-      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -533,12 +522,12 @@ private static final long serialVersionUID = 0L;
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return this;
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
+      return this;
     }
 
 
@@ -561,7 +550,7 @@ private static final long serialVersionUID = 0L;
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new WechatPaymentNotifyResponse(input, extensionRegistry);
+        return new WechatPaymentNotifyResponse(input, extensionRegistry);
     }
   };
 

+ 9 - 20
onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/WechatPaymentRequest.java

@@ -14,7 +14,6 @@ public  final class WechatPaymentRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.ordercenter.WechatPaymentRequest)
     WechatPaymentRequestOrBuilder {
-private static final long serialVersionUID = 0L;
   // Use WechatPaymentRequest.newBuilder() to construct.
   private WechatPaymentRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -33,19 +32,14 @@ private static final long serialVersionUID = 0L;
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return this.unknownFields;
+    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
   }
   private WechatPaymentRequest(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -55,8 +49,7 @@ private static final long serialVersionUID = 0L;
             done = true;
             break;
           default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
+            if (!input.skipField(tag)) {
               done = true;
             }
             break;
@@ -113,7 +106,6 @@ private static final long serialVersionUID = 0L;
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
-      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -385,7 +377,6 @@ private static final long serialVersionUID = 0L;
     if (userId_ != 0) {
       output.writeInt32(8, userId_);
     }
-    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -421,11 +412,11 @@ private static final long serialVersionUID = 0L;
       size += com.google.protobuf.CodedOutputStream
         .computeInt32Size(8, userId_);
     }
-    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
+  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -453,7 +444,6 @@ private static final long serialVersionUID = 0L;
         == other.getOrderId());
     result = result && (getUserId()
         == other.getUserId());
-    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -668,7 +658,7 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -681,12 +671,12 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        int index, Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -728,7 +718,6 @@ private static final long serialVersionUID = 0L;
       if (other.getUserId() != 0) {
         setUserId(other.getUserId());
       }
-      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1264,12 +1253,12 @@ private static final long serialVersionUID = 0L;
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return this;
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
+      return this;
     }
 
 
@@ -1292,7 +1281,7 @@ private static final long serialVersionUID = 0L;
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new WechatPaymentRequest(input, extensionRegistry);
+        return new WechatPaymentRequest(input, extensionRegistry);
     }
   };
 

+ 9 - 20
onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/WechatPaymentResponse.java

@@ -14,7 +14,6 @@ public  final class WechatPaymentResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.ordercenter.WechatPaymentResponse)
     WechatPaymentResponseOrBuilder {
-private static final long serialVersionUID = 0L;
   // Use WechatPaymentResponse.newBuilder() to construct.
   private WechatPaymentResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -33,19 +32,14 @@ private static final long serialVersionUID = 0L;
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return this.unknownFields;
+    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
   }
   private WechatPaymentResponse(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -55,8 +49,7 @@ private static final long serialVersionUID = 0L;
             done = true;
             break;
           default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
+            if (!input.skipField(tag)) {
               done = true;
             }
             break;
@@ -116,7 +109,6 @@ private static final long serialVersionUID = 0L;
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
-      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -415,7 +407,6 @@ private static final long serialVersionUID = 0L;
     if (!getAppIdBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 8, appId_);
     }
-    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -448,11 +439,11 @@ private static final long serialVersionUID = 0L;
     if (!getAppIdBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, appId_);
     }
-    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
+  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -480,7 +471,6 @@ private static final long serialVersionUID = 0L;
         .equals(other.getPaySign());
     result = result && getAppId()
         .equals(other.getAppId());
-    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -695,7 +685,7 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -708,12 +698,12 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        int index, Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -758,7 +748,6 @@ private static final long serialVersionUID = 0L;
         appId_ = other.appId_;
         onChanged();
       }
-      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1295,12 +1284,12 @@ private static final long serialVersionUID = 0L;
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return this;
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
+      return this;
     }
 
 
@@ -1323,7 +1312,7 @@ private static final long serialVersionUID = 0L;
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new WechatPaymentResponse(input, extensionRegistry);
+        return new WechatPaymentResponse(input, extensionRegistry);
     }
   };
 

+ 9 - 20
onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/WechatRefundNotifyRequest.java

@@ -14,7 +14,6 @@ public  final class WechatRefundNotifyRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.ordercenter.WechatRefundNotifyRequest)
     WechatRefundNotifyRequestOrBuilder {
-private static final long serialVersionUID = 0L;
   // Use WechatRefundNotifyRequest.newBuilder() to construct.
   private WechatRefundNotifyRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -32,19 +31,14 @@ private static final long serialVersionUID = 0L;
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return this.unknownFields;
+    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
   }
   private WechatRefundNotifyRequest(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -54,8 +48,7 @@ private static final long serialVersionUID = 0L;
             done = true;
             break;
           default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
+            if (!input.skipField(tag)) {
               done = true;
             }
             break;
@@ -105,7 +98,6 @@ private static final long serialVersionUID = 0L;
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
-      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -303,7 +295,6 @@ private static final long serialVersionUID = 0L;
     if (refundStatus_ != 0) {
       output.writeInt32(7, refundStatus_);
     }
-    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -337,11 +328,11 @@ private static final long serialVersionUID = 0L;
       size += com.google.protobuf.CodedOutputStream
         .computeInt32Size(7, refundStatus_);
     }
-    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
+  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -367,7 +358,6 @@ private static final long serialVersionUID = 0L;
         == other.getRefundFee());
     result = result && (getRefundStatus()
         == other.getRefundStatus());
-    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -580,7 +570,7 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -593,12 +583,12 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        int index, Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -635,7 +625,6 @@ private static final long serialVersionUID = 0L;
       if (other.getRefundStatus() != 0) {
         setRefundStatus(other.getRefundStatus());
       }
-      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1031,12 +1020,12 @@ private static final long serialVersionUID = 0L;
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return this;
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
+      return this;
     }
 
 
@@ -1059,7 +1048,7 @@ private static final long serialVersionUID = 0L;
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new WechatRefundNotifyRequest(input, extensionRegistry);
+        return new WechatRefundNotifyRequest(input, extensionRegistry);
     }
   };
 

+ 9 - 20
onemini-hospital-empty/src/main/java/com/ywt/gapi/ordercenter/WechatRefundNotifyResponse.java

@@ -14,7 +14,6 @@ public  final class WechatRefundNotifyResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.ordercenter.WechatRefundNotifyResponse)
     WechatRefundNotifyResponseOrBuilder {
-private static final long serialVersionUID = 0L;
   // Use WechatRefundNotifyResponse.newBuilder() to construct.
   private WechatRefundNotifyResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -27,19 +26,14 @@ private static final long serialVersionUID = 0L;
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return this.unknownFields;
+    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
   }
   private WechatRefundNotifyResponse(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -49,8 +43,7 @@ private static final long serialVersionUID = 0L;
             done = true;
             break;
           default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
+            if (!input.skipField(tag)) {
               done = true;
             }
             break;
@@ -74,7 +67,6 @@ private static final long serialVersionUID = 0L;
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
-      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -151,7 +143,6 @@ private static final long serialVersionUID = 0L;
     if (!getInfoBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, info_);
     }
-    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -166,11 +157,11 @@ private static final long serialVersionUID = 0L;
     if (!getInfoBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, info_);
     }
-    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
+  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -186,7 +177,6 @@ private static final long serialVersionUID = 0L;
         == other.getCode());
     result = result && getInfo()
         .equals(other.getInfo());
-    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -371,7 +361,7 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -384,12 +374,12 @@ private static final long serialVersionUID = 0L;
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
+        int index, Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+        Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -410,7 +400,6 @@ private static final long serialVersionUID = 0L;
         info_ = other.info_;
         onChanged();
       }
-      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -533,12 +522,12 @@ private static final long serialVersionUID = 0L;
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
+      return this;
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
+      return this;
     }
 
 
@@ -561,7 +550,7 @@ private static final long serialVersionUID = 0L;
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new WechatRefundNotifyResponse(input, extensionRegistry);
+        return new WechatRefundNotifyResponse(input, extensionRegistry);
     }
   };
 

+ 2 - 3
onemini-hospital-sdk/src/main/java/com/ywt/alipaympapi/controller/AppointmentController.java

@@ -77,13 +77,12 @@ public class AppointmentController {
     public ResponseVO<QueryOrderDetailResponseData> queryOrderDetail(QueryOrderDetailRequest request) {
         try {
             return ResponseVO.success(isvRegisterService.queryOrderDetail(request));
-        }catch (AppMessageException e) {
+        } catch (AppMessageException e) {
             return ResponseVO.fail(Code.RESP_CODE_PARAM_ERROR, e.getMessage());
         } catch (Exception e) {
-            log.error("AppointmentController#.order.orderDetail(request = {}):\n {}", request, e.getMessage(), e);
+            log.error("AppointmentController#queryOrderDetail(request = {}):\n {}", request, e.getMessage(), e);
             return ResponseVO.fail(Code.RESP_CODE_APP_EXCEPTION, e.getMessage());
         }
-
     }
 
     /**

+ 1 - 1
onemini-hospital-sdk/src/main/java/com/ywt/alipaympapi/controller/PlanController.java

@@ -99,7 +99,7 @@ public class PlanController {
     }
 
     /**
-     * 医生号查询
+     * 医生号查询
      *
      * @param request
      * @return

+ 8 - 3
onemini-hospital-sdk/src/main/java/com/ywt/alipaympapi/controller/TradeController.java

@@ -57,7 +57,6 @@ public class TradeController {
             log.error(" TradeController#pay.payDetail(request = {}):\n {}", request, e.getMessage(), e);
             return ResponseVO.fail(Code.RESP_CODE_APP_EXCEPTION, e.getMessage());
         }
-
     }
 
 
@@ -102,8 +101,14 @@ public class TradeController {
      */
     @PostMapping("miniProRequest.pay.tradeNoQuery")
     public ResponseVO<TradeNoResponseData> queryTradeNo(OutTradeNoRequest request) {
-
-        return ResponseVO.success(isvPayService.queryTradeNo(request));
+        try{
+            return ResponseVO.success(isvPayService.queryTradeNo(request));
+        }catch (AppMessageException e) {
+            return ResponseVO.fail(Code.RESP_CODE_PARAM_ERROR, e.getMessage());
+        } catch (Exception e) {
+            log.error(" TradeController#queryTradeNo(request = {}):\n {}", request, e.getMessage(), e);
+            return ResponseVO.fail(Code.RESP_CODE_APP_EXCEPTION, e.getMessage());
+        }
     }
 
     /**

+ 1 - 1
onemini-hospital-sdk/src/main/java/com/ywt/alipaympapi/service/IsvPayService.java

@@ -18,7 +18,7 @@ public interface IsvPayService {
      * @param request 请求参数
      * @return 订单号及商家订单号
      **/
-    TradeNoResponseData queryTradeNo(OutTradeNoRequest request);
+    TradeNoResponseData queryTradeNo(OutTradeNoRequest request) throws Exception;
 
     /**
      * 用于通知isv方用户支付结果。

+ 1 - 1
onemini-hospital-sdk/src/main/java/com/ywt/alipaympapi/service/IsvRegisterService.java

@@ -68,7 +68,7 @@ public interface IsvRegisterService {
      * @param request
      * @return 查询结果
      **/
-    QueryOrderDetailResponseData queryOrderDetail(QueryOrderDetailRequest request) throws AppMessageException, Exception;
+    QueryOrderDetailResponseData queryOrderDetail(QueryOrderDetailRequest request) throws Exception;
 
     /**
      * 预约单列表查询

+ 3 - 0
onemini-hospital-sdk/src/main/java/com/ywt/request/pay/OutTradeNoRequest.java

@@ -20,6 +20,9 @@ public class OutTradeNoRequest implements IsvRequest<TradeNoResponseData>, IAppI
     private String amount;//订单总金额,单位为元,精确到小数点后两位,取值范围[0.01,100000000]
     private String depName;//科室名称,挂号费订单会传入
 
+    private String alipayUid;
+    private String orderId;
+
     @Override
     public String serviceName() {
         return "isvRequest.pay.tradeNoQuery";

+ 1 - 0
onemini-hospital-sdk/src/main/java/com/ywt/response/pay/TradeNoResponseData.java

@@ -10,6 +10,7 @@ import lombok.Data;
  **/
 @Data
 public class TradeNoResponseData implements IsvResponseData {
+    private int orderId;//订单ID
     private String outTradeNo;//商家订单号(区别于支付宝订单号)
     private String tradeNo;//支付宝订单号
 }