新增购买记录功能及购买记录查询接口
新增了购买记录的插入功能和查询接口,实现了在购买操作时插入购买记录,并提供了查询购买记录的接口。修复了购买服务中的代码错误,确保购买流程正常运行。master
parent
7c71232dc7
commit
75c6950400
|
@ -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<TableDataInfo<ConnectorLog>>record(ConnectorLog connectorLog){
|
||||
startPage();
|
||||
List<ConnectorLog> 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<ConnectorLog> list = userService.selectRecordList(connectorLog);
|
||||
ExcelUtil<ConnectorLog> util = new ExcelUtil<ConnectorLog>(ConnectorLog.class);
|
||||
util.exportExcel(response, list, "记录");
|
||||
}
|
||||
|
||||
|
||||
@Log(title = "记录", businessType = BusinessType.EXPORT)
|
||||
@RequiresPermissions("system:pay:export")
|
||||
|
|
|
@ -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;
|
||||
|
||||
}
|
|
@ -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<Connector> {
|
|||
SysUser selectUser(Long userId);
|
||||
|
||||
void buyPrice(SysUser user);
|
||||
|
||||
int insertPurchaseRecord(ConnectorLog connectorLog);
|
||||
}
|
||||
|
|
|
@ -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<SysUser> {
|
|||
|
||||
|
||||
int updateUserPhonenumber(@Param("username") String username, @Param("phonenumber") String phonenumber);
|
||||
|
||||
List<ConnectorLog> selectRecordList(ConnectorLog connectorLog);
|
||||
}
|
||||
|
|
|
@ -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<SysUser> {
|
|||
|
||||
|
||||
int updateUserPhonenumber(String username, String phonenumber);
|
||||
|
||||
List<ConnectorLog> selectRecordList(ConnectorLog connectorLog);
|
||||
}
|
||||
|
|
|
@ -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<BuyMapper, Connector> 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,"购买成功");
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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<SysUserMapper, SysUser> impl
|
|||
return userMapper.updateUserPhonenumber(username,phonenumber);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ConnectorLog> selectRecordList(ConnectorLog connectorLog) {
|
||||
return userMapper.selectRecordList(connectorLog);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
@ -10,6 +10,11 @@
|
|||
|
||||
</insert>
|
||||
|
||||
<insert id="insertPurchaseRecord">
|
||||
INSERT INTO `groups`.`connect_log` ( `data_name`, `amount`, `create_time`)
|
||||
VALUES (#{dataName}, #{amount}, new());
|
||||
</insert>
|
||||
|
||||
|
||||
<update id="doBuyInterface">
|
||||
update connector_user set connector_residue_degree=connector_residue_degree+#{connectorFrequency},connector_frequency=connector_frequency+#{connectorFrequency} where connector_id=#{connectorId} and user_id=#{userId}
|
||||
|
|
|
@ -203,6 +203,10 @@
|
|||
select phonenumber from sys_user where phonenumber = #{phone}
|
||||
</select>
|
||||
|
||||
<select id="selectRecordList" resultType="com.muyu.system.domain.ConnectorLog">
|
||||
select id,data_name,amount ,create_time from connect_log
|
||||
</select>
|
||||
|
||||
|
||||
<update id="addUserMoney">
|
||||
update sys_user set user_balance = user_balance + #{userBalance} where user_id = #{userId}
|
||||
|
|
Loading…
Reference in New Issue