|
|
@@ -1215,7 +1215,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
return;
|
|
|
}
|
|
|
Long goodsId = orderDon.getGoodsId();
|
|
|
- if (orderDon.getIsNoLogin()) {
|
|
|
+ if (orderDon.getIsNoLogin() != null && orderDon.getIsNoLogin()) {
|
|
|
orderDon.setExCode(exchangeCodeService.getExCode(goodsId, orderDon.getSkuId(), 1));
|
|
|
}
|
|
|
GoodsDonSku sku = null;
|
|
|
@@ -2544,7 +2544,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
@Override
|
|
|
public void orderNotify(OrderDon orderDon) {
|
|
|
Long goodsId = orderDon.getGoodsId();
|
|
|
- if (orderDon.getIsNoLogin()) {
|
|
|
+ if (orderDon.getIsNoLogin() != null && orderDon.getIsNoLogin()) {
|
|
|
orderDon.setExCode(exchangeCodeService.getExCode(goodsId, orderDon.getSkuId(), 1));
|
|
|
}
|
|
|
GoodsDonSku sku = null;
|
|
|
@@ -2569,7 +2569,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
- if (orderDon.getIsNoLogin()) {
|
|
|
+ if (orderDon.getIsNoLogin() != null && orderDon.getIsNoLogin()) {
|
|
|
orderDon.setStatus(OrderDon.Status.hasPayment);
|
|
|
}
|
|
|
|
|
|
@@ -2587,7 +2587,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
}
|
|
|
|
|
|
Long goodsId = goodsDon.getId();
|
|
|
- if (!orderDon.getIsNoLogin() && sku != null) {
|
|
|
+ if (orderDon.getIsNoLogin() != null && !orderDon.getIsNoLogin() && sku != null) {
|
|
|
//更新座位信息
|
|
|
updateGroupsTicket(orderDon, goodsDon, sku);
|
|
|
if (goodsDon.getType() == 1) {
|