|
|
@@ -1158,7 +1158,7 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
|
|
|
payments.add(codPayment);
|
|
|
erpOrder.setCod(true);
|
|
|
}
|
|
|
- } else if(order.getCompanyId()!=null){
|
|
|
+ } else if(order.getCompanyId()!=null && order.getCompanyId() > 0){
|
|
|
Company company = companyService.selectCompanyById(order.getCompanyId());
|
|
|
if (order.getPayDelivery().compareTo(new BigDecimal(0)) == 0) { //没有物流代收(全款订单)
|
|
|
FsExpress express = new FsExpress();
|