zoujiajian преди 5 месеца
родител
ревизия
fd79e5bcc5
променени са 1 файла, в които са добавени 1 реда и са изтрити 1 реда
  1. 1 1
      netflix-web/src/main/java/com/cyksj/web/controller/payment/OrderController.java

+ 1 - 1
netflix-web/src/main/java/com/cyksj/web/controller/payment/OrderController.java

@@ -512,7 +512,7 @@ public class OrderController {
                     data.setWaybill(waybillMapper.selectOne(Wrappers.lambdaQuery(OrderDonWaybill.class).eq(OrderDonWaybill::getOrderId, data.getId()).last("limit 1")));
                 }
             }
-            if (data.getOrderType() == 2) {
+            if (data.getOrderType() != null && data.getOrderType() == 2) {
                 OrderDonRenewRecord orderDonRenewRecord = orderDonRenewRecordMapper.selectOne(Wrappers.lambdaQuery(OrderDonRenewRecord.class)
                         .eq(OrderDonRenewRecord::getOrderId, data.getId())
                         .last("limit 1"));