Merge remote-tracking branch 'origin/ecp' into ecp

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

@@ -19,7 +19,10 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.factory.entity.*;
 import org.springblade.factory.service.*;
+import org.springblade.system.user.entity.User;
+import org.springblade.system.user.feign.IUserClient;
 import org.springblade.u9cloud.entity.ZcrmViewCustomerSel;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -56,8 +59,8 @@ public class SalesForecastSummaryController {
 
 	private final PcBladeSalesForecastMainService salesForecastMainService;
 
-
-
+	@Autowired
+	private IUserClient userClient;
 	/**
 	 * 根据ID查询销售预测主表
 	 */
@@ -84,8 +87,12 @@ public class SalesForecastSummaryController {
 		@RequestParam(required = false) @ApiParam("开始日期(格式:yyyy-MM)") String startMonth,
 		@RequestParam(required = false) @ApiParam("结束日期(格式:yyyy-MM)") String endMonth) {
 		// 1. 获取当前登录用户ID，设置数据权限
-		Long customerId = AuthUtil.getUserId();
-		params.put("customerId", customerId);
+		Long userId = AuthUtil.getUserId();
+		R<User> user = userClient.userInfoById(userId);
+		if (user.getData() == null) {
+			return R.fail("用户不存在");
+		}
+		params.put("customerId", user.getData().getCustomerId());
 
 		// 2. 构建基础查询条件
 		QueryWrapper<PcBladeSalesForecastMain> queryWrapper = Condition.getQueryWrapper(params, PcBladeSalesForecastMain.class);
@@ -380,6 +387,12 @@ public class SalesForecastSummaryController {
 		ViewCustomerSel zcrmViewCustomerSel = customerSelService.selectZcrmViewCustomerSelByCustomerId(forecast.getCustomerId());
 		forecast.setCustomerCode(zcrmViewCustomerSel.getCustomerCode());
 		forecast.setCustomerName(zcrmViewCustomerSel.getCustomerName());
+
+
+
+
+
+
 		return forecastService.saveOrUpdateForecast(forecast);
 	}
 

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)

blade-service/blade-factory/src/main/java/org/springblade/factory/service/impl/PcBladeSalesForecastMainServiceImpl.java

@@ -17,6 +17,8 @@ import org.springblade.factory.mapper.PcBladeSalesForecastSummaryMapper;
 import org.springblade.factory.service.PcBladeSalesForecastMainService;
 import org.springblade.factory.service.PcBladeSalesForecastSummaryService;
 import org.springblade.factory.service.ZcrmViewCustomerSelService;
+import org.springblade.system.user.entity.User;
+import org.springblade.system.user.feign.IUserClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -44,6 +46,10 @@ public class PcBladeSalesForecastMainServiceImpl extends BaseServiceImpl<PcBlade
 	private PcBladeSalesForecastMainMapper pcBladeSalesForecastMainMapper;
 
 	@Autowired
+	private IUserClient userClient;
+
+
+	@Autowired
 	@Lazy
 	public void setPcBladeSalesForecastSummaryService(PcBladeSalesForecastSummaryService pcBladeSalesForecastSummaryService) {
 		this.pcBladeSalesForecastSummaryService = pcBladeSalesForecastSummaryService;
@@ -164,13 +170,17 @@ public class PcBladeSalesForecastMainServiceImpl extends BaseServiceImpl<PcBlade
 				return R.fail("批量添加失败：主表数据不能为空");
 			}
 
-			Long currentUserId = AuthUtil.getUserId();
+			Long id = AuthUtil.getUserId();
+			R<User> userInfo = userClient.userInfoById(id);
+			if (userInfo.getData() == null || userInfo.getData().getCustomerId() == null) {
+				return R.fail("用户不存在");
+			}
 
 			if (pcBladeSalesForecastMain.getApprovalStatus() == null) {
 				pcBladeSalesForecastMain.setApprovalStatus(0);
 			}
 
-			pcBladeSalesForecastMain.setCustomerId(currentUserId);
+			pcBladeSalesForecastMain.setCustomerId(userInfo.getData().getCustomerId());
 			ViewCustomerSel zcrmViewCustomerSel = customerSelService.selectZcrmViewCustomerSelByCustomerId(pcBladeSalesForecastMain.getCustomerId());
 			pcBladeSalesForecastMain.setCustomerCode(zcrmViewCustomerSel.getCustomerCode());
 			pcBladeSalesForecastMain.setCustomerName(zcrmViewCustomerSel.getCustomerName());