|
|
@@ -809,10 +809,10 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
if (orderDon.getYhsId() == 0) {
|
|
|
//虚拟商品订单,是否是分销订单
|
|
|
setDistributeOrderMark(orderDon, goodsDon.getType(), user.getId(), userDistributeShared, userDistribute);
|
|
|
- if (!isDistribute && orderDon.getIsDistribute()) {
|
|
|
+ if (!isDistribute && orderDon.getIsDistribute() != null && orderDon.getIsDistribute()) {
|
|
|
isDistribute = true;
|
|
|
}
|
|
|
- if (!isFixedDistribute && orderDon.getIsFixedDistribute()) {
|
|
|
+ if (!isFixedDistribute && orderDon.getIsFixedDistribute() != null && orderDon.getIsFixedDistribute()) {
|
|
|
isFixedDistribute = true;
|
|
|
}
|
|
|
}
|