fixbug NullPoint

a781f6d2 · xiaoer.li · c86ae4a2 · a781f6d2
Commit a781f6d2 authored Jan 15, 2021 by xiaoer.li
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletions

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
+6 -1

No files found.
--- a/assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
+++ b/assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
@@ -3053,7 +3053,12 @@ public class OrderSdkAdapter {
                orderSettlement.setCarrierDiscountAmount(orderSettlementResp.getCarrierDiscountAmount());
                orderSettlement.setShopAmount(orderSettlementResp.getShopAmount());
                orderSettlement.setPlatformServiceAmount(orderSettlementResp.getPlatformServiceAmount());
-                orderSettlement.setProspectiveAmount(orderSettlementResp.getProspectiveAmount().longValue());
+                if (orderSettlementResp.getProspectiveAmount()!=null) {
+                    orderSettlement.setProspectiveAmount(orderSettlementResp.getProspectiveAmount().longValue());
+                }
+                else {
+                    orderSettlement.setProspectiveAmount(0L);
+                }
                orderSettlementList.add(orderSettlement);
            }
        }