diff --git a/src/main/java/com/muyu/system/controller/SysUserController.java b/src/main/java/com/muyu/system/controller/SysUserController.java index 7f6a71e..ea293e6 100644 --- a/src/main/java/com/muyu/system/controller/SysUserController.java +++ b/src/main/java/com/muyu/system/controller/SysUserController.java @@ -56,6 +56,14 @@ public class SysUserController extends BaseController { @Autowired private SysConfigService configService; + + //查询12个月的消费记录 + @GetMapping("/months") + public ListgetMonthsSummary(ConnectorLog connectorLog){ + return userService.getMonthsSummary(connectorLog); + } + + /** * 获取用户列表 */ diff --git a/src/main/java/com/muyu/system/domain/ConnectorLog.java b/src/main/java/com/muyu/system/domain/ConnectorLog.java index e77d4c1..ed8945a 100644 --- a/src/main/java/com/muyu/system/domain/ConnectorLog.java +++ b/src/main/java/com/muyu/system/domain/ConnectorLog.java @@ -29,4 +29,8 @@ public class ConnectorLog { // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private String createTime; + private String month; + + private Double totalAmount; + } diff --git a/src/main/java/com/muyu/system/mapper/SysUserMapper.java b/src/main/java/com/muyu/system/mapper/SysUserMapper.java index ea75aab..981837b 100644 --- a/src/main/java/com/muyu/system/mapper/SysUserMapper.java +++ b/src/main/java/com/muyu/system/mapper/SysUserMapper.java @@ -165,4 +165,6 @@ public interface SysUserMapper extends BaseMapper { int updateUserPhonenumber(@Param("username") String username, @Param("phonenumber") String phonenumber); List selectRecordList(ConnectorLog connectorLog); + + List selectMonthSummary(ConnectorLog connectorLog); } diff --git a/src/main/java/com/muyu/system/service/SysUserService.java b/src/main/java/com/muyu/system/service/SysUserService.java index 584c407..cabc4ab 100644 --- a/src/main/java/com/muyu/system/service/SysUserService.java +++ b/src/main/java/com/muyu/system/service/SysUserService.java @@ -250,4 +250,6 @@ public interface SysUserService extends IService { int updateUserPhonenumber(String username, String phonenumber); List selectRecordList(ConnectorLog connectorLog); + + List getMonthsSummary(ConnectorLog connectorLog); } diff --git a/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java b/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java index fcb1269..3698725 100644 --- a/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java +++ b/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java @@ -597,5 +597,10 @@ public class SysUserServiceImpl extends ServiceImpl impl return userMapper.selectRecordList(connectorLog); } + @Override + public List getMonthsSummary(ConnectorLog connectorLog) { + return userMapper.selectMonthSummary(connectorLog); + } + } diff --git a/src/main/resources/mapper/system/SysUserMapper.xml b/src/main/resources/mapper/system/SysUserMapper.xml index 4bce685..ad4c682 100644 --- a/src/main/resources/mapper/system/SysUserMapper.xml +++ b/src/main/resources/mapper/system/SysUserMapper.xml @@ -207,6 +207,20 @@ select id,data_name,amount ,create_time from connect_log + + update sys_user set user_balance = user_balance + #{userBalance} where user_id = #{userId}