From cb2b53c615599ae0ca50fbdaa2de83be047c94fe Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 14 四月 2022 15:13:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/lyq_battery_shop' into lyq_battery_shop
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComChangeCarModelApi.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComChangeCarModelApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComChangeCarModelApi.java
index 929f9fd..69f4041 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComChangeCarModelApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComChangeCarModelApi.java
@@ -1,12 +1,13 @@
package com.panzhihua.applets.api;
import com.panzhihua.common.controller.BaseController;
-import com.panzhihua.common.model.dtos.common.AddComChangeCarModelDto;
-import com.panzhihua.common.model.dtos.common.EditComChangeCarModelDto;
-import com.panzhihua.common.model.dtos.common.PageComChangeCarModelDto;
+import com.panzhihua.common.model.dtos.common.*;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.common.ComChangeCarModelSpecsVo;
import com.panzhihua.common.model.vos.common.ComChangeCarModelVo;
import com.panzhihua.common.service.community.ComChangeCarModelFeign;
+import com.panzhihua.common.service.community.ComChangeCarModelRelationFeign;
+import com.panzhihua.common.service.community.ComChangeCarModelSpecsFeign;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -33,19 +34,23 @@
@Resource
private ComChangeCarModelFeign comChangeCarModelService;
+ @Resource
+ private ComChangeCarModelSpecsFeign carModelSpecsService;
+ @Resource
+ private ComChangeCarModelRelationFeign carModelRelationService;
/**
* description queryByPage 分页查询
*
- * @param comChangeCarModel 请求参数
+ * @param comChangeCarModelRelation 请求参数
* @return 分页查询返回参数
* @author lyq
* @date 2022-04-07 13:41:54
*/
@ApiOperation(value = "分页查询车型管理列表",response = ComChangeCarModelVo.class)
@PostMapping("/page")
- public R queryByPage(@RequestBody PageComChangeCarModelDto comChangeCarModel) {
- return this.comChangeCarModelService.queryByAppletsPage(comChangeCarModel);
+ public R queryByPage(@RequestBody PageComChangeCarModelRelationDto comChangeCarModelRelation) {
+ return this.carModelRelationService.queryByAppletsPage(comChangeCarModelRelation);
}
/**
@@ -76,5 +81,11 @@
return this.comChangeCarModelService.queryByList(comChangeCarModel);
}
+ @ApiOperation(value = "查询规格管理级联列表",response = ComChangeCarModelSpecsVo.class)
+ @PostMapping("/specs/list")
+ public R getSpecsList(@RequestBody PageComChangeCarModelSpecsDto comChangeCarModel) {
+ return this.carModelSpecsService.queryByList(comChangeCarModel);
+ }
+
}
--
Gitblit v1.7.1