From 350067a73fc9ed0a35582b900533c2708d5b1212 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 14 十一月 2024 17:53:01 +0800
Subject: [PATCH] 所有代码

---
 guns-management/src/main/java/com/stylefeng/guns/modular/code/controller/FitnessController.java |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 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 90aa213..115ba84 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
@@ -131,7 +131,6 @@
         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(",");
@@ -155,27 +154,30 @@
                         fitnessPositionVO.setTypeName(fitnessType.getName());
                     }
                     switch (split1[i]){
-                        case "0":
-                            fitnessPositionVO.setAmount(fitnessPosition.getAmount());
-                            break;
                         case "1":
-                            fitnessPositionVO.setAmount(fitnessPosition.getAppleAmount2());
+                            fitnessPositionVO.setAmount(fitnessPosition.getAmount());
+                            fitnessPositionVO.setDifficulty("1");
                             break;
                         case "2":
-                            fitnessPositionVO.setAmount(fitnessPosition.getAmount3());
+                            fitnessPositionVO.setAmount(fitnessPosition.getAmount2());
+                            fitnessPositionVO.setDifficulty("2");
                             break;
                         case "3":
-                            fitnessPositionVO.setAmount(fitnessPosition.getAmount4());
+                            fitnessPositionVO.setAmount(fitnessPosition.getAmount3());
+                            fitnessPositionVO.setDifficulty("3");
                             break;
                         case "4":
+                            fitnessPositionVO.setAmount(fitnessPosition.getAmount4());
+                            fitnessPositionVO.setDifficulty("4");
+                            break;
+                        case "5":
                             fitnessPositionVO.setAmount(fitnessPosition.getAmount5());
+                            fitnessPositionVO.setDifficulty("5");
                             break;
                     }
-
                 }
                 fitnessPositionVOS.add(fitnessPositionVO);
             }
-
         }
         packageDetailVO.setTypes(fitnessPositionVOS);
         return ResultUtil.success(packageDetailVO);

--
Gitblit v1.7.1