From b1656998bf998507daaa20ce038d2578aff7b92a Mon Sep 17 00:00:00 2001 From: liyuxin <1579178744@qq.com> Date: Sun, 1 Sep 2024 15:54:32 +0800 Subject: [PATCH] =?UTF-8?q?9.1=20=E6=9D=8E=E9=9B=A8=E6=AC=A3=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E8=B4=AD=E4=B9=B0=E8=AE=B0=E5=BD=95=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/muyu/market/admain/Record.java | 78 +++++++++++++++++++ .../market/admain/request/RecordListReq.java | 52 +++++++++++++ .../admain/response/RecordListResp.java | 67 ++++++++++++++++ .../server/controller/RecordController.java | 52 +++++++++++++ .../controller/SysLogininforController.java | 4 - .../server/controller/SysUserController.java | 14 ++-- .../market/server/mapper/RecordMapper.java | 9 +++ .../server/mapper/SysLogininforMapper.java | 9 --- .../service/Impl/RecordServiceImpl.java | 39 ++++++++++ .../Impl/SysLogininforServiceImpl.java | 20 ----- .../service/Impl/SysUserServiceImpl.java | 20 ++--- .../market/server/service/RecordService.java | 19 +++++ .../server/service/SysLogininforService.java | 13 ---- .../market/server/service/SysUserService.java | 7 +- 14 files changed, 338 insertions(+), 65 deletions(-) create mode 100644 cloud-market2-common/src/main/java/com/muyu/market/admain/Record.java create mode 100644 cloud-market2-common/src/main/java/com/muyu/market/admain/request/RecordListReq.java create mode 100644 cloud-market2-common/src/main/java/com/muyu/market/admain/response/RecordListResp.java create mode 100644 cloud-market2-server/src/main/java/com/muyu/market/server/controller/RecordController.java delete mode 100644 cloud-market2-server/src/main/java/com/muyu/market/server/controller/SysLogininforController.java create mode 100644 cloud-market2-server/src/main/java/com/muyu/market/server/mapper/RecordMapper.java delete mode 100644 cloud-market2-server/src/main/java/com/muyu/market/server/mapper/SysLogininforMapper.java create mode 100644 cloud-market2-server/src/main/java/com/muyu/market/server/service/Impl/RecordServiceImpl.java delete mode 100644 cloud-market2-server/src/main/java/com/muyu/market/server/service/Impl/SysLogininforServiceImpl.java create mode 100644 cloud-market2-server/src/main/java/com/muyu/market/server/service/RecordService.java delete mode 100644 cloud-market2-server/src/main/java/com/muyu/market/server/service/SysLogininforService.java diff --git a/cloud-market2-common/src/main/java/com/muyu/market/admain/Record.java b/cloud-market2-common/src/main/java/com/muyu/market/admain/Record.java new file mode 100644 index 0000000..d8d8a65 --- /dev/null +++ b/cloud-market2-common/src/main/java/com/muyu/market/admain/Record.java @@ -0,0 +1,78 @@ +package com.muyu.market.admain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.muyu.common.core.web.domain.BaseEntity; +import com.muyu.market.admain.request.RecordListReq; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.math.BigDecimal; +import java.util.Date; + +@Data +@AllArgsConstructor +@SuperBuilder +@NoArgsConstructor +@TableName(value = "market_record",autoResultMap = true) +@EqualsAndHashCode(callSuper = true) +public class Record extends BaseEntity { + + + /** + * 记录表ID + */ + @TableId(value = "record_id",type = IdType.AUTO) + private Long recordId; + /** + * 用户名称 + */ + @Schema(type = "String",description = "用户名称") + private String userName; + /** + * 商品名称 + */ + @Schema(type = "String",description = "商品名称") + private String name; + /** + * 价格 + */ + @Schema(type = "BigDecimal",description = "价格") + private BigDecimal price; + /** + * 购买时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Schema(description = "购买时间",type = "Date") + private Date buyTime; + + + private String createBy; + private Date createTime; + private String updateBy; + private Date updateTime; + private String remark; + + + public static Record SaveRecodeList(RecordListReq recodeListReq){ + + return Record + .builder() + .recordId(recodeListReq.getRecordId()) + .userName(recodeListReq.getUserName()) + .name(recodeListReq.getName()) + .price(recodeListReq.getPrice()) + .buyTime(recodeListReq.getBuyTime()) + .build(); + } + + + + +} diff --git a/cloud-market2-common/src/main/java/com/muyu/market/admain/request/RecordListReq.java b/cloud-market2-common/src/main/java/com/muyu/market/admain/request/RecordListReq.java new file mode 100644 index 0000000..ae0f268 --- /dev/null +++ b/cloud-market2-common/src/main/java/com/muyu/market/admain/request/RecordListReq.java @@ -0,0 +1,52 @@ +package com.muyu.market.admain.request; + + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.math.BigDecimal; +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder +@Tag(name = "购买商品记录表", description = "购买商品记录表展示请求") +public class RecordListReq { + + + /** + * 记录表ID + */ + @TableId(value = "record_id",type = IdType.AUTO) + private Long recordId; + /** + * 用户名称 + */ + @Schema(type = "String",description = "用户名称") + private String userName; + /** + * 商品名称 + */ + @Schema(type = "String",description = "商品名称") + private String name; + /** + * 价格 + */ + @Schema(type = "BigDecimal",description = "价格") + private BigDecimal price; + /** + * 购买时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Schema(description = "购买时间",type = "Date") + private Date buyTime; + +} diff --git a/cloud-market2-common/src/main/java/com/muyu/market/admain/response/RecordListResp.java b/cloud-market2-common/src/main/java/com/muyu/market/admain/response/RecordListResp.java new file mode 100644 index 0000000..04e9f9d --- /dev/null +++ b/cloud-market2-common/src/main/java/com/muyu/market/admain/response/RecordListResp.java @@ -0,0 +1,67 @@ +package com.muyu.market.admain.response; + + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.muyu.market.admain.Record; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.math.BigDecimal; +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder +@Tag(name = "购买商品记录表", description = "购买商品记录表展示请求") +public class RecordListResp { + + + /** + * 记录表ID + */ + @TableId(value = "record_id",type = IdType.AUTO) + private Long recordId; + /** + * 用户名称 + */ + @Schema(type = "String",description = "用户名称") + private String userName; + /** + * 商品名称 + */ + @Schema(type = "String",description = "商品名称") + private String name; + /** + * 价格 + */ + @Schema(type = "BigDecimal",description = "价格") + private BigDecimal price; + /** + * 购买时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Schema(description = "购买时间",type = "Date") + private Date buyTime; + + + + public static RecordListResp selRecodeList(Record recode){ + + return RecordListResp + .builder() + .recordId(recode.getRecordId()) + .userName(recode.getUserName()) + .name(recode.getName()) + .price(recode.getPrice()) + .buyTime(recode.getBuyTime()) + .build(); + } + +} diff --git a/cloud-market2-server/src/main/java/com/muyu/market/server/controller/RecordController.java b/cloud-market2-server/src/main/java/com/muyu/market/server/controller/RecordController.java new file mode 100644 index 0000000..82d2041 --- /dev/null +++ b/cloud-market2-server/src/main/java/com/muyu/market/server/controller/RecordController.java @@ -0,0 +1,52 @@ +package com.muyu.market.server.controller; + +import com.muyu.common.core.domain.Result; +import com.muyu.market.admain.Record; +import com.muyu.market.admain.request.RecordListReq; +import com.muyu.market.admain.response.RecordListResp; +import com.muyu.market.server.service.RecordService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@Slf4j +@RestController +@RequestMapping("/recode") +@Tag(name = "购买记录控制层",description = "购买记录控制层") +@RequiredArgsConstructor +public class RecordController { + + @Autowired + private RecordService recodeService; + + + /** + * 购买记录展示 + * @param recodeListReq + * @return + */ + @RequestMapping(path = "/recodeList",method = RequestMethod.POST) + @Operation(summary = "购买记录展示",description = "根据接口数据可以购买记录展示") + public Result> findByrecodeList(@Validated @RequestBody RecordListReq recodeListReq){ + return Result.success( recodeService.findByrecodeList( recodeListReq )); + } + + + /** + * 添加接口 + * @param recodeListReq + * @return + */ + @PostMapping + @Operation(summary = "购买记录添加",description = "购买记录添加,添加成功才可以使用") + public Result save(@Validated @RequestBody RecordListReq recodeListReq){ + recodeService.save( Record.SaveRecodeList( recodeListReq )); + return Result.success(null,"操作成功"); + } +} diff --git a/cloud-market2-server/src/main/java/com/muyu/market/server/controller/SysLogininforController.java b/cloud-market2-server/src/main/java/com/muyu/market/server/controller/SysLogininforController.java deleted file mode 100644 index a81f76d..0000000 --- a/cloud-market2-server/src/main/java/com/muyu/market/server/controller/SysLogininforController.java +++ /dev/null @@ -1,4 +0,0 @@ -//package com.muyu.market.server.controller; -// -//public class SysLogininforController { -//} diff --git a/cloud-market2-server/src/main/java/com/muyu/market/server/controller/SysUserController.java b/cloud-market2-server/src/main/java/com/muyu/market/server/controller/SysUserController.java index e80a6c1..8351549 100644 --- a/cloud-market2-server/src/main/java/com/muyu/market/server/controller/SysUserController.java +++ b/cloud-market2-server/src/main/java/com/muyu/market/server/controller/SysUserController.java @@ -1,9 +1,6 @@ package com.muyu.market.server.controller; -import cn.hutool.http.useragent.UserAgentUtil; -import com.alibaba.fastjson.JSONObject; import com.muyu.common.core.domain.Result; -import com.muyu.common.core.utils.JwtUtils; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.LoginUser; import com.muyu.market.admain.SysUser; @@ -14,6 +11,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.math.BigDecimal; + @RestController @RequestMapping("/sysUser") @Tag( name = "个人信息控制层",description = "用于操作用户个人信息") @@ -31,19 +30,18 @@ public class SysUserController { return Result.success(byId); } //充值 - @PostMapping("/updSysUserMoney") @Operation(summary = "充值",description = "通过修改余额达到充值效果") public Result updSysUserMoney(@Validated @RequestBody SysUser sysUser){ Integer i = sysUserService.updSysUserMoney( sysUser ); return i>0?Result.success():Result.error(500,"充值失败 请联系管理员"); } - //充值 + //支付 @PostMapping("/paySysUserMoney") @Operation(summary = "支付",description = "通过修改余额达到支付效果") - public Result paySysUserMoney(@Validated @RequestBody SysUser sysUser){ - Integer i = sysUserService.paySysUserMoney( sysUser ); + public Result paySysUserMoney(@Validated @RequestParam("price") BigDecimal price){ + Integer i = sysUserService.paySysUserMoney( price ); return i>0?Result.success():Result.error(500,"充值失败 请联系管理员"); } -// 在哪写 + } diff --git a/cloud-market2-server/src/main/java/com/muyu/market/server/mapper/RecordMapper.java b/cloud-market2-server/src/main/java/com/muyu/market/server/mapper/RecordMapper.java new file mode 100644 index 0000000..d0ed3b9 --- /dev/null +++ b/cloud-market2-server/src/main/java/com/muyu/market/server/mapper/RecordMapper.java @@ -0,0 +1,9 @@ +package com.muyu.market.server.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.market.admain.Record; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface RecordMapper extends BaseMapper { +} diff --git a/cloud-market2-server/src/main/java/com/muyu/market/server/mapper/SysLogininforMapper.java b/cloud-market2-server/src/main/java/com/muyu/market/server/mapper/SysLogininforMapper.java deleted file mode 100644 index 4ab7f45..0000000 --- a/cloud-market2-server/src/main/java/com/muyu/market/server/mapper/SysLogininforMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -//package com.muyu.market.server.mapper; -// -//import com.baomidou.mybatisplus.core.mapper.BaseMapper; -//import com.muyu.market.admain.SysLogininfor; -//import org.apache.ibatis.annotations.Mapper; -// -//@Mapper -//public interface SysLogininforMapper extends BaseMapper { -//} diff --git a/cloud-market2-server/src/main/java/com/muyu/market/server/service/Impl/RecordServiceImpl.java b/cloud-market2-server/src/main/java/com/muyu/market/server/service/Impl/RecordServiceImpl.java new file mode 100644 index 0000000..83cd65b --- /dev/null +++ b/cloud-market2-server/src/main/java/com/muyu/market/server/service/Impl/RecordServiceImpl.java @@ -0,0 +1,39 @@ +package com.muyu.market.server.service.Impl; + +import com.alibaba.nacos.common.utils.StringUtils; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.market.admain.Record; +import com.muyu.market.admain.request.RecordListReq; +import com.muyu.market.admain.response.RecordListResp; +import com.muyu.market.server.mapper.RecordMapper; +import com.muyu.market.server.service.RecordService; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.stream.Collectors; + +@Service +public class RecordServiceImpl extends ServiceImpl implements RecordService { + + + @Override + public List findByrecodeList(RecordListReq recodeListReq) { + + + LambdaQueryWrapper lambdaQueryWrapperlist = new LambdaQueryWrapper<>(); + + /** + * 查询购买的API名称 + */ + if (StringUtils.isNotBlank( recodeListReq.getName())) { + lambdaQueryWrapperlist.like( Record::getName, recodeListReq.getName()); + } + + List recodelist = this.list(lambdaQueryWrapperlist); + + return recodelist.stream() + .map( RecordListResp::selRecodeList) + .collect(Collectors.toList()); + } +} diff --git a/cloud-market2-server/src/main/java/com/muyu/market/server/service/Impl/SysLogininforServiceImpl.java b/cloud-market2-server/src/main/java/com/muyu/market/server/service/Impl/SysLogininforServiceImpl.java deleted file mode 100644 index 34ab621..0000000 --- a/cloud-market2-server/src/main/java/com/muyu/market/server/service/Impl/SysLogininforServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -//package com.muyu.market.server.service.Impl; -// -//import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -//import com.muyu.market.admain.SysLogininfor; -// -//import com.muyu.market.admain.response.SysLogininforResp; -//import com.muyu.market.server.mapper.SysLogininforMapper; -//import com.muyu.market.server.service.SysLogininforService; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.stereotype.Service; -// -//@Service -//public class SysLogininforServiceImpl extends ServiceImpl implements SysLogininforService { -// @Autowired -// private SysLogininforMapper sysLogininforMapper; -// @Override -// public SysLogininforResp selectLogininforByUserName(String userName) { -// return null; -// } -//} diff --git a/cloud-market2-server/src/main/java/com/muyu/market/server/service/Impl/SysUserServiceImpl.java b/cloud-market2-server/src/main/java/com/muyu/market/server/service/Impl/SysUserServiceImpl.java index e6e0831..33792c3 100644 --- a/cloud-market2-server/src/main/java/com/muyu/market/server/service/Impl/SysUserServiceImpl.java +++ b/cloud-market2-server/src/main/java/com/muyu/market/server/service/Impl/SysUserServiceImpl.java @@ -11,6 +11,7 @@ import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.JwtUtils; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.LoginUser; +import com.muyu.market.admain.Myapi; import com.muyu.market.admain.SysUser; import com.muyu.market.server.mapper.SysUserMapper; import com.muyu.market.server.service.SysUserService; @@ -37,24 +38,25 @@ public class SysUserServiceImpl extends ServiceImpl impl eq( "user_id",loginUser.getUserid() ); return sysUserMapper.update( money ); } - //充值余额 + //fufei @Override - public Integer paySysUserMoney(SysUser sysUser) { + public Integer paySysUserMoney(BigDecimal price) { +// 获取操作人信息 LoginUser loginUser = SecurityUtils.getLoginUser(); +// 编译执行器 UpdateWrapper sysUserUpdateWrapper = new UpdateWrapper<>(); //价钱 - BigDecimal moneyReq = sysUser.getMoney(); - //用户 - SysUser user = selectByUserId( Math.toIntExact( sysUser.getUserId() ) ); +// BigDecimal moneyReq = sysUser.getMoney(); + //查询登录人信息 + SysUser user = selectByUserId( Math.toIntExact( loginUser.getUserid() ) ); //用户余额 BigDecimal userMoney = user.getMoney(); - int i = userMoney.compareTo( moneyReq ); + int i = userMoney.compareTo( price ); if (i < 0) { throw new RuntimeException("余额不足 请充值"); } - - UpdateWrapper money = sysUserUpdateWrapper.setSql("money=money-"+sysUser.getMoney()). - eq( "user_id",loginUser.getUserid() ); + UpdateWrapper money = sysUserUpdateWrapper.setSql("money=money-"+price). + eq( "user_id",user.getUserId() ); return sysUserMapper.update( money ); } //回显用户信息 diff --git a/cloud-market2-server/src/main/java/com/muyu/market/server/service/RecordService.java b/cloud-market2-server/src/main/java/com/muyu/market/server/service/RecordService.java new file mode 100644 index 0000000..e6effe3 --- /dev/null +++ b/cloud-market2-server/src/main/java/com/muyu/market/server/service/RecordService.java @@ -0,0 +1,19 @@ +package com.muyu.market.server.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.market.admain.Record; +import com.muyu.market.admain.request.RecordListReq; +import com.muyu.market.admain.response.RecordListResp; + +import java.util.List; + +public interface RecordService extends IService { + + /** + * 查询商品接口 + * + * @param recodeListReq + * @return + */ + List findByrecodeList(RecordListReq recodeListReq); +} diff --git a/cloud-market2-server/src/main/java/com/muyu/market/server/service/SysLogininforService.java b/cloud-market2-server/src/main/java/com/muyu/market/server/service/SysLogininforService.java deleted file mode 100644 index e8294eb..0000000 --- a/cloud-market2-server/src/main/java/com/muyu/market/server/service/SysLogininforService.java +++ /dev/null @@ -1,13 +0,0 @@ -//package com.muyu.market.server.service; -// -//import com.baomidou.mybatisplus.extension.service.IService; -//import com.muyu.market.admain.SysLogininfor; -//import com.muyu.market.admain.response.SysLogininforResp; -// -// -//public interface SysLogininforService extends IService { -// /* -// 根据名字查询登录日志表 -// */ -// SysLogininforResp selectLogininforByUserName(String userName); -//} diff --git a/cloud-market2-server/src/main/java/com/muyu/market/server/service/SysUserService.java b/cloud-market2-server/src/main/java/com/muyu/market/server/service/SysUserService.java index 9f025ae..0976c10 100644 --- a/cloud-market2-server/src/main/java/com/muyu/market/server/service/SysUserService.java +++ b/cloud-market2-server/src/main/java/com/muyu/market/server/service/SysUserService.java @@ -1,8 +1,11 @@ package com.muyu.market.server.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.market.admain.Myapi; import com.muyu.market.admain.SysUser; +import java.math.BigDecimal; + public interface SysUserService extends IService { /** @@ -15,10 +18,10 @@ public interface SysUserService extends IService { /** * 充值用户余额 * - * @param sysUser + * @param * @return void */ - Integer paySysUserMoney(SysUser sysUser); + Integer paySysUserMoney(BigDecimal price); /** * 回显用户余额