Browse Source

处理个人购买企业名称字段为空及发票没有店铺id的bug.

yujia 7 years ago
parent
commit
b60d6d8253

+ 1 - 0
src/main/java/com/uas/platform/b2c/fa/settlement/service/impl/BillSubmitServiceImpl.java

@@ -183,6 +183,7 @@ public class BillSubmitServiceImpl implements BillSubmitService {
 
         billSubmit.setSellername(order.getSellername());
         billSubmit.setSellerenuu(order.getSellerenuu());
+        billSubmit.setStoreid(order.getStoreid());
 
         order.setInvoicetype(bill.getKind());
         order.setInvoiceAddress(FastjsonUtils.toJson(bill));

+ 9 - 3
src/main/java/com/uas/platform/b2c/trade/order/service/impl/PurchaseServiceImpl.java

@@ -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());