Merge branch 'dev' into ecp

blade-service/blade-factory/src/main/java/org/springblade/factory/api/controller/SalesOrderController.java

@@ -327,7 +327,10 @@ public class SalesOrderController {
 		} else {
 			// 3. 非物料查询时，应用个人订单过滤（仅查看自己的订单）
 			Long userId = AuthUtil.getUserId();
-			queryWrapper.eq("CUSTOMER_ID", userId);
+
+			R<User> user = userClient.userInfoById(userId);
+
+			queryWrapper.eq("CUSTOMER_ID", user.getData().getCustomerId());
 		}
 
 		// 4. 处理通用查询参数
@@ -398,9 +401,9 @@ public class SalesOrderController {
 
 		// 6. 关联查询订单详情
 		pages.getRecords().forEach(item -> {
-			PcBladeOrderItem pcBladeOrderItem = new PcBladeOrderItem();
-			pcBladeOrderItem.setOrderId(item.getId());
-			List<PcBladeOrderItem> pcBladeOrderItemList = orderItemService.selectPcBladeOrderItemList(pcBladeOrderItem);
+			QueryWrapper<PcBladeOrderItem> queryWrapper1 = new QueryWrapper<>();
+			queryWrapper1.eq("order_id", item.getId());
+			List<PcBladeOrderItem> pcBladeOrderItemList = orderItemService.list(queryWrapper1);
 			item.setPcBladeOrderItemList(pcBladeOrderItemList);
 		});
 
@@ -753,6 +756,9 @@ public class SalesOrderController {
 			return R.fail("未获取到登录用户信息，请先登录");
 		}
 
+		// TODO 修改---重要修复   userID需要修改成CUSTOMER_ID传参
+
+
 		// 构建查询条件
 		QueryWrapper<PcBladeUserLinkGoods> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("CUSTOMER_ID", userId)