|
@@ -1,12 +1,7 @@
|
|
|
package com.xyzc.start.controller;
|
|
|
|
|
|
import com.xyzc.common.core.utils.Result;
|
|
|
-import com.xyzc.start.domain.FuelPackage;
|
|
|
-import com.xyzc.start.domain.MemberCard;
|
|
|
-import com.xyzc.start.domain.vo.AiModelVo;
|
|
|
-import com.xyzc.start.domain.vo.FuelPackageVo;
|
|
|
-import com.xyzc.start.domain.vo.MemberCardVo;
|
|
|
-import com.xyzc.start.domain.vo.SchemeVo;
|
|
|
+import com.xyzc.start.domain.vo.*;
|
|
|
import com.xyzc.start.service.ISchemeService;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
@@ -21,7 +16,6 @@ import java.util.List;
|
|
|
@RestController
|
|
|
@RequiredArgsConstructor
|
|
|
@RequestMapping("/scheme")
|
|
|
-@CrossOrigin
|
|
|
public class SchemeController {
|
|
|
|
|
|
private final ISchemeService schemeService;
|
|
@@ -38,10 +32,10 @@ public class SchemeController {
|
|
|
|
|
|
|
|
|
/**
|
|
|
- * id查询会员卡详细套餐
|
|
|
+ * id查询会员卡详细权益
|
|
|
*/
|
|
|
@GetMapping("/currentMember/{memberId}")
|
|
|
- public Result<MemberCardVo> currentMemberById(@RequestParam("memberId") Long memberId) {
|
|
|
+ public Result<MemberCardVo> currentMemberById(@PathVariable("memberId") Long memberId) {
|
|
|
MemberCardVo memberCard = schemeService.queryCurrentMemberById(memberId);
|
|
|
|
|
|
return Result.ok(memberCard);
|
|
@@ -58,10 +52,10 @@ public class SchemeController {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * id查询燃料包详细套餐
|
|
|
+ * id查询燃料包详细权益
|
|
|
*/
|
|
|
@GetMapping("/currentFuel/{fuelId}")
|
|
|
- public Result<FuelPackageVo> currentFuelById(@RequestParam("fuelId") Long fuelId) {
|
|
|
+ public Result<FuelPackageVo> currentFuelById(@PathVariable Long fuelId) {
|
|
|
FuelPackageVo fuelPackage = schemeService.queryCurrentFuelById(fuelId);
|
|
|
|
|
|
return Result.ok(fuelPackage);
|
|
@@ -73,8 +67,8 @@ public class SchemeController {
|
|
|
* @param modelId 模型id
|
|
|
*/
|
|
|
@GetMapping("/fuelLaw")
|
|
|
- public Result<List<AiModelVo>> queryfuelLawList(Long modelId) {
|
|
|
- List<AiModelVo> fuelPackageList = schemeService.queryModelLawList(modelId);
|
|
|
+ public Result<List<AiModelLawVo>> queryfuelLawList(Long modelId) {
|
|
|
+ List<AiModelLawVo> fuelPackageList = schemeService.queryModelLawList(modelId);
|
|
|
|
|
|
return Result.ok(fuelPackageList);
|
|
|
}
|