|
@@ -1709,13 +1709,13 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
|
|
|
order.setDeliverySn(express.getCode());
|
|
order.setDeliverySn(express.getCode());
|
|
|
}
|
|
}
|
|
|
erpOrder.setPayments(payments);
|
|
erpOrder.setPayments(payments);
|
|
|
- if (order.getCompanyId() != null) {
|
|
|
|
|
|
|
+ if (order.getCompanyId() != null && order.getCompanyId() > 0L) {
|
|
|
Company company = companyService.selectCompanyById(order.getCompanyId());
|
|
Company company = companyService.selectCompanyById(order.getCompanyId());
|
|
|
if (company != null) {
|
|
if (company != null) {
|
|
|
erpOrder.setSeller_memo(company.getCompanyName());
|
|
erpOrder.setSeller_memo(company.getCompanyName());
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- if (order.getCompanyUserId() != null) {
|
|
|
|
|
|
|
+ if (order.getCompanyUserId() != null && order.getCompanyUserId() > 0L) {
|
|
|
CompanyUser companyUser = companyUserService.selectCompanyUserById(order.getCompanyUserId());
|
|
CompanyUser companyUser = companyUserService.selectCompanyUserById(order.getCompanyUserId());
|
|
|
if (companyUser != null) {
|
|
if (companyUser != null) {
|
|
|
CompanyDept dept = companyDeptService.selectCompanyDeptById(companyUser.getDeptId());
|
|
CompanyDept dept = companyDeptService.selectCompanyDeptById(companyUser.getDeptId());
|