update NotifyCallback

mec-biz/src/main/java/com/ym/mec/biz/service/NotifyCallback.java

@@ -54,8 +54,10 @@ public class NotifyCallback implements MQTTCallbackHandler {
             notifyMap.put("totalMoney", dataObj.getString("pay_amt"));
             notifyMap.put("merOrderNo", dataObj.getString("order_no"));
             notifyCallback.studentPaymentOrderService.updateOrder(notifyMap);
-        } else {
-            TenantPaymentOrder tenantPaymentOrder = notifyCallback.tenantPaymentOrderService.queryByOrderNo(orderNo);
+            return;
+        }
+        TenantPaymentOrder tenantPaymentOrder = notifyCallback.tenantPaymentOrderService.queryByOrderNo(orderNo);
+        if (tenantPaymentOrder != null) {
             tenantPaymentOrder.setStatus(DealStatusEnum.SUCCESS);
             tenantPaymentOrder.setPaymentBusinessChannel(dataObj.getString("pay_channel"));
             tenantPaymentOrder.setActualAmount(new BigDecimal(dataObj.getString("pay_amt")));
@@ -89,8 +91,10 @@ public class NotifyCallback implements MQTTCallbackHandler {
             notifyMap.put("merOrderNo", dataObj.getString("order_no"));
             notifyMap.put("remarks", dataObj.getString("error_msg"));
             notifyCallback.studentPaymentOrderService.updateOrder(notifyMap);
-        } else {
-            TenantPaymentOrder tenantPaymentOrder = notifyCallback.tenantPaymentOrderService.queryByOrderNo(orderNo);
+            return;
+        }
+        TenantPaymentOrder tenantPaymentOrder = notifyCallback.tenantPaymentOrderService.queryByOrderNo(orderNo);
+        if (tenantPaymentOrder != null) {
             tenantPaymentOrder.setStatus(DealStatusEnum.FAILED);
             tenantPaymentOrder.setPaymentBusinessChannel(dataObj.getString("pay_channel"));
             notifyCallback.tenantPaymentOrderService.paymentForCallback(tenantPaymentOrder);
@@ -122,8 +126,10 @@ public class NotifyCallback implements MQTTCallbackHandler {
             notifyMap.put("merOrderNo", dataObj.getString("order_no"));
             notifyMap.put("remarks", dataObj.getString("error_msg"));
             notifyCallback.studentPaymentOrderService.updateOrder(notifyMap);
-        } else {
-            TenantPaymentOrder tenantPaymentOrder = notifyCallback.tenantPaymentOrderService.queryByOrderNo(orderNo);
+            return;
+        }
+        TenantPaymentOrder tenantPaymentOrder = notifyCallback.tenantPaymentOrderService.queryByOrderNo(orderNo);
+        if (tenantPaymentOrder != null) {
             tenantPaymentOrder.setStatus(DealStatusEnum.FAILED);
             tenantPaymentOrder.setPaymentBusinessChannel(dataObj.getString("pay_channel"));
             tenantPaymentOrderService.paymentForCallback(tenantPaymentOrder);