From 5362ee33c8684235acd93d989fc379d658bacca9 Mon Sep 17 00:00:00 2001 From: lijianlin Date: Wed, 9 Jul 2025 17:51:40 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E9=80=80=E6=AC=BE=E9=80=9A=E8=BF=87bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/AuditMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mapper/AuditMapper.xml b/src/main/resources/mapper/AuditMapper.xml index 14b665a..15c40ea 100644 --- a/src/main/resources/mapper/AuditMapper.xml +++ b/src/main/resources/mapper/AuditMapper.xml @@ -8,7 +8,7 @@ audit_status = #{auditStatus}, reject_reason = #{rejectReason}, audit_time = #{auditTime} - where order_code = #{orderCode} + where order_code = #{orderCode} and audit_status = 0 order by create_time DESC limit 1 From abb6ef1aad322947287002d0c663986fcda8e100 Mon Sep 17 00:00:00 2001 From: sunjiabei Date: Wed, 9 Jul 2025 17:58:33 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=9F=A5id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/demo/controller/AdminController.java | 12 ++++++++++++ src/main/java/com/example/demo/mapper/AdminMapper.java | 2 ++ src/main/java/com/example/demo/service/AdminService.java | 2 +- .../java/com/example/demo/serviceImpl/AdminServiceImpl.java | 6 +++--- src/main/resources/mapper/AdminMapper.xml | 5 ++++- 5 files changed, 22 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/example/demo/controller/AdminController.java b/src/main/java/com/example/demo/controller/AdminController.java index cae0ff5..70e4cfc 100644 --- a/src/main/java/com/example/demo/controller/AdminController.java +++ b/src/main/java/com/example/demo/controller/AdminController.java @@ -57,4 +57,16 @@ public class AdminController { throw new RuntimeException(e); } } + + @PostMapping("/adminId") + public Result selectId(@RequestBody Admin admin) { + + try { + String ID = adminService.getId(admin.getAccount()); + return Result.success(ID); + } catch (Exception e) { + log.error(e.getMessage()); + return Result.error(e.getMessage()); + } + } } diff --git a/src/main/java/com/example/demo/mapper/AdminMapper.java b/src/main/java/com/example/demo/mapper/AdminMapper.java index b45f7a3..410ca90 100644 --- a/src/main/java/com/example/demo/mapper/AdminMapper.java +++ b/src/main/java/com/example/demo/mapper/AdminMapper.java @@ -15,4 +15,6 @@ import org.apache.ibatis.annotations.Mapper; public interface AdminMapper { Admin getAdmin(String account); Admin selectByName(String account); + Integer getId(String account); + } diff --git a/src/main/java/com/example/demo/service/AdminService.java b/src/main/java/com/example/demo/service/AdminService.java index 4c253ba..461b510 100644 --- a/src/main/java/com/example/demo/service/AdminService.java +++ b/src/main/java/com/example/demo/service/AdminService.java @@ -13,5 +13,5 @@ import com.example.demo.domain.entity.Admin; public interface AdminService { Admin login(Admin admin)throws Exception; - Integer selectId(String account); + String getId(String account); } diff --git a/src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java index 795db9c..ab2f1ea 100644 --- a/src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java @@ -56,9 +56,9 @@ public class AdminServiceImpl implements AdminService { } @Override - public Integer selectId(String account) { - Admin admin = adminMapper.getAdmin(account); - return admin.getId(); + public String getId(String account) { + Admin admin= adminMapper.getAdmin(account); + return admin.getId().toString(); } private boolean hasPermissionToMachine(Admin admin, String targetMachineId) { diff --git a/src/main/resources/mapper/AdminMapper.xml b/src/main/resources/mapper/AdminMapper.xml index f85f2a0..daaed4a 100644 --- a/src/main/resources/mapper/AdminMapper.xml +++ b/src/main/resources/mapper/AdminMapper.xml @@ -10,5 +10,8 @@ select * from admin where account= #{account} - + From af8f888a8808ec7c8d1d8cb7bfa0f461bf0af1bb Mon Sep 17 00:00:00 2001 From: lijianlin Date: Wed, 9 Jul 2025 18:03:25 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E9=80=80=E6=AC=BE=E9=A9=B3=E5=9B=9Ebug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/mapper/AuditMapper.java | 4 +++- src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java | 2 +- src/main/resources/mapper/AuditMapper.xml | 9 ++++++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/example/demo/mapper/AuditMapper.java b/src/main/java/com/example/demo/mapper/AuditMapper.java index 23041e2..8552ce9 100644 --- a/src/main/java/com/example/demo/mapper/AuditMapper.java +++ b/src/main/java/com/example/demo/mapper/AuditMapper.java @@ -21,8 +21,10 @@ import java.util.List; @Mapper public interface AuditMapper { - //根据订单号查订单 + //根据订单号查未审核订单 UserGoldRecord selectOrderByOrderCode(String orderCode); + //根据订单号查订单 + UserGoldRecord selectAllOrderByOrderCode(String orderCode); //修改订单审核人与审核状态 int updateOrder (UserGoldRecord userGoldRecord); //修改用户余额 diff --git a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java index 73901e2..641a221 100644 --- a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java @@ -56,7 +56,7 @@ public class AuditServiceImpl implements AuditService { //2.获取对应的消费订单（退款订单号去掉开头"TK"即为对应消费订单） String consumeOrderCode = order.getOrderCode().replaceFirst("TK", ""); //3.更新消费订单是否已退款状态为0 - UserGoldRecord consumeOrder = auditMapper.selectOrderByOrderCode(consumeOrderCode); + UserGoldRecord consumeOrder = auditMapper.selectAllOrderByOrderCode(consumeOrderCode); if (consumeOrderCode != null&&consumeOrder.getType()==1){ //确保是消费订单 auditMapper.updateOrderRefund(consumeOrderCode,(byte)0); }else { diff --git a/src/main/resources/mapper/AuditMapper.xml b/src/main/resources/mapper/AuditMapper.xml index 15c40ea..ee2e161 100644 --- a/src/main/resources/mapper/AuditMapper.xml +++ b/src/main/resources/mapper/AuditMapper.xml @@ -32,7 +32,7 @@ set is_refund = #{isRefund} where order_code = #{orderCode} - + + + + From ac71a60248e35e8cf46a9132147f871230ed7c8c Mon Sep 17 00:00:00 2001 From: sunjiabei Date: Wed, 9 Jul 2025 18:22:00 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E6=9F=A5id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java index ab2f1ea..a3aa0f6 100644 --- a/src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java @@ -57,8 +57,7 @@ public class AdminServiceImpl implements AdminService { @Override public String getId(String account) { - Admin admin= adminMapper.getAdmin(account); - return admin.getId().toString(); + return adminMapper.getAdmin(account).getId().toString(); } private boolean hasPermissionToMachine(Admin admin, String targetMachineId) { From cf142e26c4898bd4d30b2d490e53853f5873bc08 Mon Sep 17 00:00:00 2001 From: sunjiabei Date: Wed, 9 Jul 2025 19:28:27 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=85=A8=E9=83=A8?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/controller/UserController.java | 11 +++++++++++ src/main/java/com/example/demo/mapper/UserMapper.java | 2 ++ src/main/java/com/example/demo/service/UserService.java | 3 +++ .../java/com/example/demo/serviceImpl/UserServiceImpl.java | 7 +++++++ src/main/resources/mapper/UserMapper.xml | 8 +++++++- 5 files changed, 30 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/example/demo/controller/UserController.java b/src/main/java/com/example/demo/controller/UserController.java index 3f12756..2e7b409 100644 --- a/src/main/java/com/example/demo/controller/UserController.java +++ b/src/main/java/com/example/demo/controller/UserController.java @@ -1,5 +1,6 @@ package com.example.demo.controller; +import com.example.demo.domain.entity.User; import com.example.demo.domain.vo.Gold; import com.example.demo.domain.vo.GoldUser; import com.example.demo.domain.vo.Result; @@ -38,4 +39,14 @@ public class UserController { return Result.error("请检查输入精网号"); } } + @PostMapping("/selectAllUser") + public Result selectUser(@RequestBody User user) { + try { + user = userService.selectAllUser(user.getJwcode().toString()); + return Result.success(user); + } catch (Exception e) { + return Result.error("请检查输入精网号"); + } + } + } diff --git a/src/main/java/com/example/demo/mapper/UserMapper.java b/src/main/java/com/example/demo/mapper/UserMapper.java index 8bd3f69..304b822 100644 --- a/src/main/java/com/example/demo/mapper/UserMapper.java +++ b/src/main/java/com/example/demo/mapper/UserMapper.java @@ -22,6 +22,8 @@ public interface UserMapper { GoldUser selectGold(String jwcode); void updateGold(User user); + + User selectAllUser(String jwcode); //查询充值次数 Integer selectRechargeNumByJwcode(Integer jwcode); } diff --git a/src/main/java/com/example/demo/service/UserService.java b/src/main/java/com/example/demo/service/UserService.java index 63516e7..64b9cb4 100644 --- a/src/main/java/com/example/demo/service/UserService.java +++ b/src/main/java/com/example/demo/service/UserService.java @@ -1,5 +1,6 @@ package com.example.demo.service; +import com.example.demo.domain.entity.User; import com.example.demo.domain.vo.Gold; import com.example.demo.domain.vo.GoldUser; @@ -16,4 +17,6 @@ public interface UserService { GoldUser selectUser(String jwcode); GoldUser selectgold(String jwcode); + + User selectAllUser(String jwcode); } diff --git a/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java index 29f2997..7c116ac 100644 --- a/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java @@ -1,5 +1,6 @@ package com.example.demo.serviceImpl; +import com.example.demo.domain.entity.User; import com.example.demo.domain.vo.Gold; import com.example.demo.domain.vo.GoldUser; import com.example.demo.mapper.ConsumeMapper; @@ -31,6 +32,12 @@ public class UserServiceImpl implements UserService { } @Override + public User selectAllUser(String jwcode) { + User user = userMapper.selectAllUser(jwcode); + return user; + } + + @Override public GoldUser selectgold(String jwcode) { GoldUser gold = userMapper.selectGold(jwcode); return gold; diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml index aa7ddc6..f26b24b 100644 --- a/src/main/resources/mapper/UserMapper.xml +++ b/src/main/resources/mapper/UserMapper.xml @@ -22,7 +22,13 @@ FROM user WHERE jwcode = #{jwcode} - + + @@ -58,4 +66,20 @@ update_time = NOW() WHERE jwcode = #{jwcode} + + UPDATE user + SET + sum_permanent_gold = #{sumPermanentGold}, + sum_free_june = #{sumFreeJune}, + sum_free_december = #{sumFreeDecember}, + sum_task_gold = #{sumTaskGold}, + current_permanent_gold = #{currentPermanentGold}, + current_free_june = #{currentFreeJune}, + current_free_december = #{currentFreeDecember}, + current_task_gold = #{currentTaskGold}, + consume_num = #{consumeNum}, + recharge_num = #{rechargeNum} + + where jwcode = #{jwcode} + \ No newline at end of file From acc296558209651febfb4382a49453b2f15fca22 Mon Sep 17 00:00:00 2001 From: lijianlin Date: Wed, 9 Jul 2025 20:12:58 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=B8=8E=E6=9B=B4=E6=96=B0=E7=94=A8=E6=88=B71?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/demo/controller/UserController.java | 20 ++++++++++++++++++++ .../java/com/example/demo/mapper/UserMapper.java | 5 +++++ .../java/com/example/demo/service/UserService.java | 4 ++++ .../example/demo/serviceImpl/UserServiceImpl.java | 10 ++++++++++ src/main/resources/mapper/UserMapper.xml | 7 ++++--- 5 files changed, 43 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/example/demo/controller/UserController.java b/src/main/java/com/example/demo/controller/UserController.java index 2e7b409..7da869b 100644 --- a/src/main/java/com/example/demo/controller/UserController.java +++ b/src/main/java/com/example/demo/controller/UserController.java @@ -48,5 +48,25 @@ public class UserController { return Result.error("请检查输入精网号"); } } + //更新全部金币 + @PostMapping("/updateAllGold") + public Result updateAllGold(@RequestBody User user) { + try { + userService.updateAllGold(user); + return Result.success("更新成功"); + } catch (Exception e) { + return Result.error("请检查输入精网号"); + } + } + //新增用户 + @PostMapping("/addUser") + public Result addUser(@RequestBody User user) { + try { + userService.addUser(user); + return Result.success("添加成功"); + } catch (Exception e) { + return Result.error("请检查属性"); + } + } } diff --git a/src/main/java/com/example/demo/mapper/UserMapper.java b/src/main/java/com/example/demo/mapper/UserMapper.java index 304b822..f7e7b44 100644 --- a/src/main/java/com/example/demo/mapper/UserMapper.java +++ b/src/main/java/com/example/demo/mapper/UserMapper.java @@ -26,4 +26,9 @@ public interface UserMapper { User selectAllUser(String jwcode); //查询充值次数 Integer selectRechargeNumByJwcode(Integer jwcode); + + void updateAllGold(User user); + + void addUser(User user); + } diff --git a/src/main/java/com/example/demo/service/UserService.java b/src/main/java/com/example/demo/service/UserService.java index 64b9cb4..a391419 100644 --- a/src/main/java/com/example/demo/service/UserService.java +++ b/src/main/java/com/example/demo/service/UserService.java @@ -19,4 +19,8 @@ public interface UserService { GoldUser selectgold(String jwcode); User selectAllUser(String jwcode); + + void updateAllGold(User user); + + void addUser(User user); } diff --git a/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java index 7c116ac..8cf777a 100644 --- a/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java @@ -38,6 +38,16 @@ public class UserServiceImpl implements UserService { } @Override + public void updateAllGold(User user) { + userMapper.updateAllGold(user); + } + + @Override + public void addUser(User user) { + userMapper.addUser(user); + } + + @Override public GoldUser selectgold(String jwcode) { GoldUser gold = userMapper.selectGold(jwcode); return gold; diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml index 3cbec4d..d4392b4 100644 --- a/src/main/resources/mapper/UserMapper.xml +++ b/src/main/resources/mapper/UserMapper.xml @@ -6,10 +6,11 @@ name,jwcode,market ) VALUES ( - #{name},#{jwcode},#{market} - ) + #{name},#{jwcode},#{market} + ) +