提交代码

blade-service-api/blade-deliver-goods-api/src/main/java/org/springblade/deliver/goods/entity/DeliveryItems.java

@@ -317,5 +317,9 @@ public class DeliveryItems implements Serializable {
 	//采购总价
 	private BigDecimal purchaseTotalAmount;
 
+	@TableField(exist = false)
+	private String updateUserName;
+	@TableField(exist = false)
+	private String createUserName;
 
 }

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/entity/Order.java

@@ -755,4 +755,5 @@ public class Order implements Serializable {
 	private BigDecimal fc;
 
 
+
 }

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/entity/OrderItems.java

@@ -415,4 +415,9 @@ public class OrderItems implements Serializable {
 	private BigDecimal integral;
 
 	private Integer shopQuality;
+
+	@TableField(exist = false)
+	private String updateUserName;
+	@TableField(exist = false)
+	private String createUserName;
 }

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

@@ -131,6 +131,11 @@ public class DeliveryController extends BladeController {
 				if (user.isSuccess() && user.getData() != null){
 					item.setCreateUserName(user.getData().getName());
 				}
+
+				R<User> user1 = iUserClient.userInfoById(item.getUpdateUser());
+				if (user1.isSuccess() && user1.getData() != null){
+					item.setCreateUserName(user1.getData().getName());
+				}
 				//仓库信息
 				StorageDesc storageDesc = iStorageClient.findById(item.getStorageId());
 				if(storageDesc!=null)

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryItemsServiceImpl.java

@@ -46,6 +46,8 @@ import org.springblade.purchase.sales.feign.IOrderItemsClient;
 import org.springblade.stock.entity.StockGoods;
 import org.springblade.stock.feign.IStockGoodsClient;
 import org.springblade.stock.vo.StockGoodsVO;
+import org.springblade.system.user.entity.User;
+import org.springblade.system.user.feign.IUserClient;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
@@ -66,6 +68,7 @@ import java.util.stream.Collectors;
 @AllArgsConstructor
 public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, DeliveryItems> implements IDeliveryItemsService {
 
+	private IUserClient iUserClient;//获取用户信息
 	private IGoodsDescClient goodsDescClient;//获取商品信息
 	private IStockGoodsClient stockGoodsClient;//查询库存账对外访问接口
 	private IOrderItemsClient orderItemsClient;//订单对外访问接口
@@ -114,6 +117,16 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 			.eq("tenant_id", SecureUtil.getTenantId()).eq("is_deleted", 0).orderByAsc("id"));
 		if (CollectionUtils.isNotEmpty(deliveryItemsList)){
 			for (DeliveryItems deliveryItems : deliveryItemsList) {
+
+				R<User> user1 = iUserClient.userInfoById(deliveryItems.getUpdateUser());
+				if (user1.isSuccess() && user1.getData() != null){
+					deliveryItems.setUpdateUserName(user1.getData().getName());
+				}
+				R<User> user = iUserClient.userInfoById(deliveryItems.getCreateUser());
+				if (user.isSuccess() && user.getData() != null){
+					deliveryItems.setCreateUserName(user.getData().getName());
+				}
+
 				if (deliveryItems.getItemId() != null){
 					//获取商品编码,名称,规格编码,规格型号
 					R<GoodsDescVO> goodsMessage = goodsDescClient.selectGoodsMessage(deliveryItems.getItemId());

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

@@ -40,6 +40,8 @@ import org.springblade.purchase.sales.service.IOrderItemsService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springblade.stock.entity.StockGoods;
 import org.springblade.stock.feign.IStockGoodsClient;
+import org.springblade.system.user.entity.User;
+import org.springblade.system.user.feign.IUserClient;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
@@ -62,7 +64,7 @@ public class OrderItemsServiceImpl extends ServiceImpl<OrderItemsMapper, OrderIt
 	private IGoodsDescClient goodsDescClient;//获取商品信息
 	private IPriceItemClient priceItemClient;//价格管理对外接口
 	private IStockGoodsClient stockGoodsClient;//库存
-
+	private IUserClient iUserClient;//获取用户信息
 	@Resource
 	private OrderPartsMapper orderPartsMapper;
 	@Override
@@ -169,6 +171,17 @@ public class OrderItemsServiceImpl extends ServiceImpl<OrderItemsMapper, OrderIt
 		}
 		if (CollectionUtils.isNotEmpty(orderItemsList)){
 			orderItemsList.stream().forEach(item ->{
+
+				R<User> user1 = iUserClient.userInfoById(item.getUpdateUser());
+				if (user1.isSuccess() && user1.getData() != null){
+					item.setUpdateUserName(user1.getData().getName());
+				}
+				R<User> user = iUserClient.userInfoById(item.getCreateUser());
+				if (user.isSuccess() && user.getData() != null){
+					item.setCreateUserName(user.getData().getName());
+				}
+
+
 				if (item.getItemId() != null){
 					//获取商品编码,名称,规格编码,规格型号
 					R<GoodsDescVO> goodsMessage = goodsDescClient.selectGoodsMessage(item.getItemId());

blade-service/trade-finance/src/main/java/org/springblade/finance/controller/SettlementController.java

@@ -48,6 +48,7 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 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;
@@ -91,6 +92,16 @@ public class SettlementController extends BladeController {
 	public R<Settlement> detail(Settlement settlement) throws Exception {
 	/*	JdyTool.test();*/
 		Settlement detail = settlementService.getById(settlement.getId());
+
+		R<User> user2 = iUserClient.userInfoById(detail.getUpdateUser());
+		if (user2.isSuccess() && user2.getData() != null){
+			detail.setUpdateUserName(user2.getData().getName());
+		}
+		R<User> user3 = iUserClient.userInfoById(detail.getCreateUser());
+		if (user3.isSuccess() && user3.getData() != null){
+			detail.setCreateUserName(user3.getData().getName());
+		}
+
 		LambdaQueryWrapper<Items> itemsLambdaQueryWrapper=new LambdaQueryWrapper<>();
 		itemsLambdaQueryWrapper.eq(Items::getPid,detail.getId()).eq(Items::getIsDeleted,0);
 		List<Items> list = itemsService.list(itemsLambdaQueryWrapper);
@@ -102,6 +113,17 @@ public class SettlementController extends BladeController {
 		if(CollectionUtils.isNotEmpty(list))
 		{
 			list.forEach(e->{
+
+				R<User> user1 = iUserClient.userInfoById(e.getUpdateUser());
+				if (user1.isSuccess() && user1.getData() != null){
+					e.setUpdateUserName(user1.getData().getName());
+				}
+				R<User> user = iUserClient.userInfoById(e.getCreateUser());
+				if (user.isSuccess() && user.getData() != null){
+					e.setCreateUserName(user.getData().getName());
+				}
+
+
 				//录入人
 				e.setCreateUserName(iUserClient.userInfoById(e.getCreateUser()).getData().getRealName());
 				//客户名称

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/controller/PurchaseOrderController.java

@@ -82,7 +82,33 @@ public class PurchaseOrderController extends BladeController {
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "采购订单查看详情", notes = "传入order")
 	public R<OrderVO> detail(@PathVariable(value = "id") String id) {
-		return orderService.getOrderMessage(id);
+
+		R<OrderVO> orderMessage = orderService.getOrderMessage(id);
+		if(orderMessage.isSuccess()&&orderMessage.getData()!=null)
+		{
+			R<User> user1 = userClient.userInfoById(orderMessage.getData().getUpdateUser());
+			if (user1.isSuccess() && user1.getData() != null){
+				orderMessage.getData().setUpdateUserName(user1.getData().getName());
+			}
+			R<User> user = userClient.userInfoById(orderMessage.getData().getCreateUser());
+			if (user.isSuccess() && user.getData() != null){
+				orderMessage.getData().setCreateUserName(user.getData().getName());
+			}
+
+			orderMessage.getData().getOrderItemsList().forEach(e->{
+				R<User> user2 = userClient.userInfoById(e.getUpdateUser());
+				if (user2.isSuccess() && user2.getData() != null){
+					e.setUpdateUserName(user2.getData().getName());
+				}
+				R<User> user3 = userClient.userInfoById(e.getCreateUser());
+				if (user3.isSuccess() && user3.getData() != null){
+					e.setCreateUserName(user3.getData().getName());
+				}
+			});
+		}
+
+
+		return orderMessage;
 	}
 
 	/**