|
|
@@ -417,9 +417,15 @@ public class PurchaseServiceImpl implements PurchaseService {
|
|
|
purchase.setSendType(Type.Delivery_ByUU_Code.value());//寄售类型统一为第三方配送
|
|
|
}else {
|
|
|
if(orderFromCust.getBuyerentername() == null) {
|
|
|
- Enterprise enterprise = enterpriseDao.findByUu(orderFromCust.getBuyerenuu());
|
|
|
- if(enterprise != null) {
|
|
|
- purchase.setBuyentername(enterprise.getEnName());
|
|
|
+ if (orderFromCust.getBuyerenuu() != null) {
|
|
|
+ Enterprise enterprise = enterpriseDao.findByUu(orderFromCust.getBuyerenuu());
|
|
|
+ if(enterprise != null) {
|
|
|
+ purchase.setBuyentername(enterprise.getEnName());
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ if(purchase.getBuyername() == null) {
|
|
|
+ purchase.setBuyentername(orderFromCust.getBuyername());
|
|
|
}
|
|
|
} else {
|
|
|
purchase.setBuyentername(orderFromCust.getBuyerentername());
|