From 75c69504004e88847e97868a21db5d2caada20a9 Mon Sep 17 00:00:00 2001 From: wxy <14293288+zysysys@user.noreply.gitee.com> Date: Tue, 3 Sep 2024 15:48:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=B4=AD=E4=B9=B0=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=8A=9F=E8=83=BD=E5=8F=8A=E8=B4=AD=E4=B9=B0=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 新增了购买记录的插入功能和查询接口，实现了在购买操作时插入购买记录，并提供了查询购买记录的接口。修复了购买服务中的代码错误，确保购买流程正常运行。 --- .../system/controller/SysUserController.java | 22 +++++++++++++ .../com/muyu/system/domain/ConnectorLog.java | 32 +++++++++++++++++++ .../com/muyu/system/mapper/BuyMapper.java | 3 ++ .../com/muyu/system/mapper/SysUserMapper.java | 3 ++ .../muyu/system/service/SysUserService.java | 3 ++ .../system/service/impl/BuyServiceImpl.java | 7 ++++ .../service/impl/SysUserServiceImpl.java | 6 ++++ .../resources/mapper/system/BuyMapper.xml | 5 +++ .../resources/mapper/system/SysUserMapper.xml | 4 +++ 9 files changed, 85 insertions(+) create mode 100644 src/main/java/com/muyu/system/domain/ConnectorLog.java diff --git a/src/main/java/com/muyu/system/controller/SysUserController.java b/src/main/java/com/muyu/system/controller/SysUserController.java index 1b09257..7f6a71e 100644 --- a/src/main/java/com/muyu/system/controller/SysUserController.java +++ b/src/main/java/com/muyu/system/controller/SysUserController.java @@ -11,6 +11,7 @@ import com.muyu.common.security.annotation.InnerAuth; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.*; +import com.muyu.system.domain.ConnectorLog; import com.muyu.system.domain.resp.AuthRoleResp; import com.muyu.system.domain.resp.UserDetailInfoResp; import com.muyu.system.domain.resp.UserInfoResp; @@ -281,6 +282,27 @@ public class SysUserController extends BaseController { return getDataTable(list); } + /* + 查詢購買記錄 + @param getBuyRecord +* @return +*/ + @GetMapping("/purchaseRecord") + public Result>record(ConnectorLog connectorLog){ + startPage(); + List list = userService.selectRecordList(connectorLog); + return getDataTable(list); + } + + @Log(title = "记录", businessType = BusinessType.EXPORT) + @RequiresPermissions("system:purchaseRecord:export") + @PostMapping("/purchaseRecord/export") + public void export (HttpServletResponse response, ConnectorLog connectorLog) { + List list = userService.selectRecordList(connectorLog); + ExcelUtil util = new ExcelUtil(ConnectorLog.class); + util.exportExcel(response, list, "记录"); + } + @Log(title = "记录", businessType = BusinessType.EXPORT) @RequiresPermissions("system:pay:export") diff --git a/src/main/java/com/muyu/system/domain/ConnectorLog.java b/src/main/java/com/muyu/system/domain/ConnectorLog.java new file mode 100644 index 0000000..e77d4c1 --- /dev/null +++ b/src/main/java/com/muyu/system/domain/ConnectorLog.java @@ -0,0 +1,32 @@ +package com.muyu.system.domain; + +import com.muyu.common.core.annotation.Excel; +import lombok.Data; + +/** + * @Author: wangxinyuan + * @Date: 2024/9/3 下午12:08 + */ + +@Data +public class ConnectorLog { + + //id + @Excel(name = "序號") + private Integer id; + + //数据名称 + @Excel(name = "數據名稱") + private String dataName; + + //金额 + @Excel(name = "金額") + private Double amount; + + //消费时间 + @Excel(name = "消費時間") +// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private String createTime; + +} diff --git a/src/main/java/com/muyu/system/mapper/BuyMapper.java b/src/main/java/com/muyu/system/mapper/BuyMapper.java index f7803c9..48cb9bb 100644 --- a/src/main/java/com/muyu/system/mapper/BuyMapper.java +++ b/src/main/java/com/muyu/system/mapper/BuyMapper.java @@ -3,6 +3,7 @@ package com.muyu.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.common.system.domain.SysUser; import com.muyu.system.domain.Connector; +import com.muyu.system.domain.ConnectorLog; import com.muyu.system.domain.ConnectorUser; import org.apache.catalina.User; @@ -24,4 +25,6 @@ public interface BuyMapper extends BaseMapper { SysUser selectUser(Long userId); void buyPrice(SysUser user); + + int insertPurchaseRecord(ConnectorLog connectorLog); } diff --git a/src/main/java/com/muyu/system/mapper/SysUserMapper.java b/src/main/java/com/muyu/system/mapper/SysUserMapper.java index 83f8cbd..ea75aab 100644 --- a/src/main/java/com/muyu/system/mapper/SysUserMapper.java +++ b/src/main/java/com/muyu/system/mapper/SysUserMapper.java @@ -3,6 +3,7 @@ package com.muyu.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.common.system.domain.PaymentParam; import com.muyu.common.system.domain.SysUser; +import com.muyu.system.domain.ConnectorLog; import org.apache.ibatis.annotations.Param; import java.math.BigDecimal; @@ -162,4 +163,6 @@ public interface SysUserMapper extends BaseMapper { int updateUserPhonenumber(@Param("username") String username, @Param("phonenumber") String phonenumber); + + List selectRecordList(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 0c2ef51..584c407 100644 --- a/src/main/java/com/muyu/system/service/SysUserService.java +++ b/src/main/java/com/muyu/system/service/SysUserService.java @@ -3,6 +3,7 @@ package com.muyu.system.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.common.system.domain.PaymentParam; import com.muyu.common.system.domain.SysUser; +import com.muyu.system.domain.ConnectorLog; import java.math.BigDecimal; import java.util.List; @@ -247,4 +248,6 @@ public interface SysUserService extends IService { int updateUserPhonenumber(String username, String phonenumber); + + List selectRecordList(ConnectorLog connectorLog); } diff --git a/src/main/java/com/muyu/system/service/impl/BuyServiceImpl.java b/src/main/java/com/muyu/system/service/impl/BuyServiceImpl.java index eca05bd..8b05dc3 100644 --- a/src/main/java/com/muyu/system/service/impl/BuyServiceImpl.java +++ b/src/main/java/com/muyu/system/service/impl/BuyServiceImpl.java @@ -6,6 +6,7 @@ import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.LoginUser; import com.muyu.common.system.domain.SysUser; import com.muyu.system.domain.Connector; +import com.muyu.system.domain.ConnectorLog; import com.muyu.system.domain.ConnectorUser; import com.muyu.system.mapper.BuyMapper; import com.muyu.system.service.BuyService; @@ -53,6 +54,12 @@ public class BuyServiceImpl extends ServiceImpl implements user.setUserBalance(user.getUserBalance()-connectorUser.getConnectorFrequency()*connectorUser.getConnectorPrice()); buyMapper.buyPrice(user); buyMapper.doBuyInterface(connectorUser); + + ConnectorLog connectorLog = new ConnectorLog(); + connectorLog.setDataName(connectorUser.getConnectorName()); + connectorLog.setAmount(connectorUser.getConnectorPrice()); + // 插入购买记录 + buyMapper.insertPurchaseRecord(connectorLog); return Result.success(i,"购买成功"); } } 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 c658215..fcb1269 100644 --- a/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java +++ b/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java @@ -20,6 +20,7 @@ import com.muyu.common.system.domain.SysRole; import com.muyu.common.system.domain.SysUser; import com.muyu.config.AlipayConfig; import com.muyu.config.util.MsgUtil; +import com.muyu.system.domain.ConnectorLog; import com.muyu.system.domain.SysPost; import com.muyu.system.domain.SysUserPost; import com.muyu.system.domain.SysUserRole; @@ -591,5 +592,10 @@ public class SysUserServiceImpl extends ServiceImpl impl return userMapper.updateUserPhonenumber(username,phonenumber); } + @Override + public List selectRecordList(ConnectorLog connectorLog) { + return userMapper.selectRecordList(connectorLog); + } + } diff --git a/src/main/resources/mapper/system/BuyMapper.xml b/src/main/resources/mapper/system/BuyMapper.xml index 4f0123c..2f0e894 100644 --- a/src/main/resources/mapper/system/BuyMapper.xml +++ b/src/main/resources/mapper/system/BuyMapper.xml @@ -10,6 +10,11 @@ + + INSERT INTO `groups`.`connect_log` ( `data_name`, `amount`, `create_time`) + VALUES (#{dataName}, #{amount}, new()); + + update connector_user set connector_residue_degree=connector_residue_degree+#{connectorFrequency},connector_frequency=connector_frequency+#{connectorFrequency} where connector_id=#{connectorId} and user_id=#{userId} diff --git a/src/main/resources/mapper/system/SysUserMapper.xml b/src/main/resources/mapper/system/SysUserMapper.xml index 33eb221..4bce685 100644 --- a/src/main/resources/mapper/system/SysUserMapper.xml +++ b/src/main/resources/mapper/system/SysUserMapper.xml @@ -203,6 +203,10 @@ select phonenumber from sys_user where phonenumber = #{phone} + + update sys_user set user_balance = user_balance + #{userBalance} where user_id = #{userId}