非空判断

b0550006 · 徐高华 · 24174f80 · b0550006
Commit b0550006 authored Mar 09, 2023 by 徐高华
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

GicOrderController.java ...aoban/manage/web/controller/order/GicOrderController.java +1 -1

No files found.
--- a/haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/order/GicOrderController.java
+++ b/haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/order/GicOrderController.java
@@ -198,7 +198,7 @@ public class GicOrderController {
        detail.setPayTime(OrderDetailDTO.getNodeTimeStatic(OrderEnum.OrderNodeEnum.PAY_ORDER,
                ret.getResult().getOrderNodeList()));
        // 如果是自提
-        if (detail.getDeliveryChannel() == 2) {
+        if (null != detail.getDeliveryChannel() && detail.getDeliveryChannel() == 2) {
            detail.setPickUpTime(OrderDetailDTO.getNodeTimeStatic(OrderEnum.OrderNodeEnum.SUCCESSFUL,
                    ret.getResult().getOrderNodeList()));
        }