|
|
@@ -50,6 +50,10 @@ import org.springblade.land.mapper.OrderMapper;
|
|
|
import org.springblade.land.service.IOrderItemService;
|
|
|
import org.springblade.land.util.MessageUtil;
|
|
|
import org.springblade.land.vo.OrderItemVO;
|
|
|
+import org.springblade.system.entity.Dept;
|
|
|
+import org.springblade.system.feign.ISysClient;
|
|
|
+import org.springblade.system.user.entity.User;
|
|
|
+import org.springblade.system.user.feign.IUserClient;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
@@ -75,6 +79,10 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
|
|
|
|
|
|
private final ICorpsDescClient corpsDescClient;
|
|
|
|
|
|
+ private final IUserClient userClient;
|
|
|
+
|
|
|
+ private final ISysClient sysClient;
|
|
|
+
|
|
|
private final ILandDriverClient landDriverClient;
|
|
|
|
|
|
private final ICommonFileClient commonFileClient;
|
|
|
@@ -656,6 +664,18 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
|
|
|
item.setFactory(order.getFactory());
|
|
|
item.setAddressDetail(order.getAddressDetail());
|
|
|
|
|
|
+ if (ObjectUtil.isNotEmpty(order.getDispatcher())) {
|
|
|
+ R<User> user = userClient.userInfoById(order.getDispatcher());
|
|
|
+ if(user.isSuccess() && user.getData() != null) {
|
|
|
+ item.setDispatcherName(user.getData().getRealName());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (ObjectUtil.isNotEmpty(order.getDispatchDept())) {
|
|
|
+ R<Dept> dept = sysClient.getDept(order.getDispatchDept());
|
|
|
+ if(dept.isSuccess() && dept.getData() != null) {
|
|
|
+ item.setDispatchDeptName(dept.getData().getDeptName());
|
|
|
+ }
|
|
|
+ }
|
|
|
if (ObjectUtil.isNotEmpty(order.getCorpId())) {
|
|
|
R<CorpsDesc> corp = corpsDescClient.getCorpMessage(order.getCorpId());
|
|
|
if (corp.isSuccess() && corp.getData() != null) {
|