二期任务合并

src/main/java/com/example/demo/controller/AdminController.java

@@ -62,6 +62,7 @@ public class AdminController {
         }
     }
 
+    //获取管理员ID
     @PostMapping("/adminId")
     public Result selectId(@RequestBody Admin admin) {
 
@@ -74,7 +75,7 @@ public class AdminController {
         }
     }
 
-
+    //更新用户密码
     @PostMapping("/password")
     public Result updatePassword(@RequestBody Password password){
 
@@ -86,4 +87,16 @@ public class AdminController {
 
     }
 
+    //更新用户密码
+    @PostMapping("/reset")
+    public Result resetPassword(@RequestBody Password password){
+
+        try {
+            return adminService.resetPassword(password);
+        } catch (Exception e) {
+            return Result.error("重置失败");
+        }
+
+    }
+
 }

src/main/java/com/example/demo/controller/ConsumeController.java

@@ -36,9 +36,11 @@ public class ConsumeController {
     @PostMapping("/selectAll")
     public Result selcetAll(@RequestBody Page page) {
         try {
+            //页码校验
             if (ObjectUtils.isEmpty(page.getPageNum())) {
                 return Result.error("页码数为空！");
             }
+            //页面大小校验
             if (ObjectUtils.isEmpty(page.getPageSize())) {
                 return Result.error("页大小为空！");
             } else {
@@ -56,9 +58,11 @@ public class ConsumeController {
     @PostMapping("/selectBy")
     public Result selcetBy(@RequestBody Page page) {
         try {
+            //页码校验
             if (ObjectUtils.isEmpty(page.getPageNum())) {
                 return Result.error("页码数为空！");
             }
+            //页面大小校验
             if (ObjectUtils.isEmpty(page.getPageSize())) {
                 return Result.error("页大小为空！");
             } else {

src/main/java/com/example/demo/controller/GeneralController.java

@@ -41,12 +41,14 @@ public class GeneralController {
         List<String> list = generalService.getPlatform();
         return Result.success(list);
     }
+    //获取商品名称
     @PostMapping("/goods")
     public Result getGoods()
     {
         List<String> list = generalService.getGoods();
         return Result.success(list);
     }
+    //获取活动名称
     @PostMapping("/activity")
     public Result getActivity()
     {

src/main/java/com/example/demo/controller/PermissionController.java

@@ -2,6 +2,7 @@ package com.example.demo.controller;
 
 import com.example.demo.domain.entity.Admin;
 import com.example.demo.domain.entity.AdminRole;
+import com.example.demo.domain.vo.AdminVo;
 import com.example.demo.domain.vo.Page;
 import com.example.demo.domain.vo.Permission;
 import com.example.demo.domain.vo.Result;
@@ -53,9 +54,9 @@ public class PermissionController {
     }
     //编辑用户
     @PostMapping("/updateAdmin")
-    public Result updateAdmin(@RequestBody Admin admin) throws Exception {
+    public Result updateAdmin(@RequestBody AdminVo adminVo) throws Exception {
         try {
-            return Result.success(permissionService.updateAdmin(admin));
+            return Result.success(permissionService.updateAdmin(adminVo));
         }
         catch (Exception e) {
             log.error(Arrays.toString(e.getStackTrace()));

src/main/java/com/example/demo/controller/RechargeController.java

@@ -29,7 +29,7 @@ public class RechargeController {
     @Autowired
     private RechargeService rechargeService;
 
-    //消耗明细
+    //充值明细
     @PostMapping("/selectAll")
     public Result selcetAll(@RequestBody Page page) {
         try {
@@ -49,7 +49,7 @@ public class RechargeController {
     }
 
 
-    //消耗明细筛选
+    //充值明细筛选
     @PostMapping("/selectBy")
     public Result selcetBy(@RequestBody Page page) {
         try {
@@ -67,7 +67,7 @@ public class RechargeController {
 
     }
 
-    //消耗金币统计
+    //充值金币统计
     @PostMapping("/statsGold")
     public Result statsGold(@RequestBody RechargeUser rechargeUser) {
         try {

src/main/java/com/example/demo/controller/RefundController.java

@@ -48,6 +48,7 @@ public class RefundController {
 
     }
 
+    //退款筛选
     @PostMapping("/selectBy")
     public Result selcetBy(@RequestBody Page page) {
         try {
@@ -66,6 +67,7 @@ public class RefundController {
 
     }
 
+    //退款金币统计
     @PostMapping("/statsGold")
     public Result statsGold(@RequestBody RefundUser refundUser) {
         try {
@@ -76,6 +78,7 @@ public class RefundController {
         }
     }
 
+    //获取退款类型
     @PostMapping("/refundType")
     public Result getRefundType()
     {
@@ -83,6 +86,7 @@ public class RefundController {
         return Result.success(list);
     }
 
+    //筛选产品
     @PostMapping("/selectGoods")
     public Result getSelectGoods(@RequestBody RefundUser refundUser)
     {

src/main/java/com/example/demo/controller/UserController.java

@@ -30,6 +30,7 @@ public class UserController {
     @Autowired
     private UserService userService;
 
+    //查找用户
     @PostMapping("/selectUser")
     public Result selectUser(@RequestBody GoldUser user) {
         try {
@@ -39,6 +40,7 @@ public class UserController {
             return Result.error("请检查输入精网号");
         }
     }
+    //查找用户全部信息
     @PostMapping("/selectAllUser")
     public Result selectUser(@RequestBody User user) {
         try {

src/main/java/com/example/demo/mapper/AdminMapper.java

@@ -15,7 +15,11 @@ import org.apache.ibatis.annotations.Mapper;
 public interface AdminMapper {
     Admin getAdmin(String  account);
     Admin selectByName(String account);
+
+    //获取管理员ID
     Integer getId(String account);
+
+    //更新密码
     void updatePassword(Admin admin);
 
 

src/main/java/com/example/demo/mapper/ConsumeMapper.java

@@ -18,13 +18,19 @@ import java.util.List;
 @Mapper
 public interface ConsumeMapper {
 
+     //查找全部订单
      List<ConsumeUser> selectAll(ConsumeUser consumeUser);
 
+     //查找经过筛选后的订单
      List<ConsumeUser> selectBy(ConsumeUser consumeUser);
 
+
+     //添加消费订单
      void add(UserGoldRecord userGoldRecord);
 
+     //更新退款状态
      void updateIsRefund(String orderCode);
 
+     //获得订单号
      List<ConsumeUser> selectOrderCodeByJwcode(String jwcode,String orderCode);
 }

src/main/java/com/example/demo/mapper/GeneralMapper.java

@@ -16,6 +16,9 @@ import java.util.List;
 public interface GeneralMapper {
     List<String> getMarket();
     List<String> getPlatform();
+    //获取商品
     List<String> getGoods();
+
+    //获取活动
     List<String> getActivity();
 }

src/main/java/com/example/demo/mapper/RateMapper.java

@@ -8,7 +8,7 @@ import java.util.List;
 @Mapper
 public interface RateMapper {
 
-    List<Rate> selectAll();
+    List<RateDetail> selectAll();
 
     Rate selectById(Integer id);
 

src/main/java/com/example/demo/mapper/RechargeMapper.java

@@ -19,9 +19,10 @@ import java.util.List;
 
 @Mapper
 public interface RechargeMapper {
+    //获取全部充值
     List<RechargeUser> selectAll(RechargeUser rechargeUser);
-
+    //获取筛选后的充值
     List<RechargeUser> selectBy(RechargeUser rechargeUser);
-
+    //添加充值订单
     void add(UserGoldRecord userGoldRecord);
 }

src/main/java/com/example/demo/mapper/RefundMapper.java

@@ -19,14 +19,19 @@ import java.util.List;
 @Mapper
 public interface RefundMapper {
 
+    //获取全部退款订单
     List<RefundUser> selectAll(RefundUser refundUser);
 
+    //获取筛选后的订单
     List<RefundUser> selectBy(RefundUser refundUser);
 
+    //添加退款订单
     void add(UserGoldRecord userGoldRecord);
 
+    //获取退款类型
     List<String> getRefundType();
 
+    //获取商品
     List<RefundUser> selectGoods(Integer jwcode);
 
 }

src/main/java/com/example/demo/mapper/UserMapper.java

@@ -22,24 +22,32 @@ import java.util.List;
 @Mapper
 public interface UserMapper {
 
+    //获取用户金币信息
     GoldUser selectUser(String jwcode);
 
+    //获取金币数
     GoldUser selectGold(String jwcode);
 
+    //更新金币数
     void updateGold(User user);
 
-     User selectAllUser(String jwcode);
+    //查找用户全部信息
+    User selectAllUser(String jwcode);
 
-     //获取用户表全部jwcode
+    //获取用户表全部jwcode
     List<Integer> getAllJwcode();
+
     //获取某用户最早的充值订单
     Date getEarliestRecharge(Integer jwcode);
+
     //更新用户首充日期
     void updateFirstRecharge(@Param("jwcode") Integer jwcode,
                              @Param("firstRecharge") Date firstRecharge);
-    void updateAllGold(User  user);
+
+    void updateAllGold(User user);
 
     void addUser(User user);
+
     //根据精网号查询用户
     User selectUserByJwcode(Integer jwcode);
 

src/main/java/com/example/demo/service/AdminService.java

@@ -15,10 +15,14 @@ import com.example.demo.domain.vo.Result;
 public interface AdminService {
     Admin login(Admin admin)throws Exception;
 
+    //获取用户ID
     String getId(String account);
     String getName(String account);
 
+    //更新密码
     Result updatePassword(Password password);
 
+    //重置密码
     Result resetPassword(Password password);
 }
+

src/main/java/com/example/demo/service/ConsumeService.java

@@ -18,11 +18,15 @@ import com.github.pagehelper.PageInfo;
 
 public interface ConsumeService {
 
+    //查询全部消费
     PageInfo<ConsumeUser> selectAll(Integer pageNum, Integer pageSize, ConsumeUser consumeUser);
 
+    //统计消费金币
     Gold statsGold(ConsumeUser consumeUser);
 
+    //查询筛选消费
     PageInfo<ConsumeUser> selectBy(Integer pageNum, Integer pageSize, ConsumeUser consumeUser);
 
+    //增加消费订单
     Result add(ConsumeUser consumeUser);
 }

src/main/java/com/example/demo/service/PermissionService.java

@@ -3,7 +3,9 @@ package com.example.demo.service;
 import com.example.demo.domain.entity.Admin;
 import com.example.demo.domain.entity.AdminRole;
 import com.example.demo.domain.entity.Role;
+import com.example.demo.domain.vo.AdminVo;
 import com.example.demo.domain.vo.Permission;
+import com.example.demo.domain.vo.Result;
 import com.github.pagehelper.PageInfo;
 
 import java.util.List;
@@ -25,6 +27,6 @@ public interface PermissionService {
     Integer deleteAdmin(Integer id);
     Integer updateAdminRole(AdminRole adminRole);
     Integer upadatePermission(Admin admin) throws Exception;
-
-    Object updateAdmin(Admin admin)throws Exception;
+    //更新管理员信息
+    Result updateAdmin(AdminVo adminVo)throws Exception;
 }

src/main/java/com/example/demo/service/RateService.java

@@ -7,7 +7,7 @@ import com.github.pagehelper.PageInfo;
 
 public interface RateService {
 
-    PageInfo<Rate> selectAll(Integer pageNum, Integer pageSize);
+    PageInfo<RateDetail> selectAll(Integer pageNum, Integer pageSize);
 
     Rate selectById(Integer id);
 

src/main/java/com/example/demo/service/RechargeService.java

@@ -16,11 +16,15 @@ import com.github.pagehelper.PageInfo;
  **/
 
 public interface RechargeService {
+    //查询所有充值
     PageInfo<RechargeUser> selectAll(Integer pageNum, Integer pageSize, RechargeUser rechargeUser);
 
+    //统计金币记录
     Gold statsGold(RechargeUser rechargeUser);
 
+    //查询筛选充值
     PageInfo<RechargeUser> selectBy(Integer pageNum, Integer pageSize, RechargeUser rechargeUser);
 
+    //添加充值记录
     Result add(RechargeUser rechargeUser);
 }

src/main/java/com/example/demo/service/RefundService.java

@@ -20,16 +20,21 @@ import java.util.List;
 
 public interface RefundService {
 
+    //查找全部退款
     PageInfo<RefundUser> selectAll(Integer pageNum, Integer pageSize, RefundUser refundUser);
 
+    //统计退款金额
     Gold statsGold(RefundUser refundUser);
 
+    //查找筛选退款
     PageInfo<RefundUser> selectBy(Integer pageNum, Integer pageSize, RefundUser refundUser);
 
+    //添加退款记录
     Result add(RefundUser refundUser);
 
     //获取退款类型
     List<String> getRefundType();
 
+    //查找退款商品
     List<RefundUser> selectGoods(Integer jwcode);
 }

src/main/java/com/example/demo/service/UserService.java

@@ -17,14 +17,21 @@ import java.util.List;
 
 public interface UserService {
 
+    //查找用户部分信息
     GoldUser selectUser(String jwcode);
+
+    //查找用户金币
     GoldUser selectgold(String jwcode);
 
+    //查找用户全部信息
     User selectAllUser(String jwcode);
+
     //更新用户的全部金币
     void updateAllGold(User user);
+
     //新增用户
     void addUser(User user);
+
     //更新用户的首充时间
     void updateFirstRecharge();
 }

src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java

@@ -64,6 +64,7 @@ public class AdminServiceImpl implements AdminService {
         }
     }
 
+    //获取用户ID
     @Override
     public String getId(String account) {
         return adminMapper.getAdmin(account).getId().toString();
@@ -90,18 +91,17 @@ public class AdminServiceImpl implements AdminService {
     private static final String PASSWORD_REGEX = "^(?![0-9]+$)(?![a-zA-Z]+$)(?!\\W+$).{8,16}$";
     private static final Pattern PASSWORD_PATTERN = Pattern.compile(PASSWORD_REGEX);
 
+    //更新密码
     @Override
     public Result updatePassword(Password password) {
 
         String oldPassword = password.getOldPassword();
         String newPassword = password.getNewPassword();
         String againPassword = password.getAgainPassword();
+        // 校验输入参数是否为空（账号、旧密码、新密码、确认密码均不可为空）
         if(oldPassword == null || newPassword == null || againPassword == null ||password.getAccount() == null) {
             return Result.error("输入不能为空");
         }
-        if (oldPassword.equals(newPassword)) {
-            return Result.error("新密码不能与旧密码相同");
-        }
         // 检查两次输入的新密码是否一致
         if (!newPassword.equals(againPassword)) {
             return Result.error("两次输入的新密码不一致");
@@ -114,6 +114,10 @@ public class AdminServiceImpl implements AdminService {
         {
             return Result.error("用户不存在");
         }
+        // 校验新密码是否与旧密码相同（不允许相同）
+        if (oldPassword.equals(newPassword)) {
+            return Result.error("新密码与历史密码重复");
+        }
         try {
             // 创建认证令牌并验证旧密码
             UsernamePasswordAuthenticationToken token =
@@ -144,22 +148,18 @@ public class AdminServiceImpl implements AdminService {
     }
 
 
-
+    //重置密码
     @Override
     public Result resetPassword(Password password) {
 
-        String newPassword = password.getNewPassword();
-        if(newPassword == null ||password.getAccount() == null) {
-            return Result.error("输入不能为空");
+        String newPassword = "123456";
+        if(password.getAccount() == null) {
+            return Result.error("账户未输入");
         }
 
-        // 检查新密码是否符合复杂度要求
-        if (!PASSWORD_PATTERN.matcher(newPassword).matches()) {
-            return Result.error("新密码必须为8-16位数字、字母或符号组成，且至少包含其中两种");
-        }
         if(adminMapper.getAdmin(password.getAccount())==null)
         {
-            return Result.error("用户不存在");
+            return Result.error("账户查找不到");
         }
         try {
             // 获取认证后的用户信息
@@ -177,7 +177,7 @@ public class AdminServiceImpl implements AdminService {
             return Result.success("密码重置成功");
         }
         catch (Exception e) {
-            return Result.error("密码重置失败");
+            return Result.error("其他错误");
         }
     }
 }

src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java

@@ -146,6 +146,7 @@ public class ConsumeServiceImpl implements ConsumeService {
                 userGoldRecord.setFreeJune(0);
             }
         }
+        //信息输入
         userGoldRecord.setTaskGold(-consumeUser.getTaskGold());
         userGoldRecord.setRemark(consumeUser.getRemark());
         userGoldRecord.setType((byte) 1);
@@ -165,11 +166,11 @@ public class ConsumeServiceImpl implements ConsumeService {
         user.setConsumeNum(gold.getConsumeNum() + 1);
         user.setSumConsume(-(consumeUser.getPermanentGold() + consumeUser.getFreeGold() + consumeUser.getTaskGold()));
         userMapper.updateGold(user);
-       // if(consumeUser.getJwcode().equals(94226013)){
-            GoldTistV2.addCoinNew(userGoldRecord.getJwcode().toString(), 65,
-                    (double) (userGoldRecord.getPermanentGold() + userGoldRecord.getFreeDecember() + userGoldRecord.getFreeJune() + userGoldRecord.getTaskGold()) /100,
-                    userGoldRecord.getRemark(),((double) userGoldRecord.getPermanentGold() /100), userGoldRecord.getPayPlatform(), userGoldRecord.getGoodsName());
-       // }
+        // if(consumeUser.getJwcode().equals(94226013)){
+        GoldTistV2.addCoinNew(userGoldRecord.getJwcode().toString(), 65,
+                (double) (userGoldRecord.getPermanentGold() + userGoldRecord.getFreeDecember() + userGoldRecord.getFreeJune() + userGoldRecord.getTaskGold()) /100,
+                userGoldRecord.getRemark(),((double) userGoldRecord.getPermanentGold() /100), userGoldRecord.getPayPlatform(), userGoldRecord.getGoodsName());
+        // }
         return Result.success();
     }
 }

src/main/java/com/example/demo/serviceImpl/PermissionServiceImpl.java

@@ -3,9 +3,13 @@ package com.example.demo.serviceImpl;
 import com.example.demo.domain.entity.Admin;
 import com.example.demo.domain.entity.AdminRole;
 import com.example.demo.domain.entity.Role;
+import com.example.demo.domain.vo.AdminVo;
+import com.example.demo.domain.vo.Password;
 import com.example.demo.domain.vo.Permission;
+import com.example.demo.domain.vo.Result;
 import com.example.demo.mapper.AdminMapper;
 import com.example.demo.mapper.PermissionMapper;
+import com.example.demo.service.AdminService;
 import com.example.demo.service.PermissionService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -32,6 +36,9 @@ public class PermissionServiceImpl implements PermissionService {
     private PermissionMapper permissionMapper;
     @Autowired
     private AdminMapper adminMapper;
+    @Autowired
+    private AdminService adminService;
+
     @Override
     public List<String> getposition(String token) {
         return permissionMapper.getposition(token);
@@ -45,47 +52,46 @@ public class PermissionServiceImpl implements PermissionService {
     @Override
     public PageInfo<Permission> getpermission(Integer pageNum, Integer pageSize, Permission permission) {
         PageHelper.startPage(pageNum, pageSize);
-        List<Permission> list=  permissionMapper.getPermission(permission);
+        List<Permission> list = permissionMapper.getPermission(permission);
         return new PageInfo<>(list);
     }
 
     @Override
     @Transactional
-    public Integer addpermission(Admin admin) throws  Exception {
+    public Integer addpermission(Admin admin) throws Exception {
 
-        if(!ObjectUtils.isEmpty(adminMapper.getAdmin(admin.getAccount()))){
+        if (!ObjectUtils.isEmpty(adminMapper.getAdmin(admin.getAccount()))) {
             throw new Exception("账号已存在");
         }
-     if(ObjectUtils.isEmpty(admin.getAccount())){
-         throw new Exception("账号为空！");
-     }
-     if(ObjectUtils.isEmpty( admin.getMarket())){
-         throw new Exception("地区为空！");
-     }
-     if(ObjectUtils.isEmpty( admin.getPostiton())){
-         throw new Exception("职位为空！");
-     }
-     if (ObjectUtils.isEmpty( admin.getRoleId())){
-         throw new Exception("权限类别为空！");
-     }
-    if(ObjectUtils.isEmpty( admin.getAdminName())){
-        throw new Exception("用户名为空！");
-    }
-    if(ObjectUtils.isEmpty( admin.getMachineId())){
-        throw new Exception("机器编号为空！");
-    }
+        if (ObjectUtils.isEmpty(admin.getAccount())) {
+            throw new Exception("账号为空！");
+        }
+        if (ObjectUtils.isEmpty(admin.getMarket())) {
+            throw new Exception("地区为空！");
+        }
+        if (ObjectUtils.isEmpty(admin.getPostiton())) {
+            throw new Exception("职位为空！");
+        }
+        if (ObjectUtils.isEmpty(admin.getRoleId())) {
+            throw new Exception("权限类别为空！");
+        }
+        if (ObjectUtils.isEmpty(admin.getAdminName())) {
+            throw new Exception("用户名为空！");
+        }
+        if (ObjectUtils.isEmpty(admin.getMachineId())) {
+            throw new Exception("机器编号为空！");
+        }
         if (admin.getMachineId().contains(",")) {
             throw new Exception("机器编号格式错误");
+        } else {
+            BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
+            admin.setPassword(passwordEncoder.encode(("123456")));
+            permissionMapper.addPermission(admin);
+            AdminRole adminRole = new AdminRole();
+            adminRole.setAdminId(admin.getId());
+            adminRole.setRoleId(admin.getRoleId());
+            return permissionMapper.addadminRole(adminRole);
         }
-    else {
-        BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
-        admin.setPassword(passwordEncoder.encode(("123456")));
-        permissionMapper.addPermission(admin);
-        AdminRole adminRole = new AdminRole();
-        adminRole.setAdminId(admin.getId());
-        adminRole.setRoleId(admin.getRoleId());
-      return   permissionMapper.addadminRole(adminRole);
-    }
     }
 
     @Override
@@ -96,7 +102,7 @@ public class PermissionServiceImpl implements PermissionService {
     @Override
     @Transactional
     public Integer deleteAdmin(Integer id) {
-        if (id == null){
+        if (id == null) {
             return -1;
         }
 
@@ -115,32 +121,47 @@ public class PermissionServiceImpl implements PermissionService {
         return permissionMapper.updatePermission(admin);
     }
 
+    //更新管理员信息
     @Override
-    public Object updateAdmin(Admin admin)throws Exception {
-
-        if(ObjectUtils.isEmpty(admin.getAccount())){
+    public Result updateAdmin(AdminVo adminVo) throws Exception {
+        // 校验账号是否为空（账号是唯一标识，必须存在）
+        if (ObjectUtils.isEmpty(adminVo.getAccount())) {
             throw new Exception("账号为空！");
         }
-        if(ObjectUtils.isEmpty( admin.getMarket())){
+        // 校验用户名是否为空（管理员姓名为必填项）
+        if (ObjectUtils.isEmpty(adminVo.getAdminName())) {
+            throw new Exception("用户名为空！");
+        }
+        // 校验地区是否为空（管理员所属地区为必填项）
+        if (ObjectUtils.isEmpty(adminVo.getMarket())) {
             throw new Exception("地区为空！");
         }
-        if(ObjectUtils.isEmpty( admin.getPostiton())){
+        // 校验职位是否为空（管理员职位为必填项）
+        if (ObjectUtils.isEmpty(adminVo.getPostiton())) {
             throw new Exception("职位为空！");
         }
-
-        if(ObjectUtils.isEmpty( admin.getAdminName())){
-            throw new Exception("用户名为空！");
-        }
-        if(ObjectUtils.isEmpty( admin.getMachineId())){
+        // 校验机器编号是否为空（机器编号为必填项）
+        if (ObjectUtils.isEmpty(adminVo.getMachineId())) {
             throw new Exception("机器编号为空！");
         }
-        if (admin.getMachineId().contains(",")) {
+        // 校验机器编号格式（不允许包含逗号，避免与后续拼接逻辑冲突
+        if (adminVo.getMachineId().contains(",")) {
             throw new Exception("机器编号格式错误");
-        }
-        else {
-
-
-            return   permissionMapper.updateAdmin(admin);
+        } else {
+            Admin admin = new Admin();
+            admin.setAccount(adminVo.getAccount());
+            admin.setAdminName(adminVo.getAdminName());
+            admin.setMarket(adminVo.getMarket());
+            admin.setPostiton(adminVo.getPostiton());
+            // 处理机器编号：若存在额外机器编号（machineIds），则与原编号拼接（用逗号分隔）
+            if (adminVo.getMachineIds() == null) {
+                admin.setMachineId(adminVo.getMachineId());
+            } else {
+                admin.setMachineId(adminVo.getMachineId() + "," + adminVo.getMachineIds());
+            }
+            admin.setRemark(adminVo.getRemark());
+            permissionMapper.updateAdmin(admin);
+            return Result.success("成功");
         }
     }
 

src/main/java/com/example/demo/serviceImpl/RateServiceImpl.java

@@ -22,9 +22,9 @@ public class RateServiceImpl implements RateService {
 
 
     @Override
-    public PageInfo<Rate> selectAll(Integer pageNum, Integer pageSize) {
+    public PageInfo<RateDetail> selectAll(Integer pageNum, Integer pageSize) {
         PageHelper.startPage(pageNum, pageSize);
-        List<Rate> rates = rateMapper.selectAll();
+        List<RateDetail> rates = rateMapper.selectAll();
         return new PageInfo<>(rates);
     }
 
@@ -45,6 +45,6 @@ public class RateServiceImpl implements RateService {
         if (rate.getNum() == null || rate.getNum().equals(BigDecimal.ZERO)) {
             return Result.error("汇率数值存在异常");
         }else {
-        return Result.success("编辑成功");
-    }}
+            return Result.success("编辑成功");
+        }}
 }

src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java

@@ -38,7 +38,7 @@ public class RechargeServiceImpl implements RechargeService {
     @Autowired
     private UserMapper userMapper;
 
-
+    //查询所有充值
     @Override
     public PageInfo<RechargeUser> selectAll(Integer pageNum, Integer pageSize, RechargeUser rechargeUser) {
         PageHelper.startPage(pageNum, pageSize);
@@ -46,6 +46,7 @@ public class RechargeServiceImpl implements RechargeService {
         return new PageInfo<>(rechargeUsers);
     }
 
+    //查询筛选充值
     @Override
     public PageInfo<RechargeUser> selectBy(Integer pageNum, Integer pageSize, RechargeUser rechargeUser) {
         PageHelper.startPage(pageNum, pageSize);
@@ -53,6 +54,7 @@ public class RechargeServiceImpl implements RechargeService {
         return new PageInfo<>(rechargeUsers);
     }
 
+    //统计金币记录
     @Override
     public Gold statsGold(RechargeUser rechargeUser) {
         Gold gold = new Gold();
@@ -82,13 +84,14 @@ public class RechargeServiceImpl implements RechargeService {
     }
 
 
+    //添加充值记录
     @Override
     public Result add(RechargeUser rechargeUser) {
         if(rechargeUser.getFreeGold()==null||rechargeUser.getPermanentGold()==null||rechargeUser.getMoney()==null){
             return Result.error("金币和金额不能为空");
         }
-        if(rechargeUser.getFreeGold()<0||rechargeUser.getPermanentGold()<=0||rechargeUser.getMoney()<=0){
-            return Result.error("充值不能为负数或0");
+        if(rechargeUser.getFreeGold()<0||rechargeUser.getPermanentGold()<0||rechargeUser.getMoney()<0){
+            return Result.error("充值不能为0");
         }
         GoldUser goldUser = userMapper.selectUser(rechargeUser.getJwcode().toString());
         if(goldUser==null){
@@ -120,6 +123,7 @@ public class RechargeServiceImpl implements RechargeService {
             userGoldRecord.setFreeJune(rechargeUser.getFreeGold());
             userGoldRecord.setFreeDecember(0);
         }
+        //数据输入
         userGoldRecord.setSumGold(rechargeUser.getFreeGold()+rechargeUser.getPermanentGold());
         userGoldRecord.setRateId(rechargeUser.getRateId());
         userGoldRecord.setMoney(rechargeUser.getMoney());

src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java

@@ -44,7 +44,7 @@ public class RefundServiceImpl implements RefundService {
     @Autowired
     private UserMapper userMapper;
 
-
+    //查找全部退款
     @Override
     public PageInfo<RefundUser> selectAll(Integer pageNum, Integer pageSize, RefundUser refundUser) {
         PageHelper.startPage(pageNum, pageSize);
@@ -52,6 +52,7 @@ public class RefundServiceImpl implements RefundService {
         return new PageInfo<>(refundUsers);
     }
 
+    //统计退款金额
     @Override
     public Gold statsGold(RefundUser refundUser) {
         Gold gold = new Gold();
@@ -86,6 +87,7 @@ public class RefundServiceImpl implements RefundService {
         return gold;
     }
 
+    //查找筛选退款
     @Override
     public PageInfo<RefundUser> selectBy(Integer pageNum, Integer pageSize, RefundUser refundUser) {
         PageHelper.startPage(pageNum, pageSize);
@@ -93,6 +95,7 @@ public class RefundServiceImpl implements RefundService {
         return new PageInfo<>(refundUsers);
     }
 
+    //添加退款记录
     @Transactional
     @Override
     public Result add(RefundUser refundUser) {
@@ -140,6 +143,7 @@ public class RefundServiceImpl implements RefundService {
             userGoldRecord.setFreeJune(refundUser.getFreeGold());
             userGoldRecord.setFreeDecember(0);
         }
+        //信息输入
         userGoldRecord.setTaskGold(refundUser.getTaskGold());
         userGoldRecord.setSumGold(refundUser.getSumGold());
         userGoldRecord.setPayPlatform("金币系统");
@@ -149,6 +153,7 @@ public class RefundServiceImpl implements RefundService {
         userGoldRecord.setAuditStatus(0);
         userGoldRecord.setCreateTime(new Date());
         List<ConsumeUser> list = consumeMapper.selectOrderCodeByJwcode(userGoldRecord.getJwcode().toString(), orderCode);
+        //消费订单号校验
         if (list == null || list.isEmpty()) {
             return Result.error("该用户没有该订单号");
         }else if(list.size()==1){
@@ -165,6 +170,7 @@ public class RefundServiceImpl implements RefundService {
         return Result.success();
     }
 
+    //获取退款类型
     @Override
     public List<String> getRefundType() {
         List<String> list = refundMapper.getRefundType();
@@ -175,6 +181,7 @@ public class RefundServiceImpl implements RefundService {
         return filteredList;
     }
 
+    //查找退款商品
     @Override
     public List<RefundUser> selectGoods(Integer jwcode) {
         List<RefundUser> refundUsers = refundMapper.selectGoods(jwcode);

src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java

@@ -29,12 +29,14 @@ public class UserServiceImpl implements UserService {
     @Autowired
     private UserMapper userMapper;
 
+    //查找用户部分信息
     @Override
     public GoldUser selectUser(String jwcode) {
         GoldUser user = userMapper.selectUser(jwcode);
         return user;
     }
 
+    //查找用户全部信息
     @Override
     public User selectAllUser(String jwcode) {
         User user = userMapper.selectAllUser(jwcode);
@@ -72,6 +74,7 @@ public class UserServiceImpl implements UserService {
         }
     }
 
+    //查找用户金币
     @Override
     public GoldUser selectgold(String jwcode) {
         GoldUser gold = userMapper.selectGold(jwcode);