Ver código fonte

fix 修改订单详情接口

DYH2020 2 anos atrás
pai
commit
91abf09222

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

@@ -624,38 +624,40 @@ public class IsvRegisterServiceImpl implements IsvRegisterService {
                 .build();
         GetRegisteredOrderListResponse res = orderServiceBlockingStub.getRegisteredOrderList(req);
         if (res.getResult().getCode() == ResultCode.SUCCEED) {
-            com.ywt.gapi.order.RegisteredOrder item = res.getOrdersList().get(0);
-
-            String deptCode = item.getDeptCode();
-            double amount = item.getTotal() / 100d;
-            QueryOrderDetailResponseData data = new QueryOrderDetailResponseData();
-            data.setOrderId(Integer.toString(orderId));
-            data.setOrderNo(item.getOrderNo());
-            data.setUserName(item.getPatientName());
-            data.setDoctorName(item.getDoctorName());
-            data.setDepName(item.getDeptName());
-            data.setDistrictName(item.getHospitalName());
-            String amountStr = String.format("%.2f", amount);
-            data.setAmount(amountStr);
-
-            int orderStatus = item.getRegisteredStatus();
-            String statusName = "";
-            if ((item.getRegisteredStatus() & RegisteredStatusEnum.Cancel.getValue()) == RegisteredStatusEnum.Cancel.getValue() ||
-                    (item.getRegisteredStatus() & RegisteredStatusEnum.Back.getValue()) == RegisteredStatusEnum.Back.getValue()) {
-                statusName = "已取消";
-                orderStatus = 1;
-            } else if (item.getPaymentStatus() == PaymentStatusEnum.Pending.getValue()) {
-                statusName = "待支付";
-                orderStatus = 2;
-            } else if (item.getPaymentStatus() == PaymentStatusEnum.Success.getValue()) {
-                statusName = "待就诊";
-                orderStatus = 3;
+            if (!Checker.isNone(res.getOrdersList())) {
+                com.ywt.gapi.order.RegisteredOrder item = res.getOrdersList().get(0);
+
+                String deptCode = item.getDeptCode();
+                double amount = item.getTotal() / 100d;
+                QueryOrderDetailResponseData data = new QueryOrderDetailResponseData();
+                data.setOrderId(Integer.toString(orderId));
+                data.setOrderNo(item.getOrderNo());
+                data.setUserName(item.getPatientName());
+                data.setDoctorName(item.getDoctorName());
+                data.setDepName(item.getDeptName());
+                data.setDistrictName(item.getHospitalName());
+                String amountStr = String.format("%.2f", amount);
+                data.setAmount(amountStr);
+
+                int orderStatus = item.getRegisteredStatus();
+                String statusName = "";
+                if ((item.getRegisteredStatus() & RegisteredStatusEnum.Cancel.getValue()) == RegisteredStatusEnum.Cancel.getValue() ||
+                        (item.getRegisteredStatus() & RegisteredStatusEnum.Back.getValue()) == RegisteredStatusEnum.Back.getValue()) {
+                    statusName = "已取消";
+                    orderStatus = 1;
+                } else if (item.getPaymentStatus() == PaymentStatusEnum.Pending.getValue()) {
+                    statusName = "待支付";
+                    orderStatus = 2;
+                } else if (item.getPaymentStatus() == PaymentStatusEnum.Success.getValue()) {
+                    statusName = "待就诊";
+                    orderStatus = 3;
+                }
+                data.setStatus(orderStatus);
+                data.setStatusStr(statusName);
+                data.setCreateTime(Checker.getStringValue(item.getStartTime()));
+                data.setEndTime(Checker.getStringValue(item.getEndTime()));
+                return data;
             }
-            data.setStatus(orderStatus);
-            data.setStatusStr(statusName);
-            data.setCreateTime(Checker.getStringValue(item.getStartTime()));
-            data.setEndTime(Checker.getStringValue(item.getEndTime()));
-            return data;
         }
         throw new AppMessageException("没有挂号详情");
     }