订单、发货加回显销售、客户名称

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/controller/DeliveryController.java

@@ -34,6 +34,8 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.system.user.entity.User;
+import org.springblade.system.user.feign.IUserClient;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.deliver.goods.entity.Delivery;
@@ -58,6 +60,7 @@ public class DeliveryController extends BladeController {
 
 	private final IDeliveryService deliveryService;
 	private ICorpsDescClient corpsDescClient;//获取客户信息
+	private IUserClient iUserClient;//获取用户信息
 
 	/**
 	 * 详情
@@ -93,6 +96,17 @@ public class DeliveryController extends BladeController {
 						item.setCorpsName(corpMessage.getData().getCname());
 					}
 				}
+				if (item.getSalesCompany() != null){
+					R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(item.getSalesCompany());
+					if (corpMessage.isSuccess() && corpMessage.getData() != null){
+						item.setSalesCompanyName(corpMessage.getData().getCname());
+					}
+				}
+				R<User> user = iUserClient.userInfoById(item.getCreateUser());
+				if (user.isSuccess() && user.getData() != null){
+					item.setCreateUserName(user.getData().getName());
+				}
+
 			});
 		}
 		return R.data(pages);

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/controller/ExportDeliveryController.java

@@ -37,6 +37,8 @@ import org.springblade.core.tool.utils.Func;
 import org.springblade.deliver.goods.entity.Delivery;
 import org.springblade.deliver.goods.service.IDeliveryService;
 import org.springblade.deliver.goods.vo.DeliveryVO;
+import org.springblade.system.user.entity.User;
+import org.springblade.system.user.feign.IUserClient;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -55,6 +57,7 @@ public class ExportDeliveryController extends BladeController {
 
 	private final IDeliveryService deliveryService;
 	private ICorpsDescClient corpsDescClient;//获取客户信息
+	private IUserClient iUserClient;//获取用户信息
 
 	/**
 	 * 详情
@@ -90,6 +93,16 @@ public class ExportDeliveryController extends BladeController {
 						item.setCorpsName(corpMessage.getData().getCname());
 					}
 				}
+				if (item.getSalesCompany() != null){
+					R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(item.getSalesCompany());
+					if (corpMessage.isSuccess() && corpMessage.getData() != null){
+						item.setSalesCompanyName(corpMessage.getData().getCname());
+					}
+				}
+				R<User> user = iUserClient.userInfoById(item.getCreateUser());
+				if (user.isSuccess() && user.getData() != null){
+					item.setCreateUserName(user.getData().getName());
+				}
 			});
 		}
 		return R.data(pages);

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/controller/ImportDeliveryController.java

@@ -37,6 +37,8 @@ import org.springblade.core.tool.utils.Func;
 import org.springblade.deliver.goods.entity.Delivery;
 import org.springblade.deliver.goods.service.IDeliveryService;
 import org.springblade.deliver.goods.vo.DeliveryVO;
+import org.springblade.system.user.entity.User;
+import org.springblade.system.user.feign.IUserClient;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -55,6 +57,7 @@ public class ImportDeliveryController extends BladeController {
 
 	private final IDeliveryService deliveryService;
 	private ICorpsDescClient corpsDescClient;//获取客户信息
+	private IUserClient iUserClient;//获取用户信息
 
 	/**
 	 * 详情
@@ -90,6 +93,16 @@ public class ImportDeliveryController extends BladeController {
 						item.setCorpsName(corpMessage.getData().getCname());
 					}
 				}
+				if (item.getSalesCompany() != null){
+					R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(item.getSalesCompany());
+					if (corpMessage.isSuccess() && corpMessage.getData() != null){
+						item.setSalesCompanyName(corpMessage.getData().getCname());
+					}
+				}
+				R<User> user = iUserClient.userInfoById(item.getCreateUser());
+				if (user.isSuccess() && user.getData() != null){
+					item.setCreateUserName(user.getData().getName());
+				}
 			});
 		}
 		return R.data(pages);

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -74,6 +74,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 						item.setCorpsName(corpMessage.getData().getCname());
 					}
 				}
+				if (item.getBelongToCorpId() != null){
+					R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(item.getBelongToCorpId());
+					if (corpMessage.isSuccess() && corpMessage.getData() != null){
+						item.setBelongToCorpName(corpMessage.getData().getCname());
+					}
+				}
 			});
 		}
 		return page.setRecords(orderVOList);