fix

netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -580,7 +580,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		orderDon.setPhone(orderPhone);
 		this.saveOrUpdate(orderDon);
 
-		if (orderDon.getIsDp()) {
+		if (orderDon.getIsDp() != null && orderDon.getIsDp()) {
 			//保存订单优惠加购规格 关系
 			OrderDiscountPlusPurchaseSkuRelation orderDiscountPlusPurchaseSkuRelation = new OrderDiscountPlusPurchaseSkuRelation();
 			orderDiscountPlusPurchaseSkuRelation.setOrderId(orderDon.getId());
@@ -593,7 +593,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 			saveTransport(payRequest.getAddressId(), orderDon.getId());
 		}
 		//保存加购发货地址
-		if (orderDon.getIsDp() && payRequest.getAddressId() != null) {
+		if (orderDon.getIsDp() != null && orderDon.getIsDp() && payRequest.getAddressId() != null) {
 			redisService.set(RedisService.key.PLUS_GOODS_ADDRESS_KEY.getName() + orderDon.getId(), payRequest.getAddressId(), RedisService.key.PLUS_GOODS_ADDRESS_KEY.getTimeout());
 		}
 		if (orderDon.getDiscountPopularizeRecord() != null) {
@@ -1435,7 +1435,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 				return;
 			}
 			log.info("虚物订单orderNo:{}开始更新车票信息", order.getOrderNo());
-			if (order.getIsDp()) {
+			if (order.getIsDp() != null && order.getIsDp()) {
 				//是否已经发送优惠加购车票
 				OrderDiscountPlusPurchaseSkuRelation purchaseSkuRelation = orderDiscountPlusPurchaseSkuRelationMapper.selectOne(Wrappers.lambdaQuery(OrderDiscountPlusPurchaseSkuRelation.class)
 						.eq(OrderDiscountPlusPurchaseSkuRelation::getOrderId, order.getId()));
@@ -1610,7 +1610,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		distributeWaitingSendPoints.setUserId(order.getUserId());
 		BigDecimal orderMoney = order.getMoney();
 		//是否是加购订单
-		if (order.getIsDp()) {
+		if (order.getIsDp() != null && order.getIsDp()) {
 			//加购订单使用 主平台金额 分销
 			orderMoney = order.getOriMoney();
 			if (orderMoney.compareTo(BigDecimal.ZERO) == 0) {
@@ -3371,7 +3371,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 				orderDon.setRealMoney(gift_card_pay_money);
 			}
 		}
-		if (orderDon.getIsDp()) {
+		if (orderDon.getIsDp() != null && orderDon.getIsDp()) {
 			List<GoodsDonSkuView> dp_skuViewList = beanSearcher.searchAll(GoodsDonSkuView.class, MapUtils.builder().field(GoodsDonSkuView::getSkuId, dpSkuIds).op(Operator.InList).build());
 			if (dp_skuViewList.size() != dpSkuIds.size()) {
 				throw BusinessRuntimeException.getInstance("系统异常,请刷新页面重新下单");