fix: 修改null异常

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/otc/impl/OtcTradeOrderServiceImpl.java

@@ -1529,27 +1529,29 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             orderPolicyMapper.deleteByOrderId(orderId);
             List<OrderPolicyDO> orderPolicyDOList = new ArrayList<>();
             List<TradeOrderPolicyReqVO> policyList = createVO.getPolicyList();
-            policyList.stream().forEach(policy -> {
-                OrderPolicyDO orderPolicyDO = new OrderPolicyDO();
-                orderPolicyDO.setOrderId(orderId);
-                orderPolicyDO.setOrderNo(orderNo);
-                orderPolicyDO.setPolicyId(policy.getPolicyId());
-                if(createVO.getIsYd() != null && createVO.getIsYd() == 1) {
-                    orderPolicyDO.setPreUseNum(policy.getUseNum());
-                    orderPolicyDO.setRealUseNum(BigDecimal.ZERO);
-                }else {
-                    //TODO: 需要修改订单金额，参考文档
-                    orderPolicyDO.setPreUseNum(BigDecimal.ZERO);
-                    orderPolicyDO.setRealUseNum(policy.getUseNum());
-                    policyApi.updatePolicySurplusNum(policy.getPolicyId(), policy.getUseNum());
+            if(policyList != null) {
+                policyList.stream().forEach(policy -> {
+                    OrderPolicyDO orderPolicyDO = new OrderPolicyDO();
+                    orderPolicyDO.setOrderId(orderId);
+                    orderPolicyDO.setOrderNo(orderNo);
+                    orderPolicyDO.setPolicyId(policy.getPolicyId());
+                    if (createVO.getIsYd() != null && createVO.getIsYd() == 1) {
+                        orderPolicyDO.setPreUseNum(policy.getUseNum());
+                        orderPolicyDO.setRealUseNum(BigDecimal.ZERO);
+                    } else {
+                        //TODO: 需要修改订单金额，参考文档
+                        orderPolicyDO.setPreUseNum(BigDecimal.ZERO);
+                        orderPolicyDO.setRealUseNum(policy.getUseNum());
+                        policyApi.updatePolicySurplusNum(policy.getPolicyId(), policy.getUseNum());
+                    }
+                    orderPolicyDO.setAmount(policy.getAmount());
+                    orderPolicyDO.setRooms(policy.getRooms());
+                    orderPolicyDOList.add(orderPolicyDO);
+                });
+                if (orderPolicyDOList.size() > 0) {
+                    //TODO: 判断优惠政策是否需要审核
+                    orderPolicyMapper.insertBatch(orderPolicyDOList);
                 }
-                orderPolicyDO.setAmount(policy.getAmount());
-                orderPolicyDO.setRooms(policy.getRooms());
-                orderPolicyDOList.add(orderPolicyDO);
-            });
-            if(orderPolicyDOList.size() > 0) {
-                //TODO: 判断优惠政策是否需要审核
-                orderPolicyMapper.insertBatch(orderPolicyDOList);
             }
 
             int auditType = 0;
@@ -1842,27 +1844,29 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             orderPolicyMapper.deleteByOrderId(orderId);
             List<OrderPolicyDO> orderPolicyDOList = new ArrayList<>();
             List<TradeOrderPolicyReqVO> policyList = createVO.getPolicyList();
-            policyList.stream().forEach(policy -> {
-                OrderPolicyDO orderPolicyDO = new OrderPolicyDO();
-                orderPolicyDO.setOrderId(orderId);
-                orderPolicyDO.setOrderNo(orderNo);
-                orderPolicyDO.setPolicyId(policy.getPolicyId());
-                if(tradeOrderDO.getOrderStatus() == TradeOrderStatusEnum.UNPAID.getStatus() || tradeOrderDO.getOrderStatus() == TradeOrderStatusEnum.UNPAID.getStatus()) {
-                    orderPolicyDO.setRealUseNum(policy.getUseNum());
-                    orderPolicyDO.setPreUseNum(BigDecimal.ZERO);
-                    policyApi.updatePolicySurplusNum(policy.getPolicyId(), policy.getUseNum());
-                    //TODO: 需要修改订单金额，参考文档
-                }else {
-                    orderPolicyDO.setRealUseNum(BigDecimal.ZERO);
-                    orderPolicyDO.setPreUseNum(policy.getUseNum());
+            if(policyList != null) {
+                policyList.stream().forEach(policy -> {
+                    OrderPolicyDO orderPolicyDO = new OrderPolicyDO();
+                    orderPolicyDO.setOrderId(orderId);
+                    orderPolicyDO.setOrderNo(orderNo);
+                    orderPolicyDO.setPolicyId(policy.getPolicyId());
+                    if (tradeOrderDO.getOrderStatus() == TradeOrderStatusEnum.UNPAID.getStatus() || tradeOrderDO.getOrderStatus() == TradeOrderStatusEnum.UNPAID.getStatus()) {
+                        orderPolicyDO.setRealUseNum(policy.getUseNum());
+                        orderPolicyDO.setPreUseNum(BigDecimal.ZERO);
+                        policyApi.updatePolicySurplusNum(policy.getPolicyId(), policy.getUseNum());
+                        //TODO: 需要修改订单金额，参考文档
+                    } else {
+                        orderPolicyDO.setRealUseNum(BigDecimal.ZERO);
+                        orderPolicyDO.setPreUseNum(policy.getUseNum());
+                    }
+                    orderPolicyDO.setAmount(policy.getAmount());
+                    orderPolicyDO.setRooms(policy.getRooms());
+                    orderPolicyDOList.add(orderPolicyDO);
+                });
+                if (orderPolicyDOList.size() > 0) {
+                    //TODO: 判断优惠政策是否需要审核
+                    orderPolicyMapper.insertBatch(orderPolicyDOList);
                 }
-                orderPolicyDO.setAmount(policy.getAmount());
-                orderPolicyDO.setRooms(policy.getRooms());
-                orderPolicyDOList.add(orderPolicyDO);
-            });
-            if(orderPolicyDOList.size() > 0) {
-                //TODO: 判断优惠政策是否需要审核
-                orderPolicyMapper.insertBatch(orderPolicyDOList);
             }
 
             OtcTradeOrderCreateRespVO respVO = TradeOrderConvert.INSTANCE.convert(result.getData());