From f237a61c412870933f47316a011237cd538de9bc Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 20 八月 2024 09:07:02 +0800
Subject: [PATCH] 新增需求
---
guns-management/src/main/java/com/stylefeng/guns/modular/code/controller/FitnessController.java | 92 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 79 insertions(+), 13 deletions(-)
diff --git a/guns-management/src/main/java/com/stylefeng/guns/modular/code/controller/FitnessController.java b/guns-management/src/main/java/com/stylefeng/guns/modular/code/controller/FitnessController.java
index c5d760a..90aa213 100644
--- a/guns-management/src/main/java/com/stylefeng/guns/modular/code/controller/FitnessController.java
+++ b/guns-management/src/main/java/com/stylefeng/guns/modular/code/controller/FitnessController.java
@@ -81,7 +81,6 @@
@ResponseBody
@PostMapping("/addOrUpdateType")
@ApiOperation(value = "健身类型添加/编辑", tags = {"健身类型管理"})
-
public ResultUtil addCoupon(FitnessType fitnessType) {
if (fitnessType.getId()==null){
// 添加
@@ -132,30 +131,51 @@
packageDetailVO.setTotal(aPackage.getTotal());
packageDetailVO.setAmount(aPackage.getAmount());
packageDetailVO.setPrice(aPackage.getPrice());
+ packageDetailVO.setAppleAmount(aPackage.getAppleAmount());
if (StringUtils.hasLength(aPackage.getPositions())){
+ String[] split = aPackage.getPositions().split(",");
+ String[] split1 = aPackage.getDifficulty().split(",");
// 遍历部位ids
- for (String s : aPackage.getPositions().split(",")) {
+ for (int i = 0; i < split.length; i++) {
FitnessPositionVO fitnessPositionVO = new FitnessPositionVO();
// 查询部位
- FitnessPosition fitnessPosition = fitnessPositionService.selectById(Integer.valueOf(s));
- if (fitnessPosition.getIsDelete() == 1){
- continue;
- }
+ FitnessPosition fitnessPosition = fitnessPositionService.selectById(Integer.valueOf(split[i]));
if (fitnessPosition!=null){
+ fitnessPositionVO.setId(fitnessPosition.getId());
+ if (fitnessPosition.getIsDelete() == 1){
+ continue;
+ }
fitnessPositionVO.setName(fitnessPosition.getName());
// 查询部位名称
FitnessType fitnessType = fitnessTypeService.selectById(fitnessPosition.getTypeId());
+ if (fitnessType!=null){
if (fitnessType.getIsDelete() == 1){
continue;
}
- if (fitnessType!=null){
fitnessPositionVO.setTypeName(fitnessType.getName());
}
- fitnessPositionVO.setAmount(fitnessPosition.getAmount());
+ switch (split1[i]){
+ case "0":
+ fitnessPositionVO.setAmount(fitnessPosition.getAmount());
+ break;
+ case "1":
+ fitnessPositionVO.setAmount(fitnessPosition.getAppleAmount2());
+ break;
+ case "2":
+ fitnessPositionVO.setAmount(fitnessPosition.getAmount3());
+ break;
+ case "3":
+ fitnessPositionVO.setAmount(fitnessPosition.getAmount4());
+ break;
+ case "4":
+ fitnessPositionVO.setAmount(fitnessPosition.getAmount5());
+ break;
+ }
+
}
- fitnessPositionVO.setId(fitnessPosition.getId());
fitnessPositionVOS.add(fitnessPositionVO);
}
+
}
packageDetailVO.setTypes(fitnessPositionVOS);
return ResultUtil.success(packageDetailVO);
@@ -165,8 +185,56 @@
@ApiOperation(value = "选择部位", tags = {"健身套餐管理"})
public ResultUtil<PageInfo<FitnessPositionVO> > selectPosition(FitnessPositionQuery req) {
List<FitnessPositionVO> res = packageService.selectPosition(req);
+ List<FitnessPositionVO> fitnessPositionVOS = new ArrayList<>();
+ for (FitnessPositionVO re : res) {
+ FitnessPositionVO fitnessPositionVO = new FitnessPositionVO();
+ fitnessPositionVO.setId(re.getId());
+ fitnessPositionVO.setName(re.getName());
+ fitnessPositionVO.setTypeName(re.getTypeName());
+ fitnessPositionVO.setTypeId(re.getTypeId());
+ fitnessPositionVO.setDifficulty("1");
+ fitnessPositionVO.setAmount(re.getAmount());
+ fitnessPositionVO.setAppleAmount(re.getAppleAmount());
+ fitnessPositionVOS.add(fitnessPositionVO);
+ FitnessPositionVO fitnessPositionVO2 = new FitnessPositionVO();
+ fitnessPositionVO2.setId(re.getId());
+ fitnessPositionVO2.setName(re.getName());
+ fitnessPositionVO2.setTypeName(re.getTypeName());
+ fitnessPositionVO2.setTypeId(re.getTypeId());
+ fitnessPositionVO2.setDifficulty("2");
+ fitnessPositionVO2.setAmount(re.getAmount2());
+ fitnessPositionVO2.setAppleAmount(re.getAppleAmount2());
+ fitnessPositionVOS.add(fitnessPositionVO2);
+ FitnessPositionVO fitnessPositionVO3 = new FitnessPositionVO();
+ fitnessPositionVO3.setId(re.getId());
+ fitnessPositionVO3.setName(re.getName());
+ fitnessPositionVO3.setTypeName(re.getTypeName());
+ fitnessPositionVO3.setTypeId(re.getTypeId());
+ fitnessPositionVO3.setDifficulty("3");
+ fitnessPositionVO3.setAmount(re.getAmount3());
+ fitnessPositionVO3.setAppleAmount(re.getAppleAmount3());
+ fitnessPositionVOS.add(fitnessPositionVO3);
+ FitnessPositionVO fitnessPositionVO4 = new FitnessPositionVO();
+ fitnessPositionVO4.setId(re.getId());
+ fitnessPositionVO4.setName(re.getName());
+ fitnessPositionVO4.setTypeName(re.getTypeName());
+ fitnessPositionVO4.setTypeId(re.getTypeId());
+ fitnessPositionVO4.setDifficulty("4");
+ fitnessPositionVO4.setAmount(re.getAmount4());
+ fitnessPositionVO4.setAppleAmount(re.getAppleAmount4());
+ fitnessPositionVOS.add(fitnessPositionVO4);
+ FitnessPositionVO fitnessPositionVO5 = new FitnessPositionVO();
+ fitnessPositionVO5.setId(re.getId());
+ fitnessPositionVO5.setName(re.getName());
+ fitnessPositionVO5.setTypeName(re.getTypeName());
+ fitnessPositionVO5.setTypeId(re.getTypeId());
+ fitnessPositionVO5.setDifficulty("5");
+ fitnessPositionVO5.setAmount(re.getAmount5());
+ fitnessPositionVO5.setAppleAmount(re.getAppleAmount5());
+ fitnessPositionVOS.add(fitnessPositionVO5);
+ }
// PageHelper.startPage(req.getPageNum(),req.getPageSize());
- PageInfo<FitnessPositionVO> info=new PageInfo<>(res);
+ PageInfo<FitnessPositionVO> info=new PageInfo<>(fitnessPositionVOS);
return ResultUtil.success(info);
}
@@ -183,7 +251,6 @@
@PostMapping("/addOrUpdatePosition")
@ApiOperation(value = "健身部位添加/编辑", tags = {"健身部位管理"})
public ResultUtil addCoupon(FitnessPosition fitnessPosition) {
-
if (fitnessPosition.getId()==null){
if (fitnessPosition.getName().equals("全身")){
// 勾选的全身 判断这个类型是否已经有名为全身的部位了
@@ -264,14 +331,13 @@
List<FitnessPosition> positions = fitnessPositionService.selectList(new EntityWrapper<FitnessPosition>()
.eq("typeId", id)
.eq("isDelete", 0));
- if ( positions.size()>0){
+ if (positions.size()>0){
return ResultUtil.error("当前类型被使用,无法删除");
}
FitnessType fitnessPosition = fitnessTypeService.selectById(id);
fitnessPosition.setIsDelete(1);
fitnessTypeService.updateById(fitnessPosition);
return ResultUtil.success("删除成功");
-
}
@ResponseBody
@PostMapping("/deletePackage")
--
Gitblit v1.7.1