From 94e7d0c18649fb724a87ba8df51c367d88765714 Mon Sep 17 00:00:00 2001 From: SjS Date: Wed, 4 Jun 2025 18:13:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=BC=E6=A1=8Cbug=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E4=B8=8E=E6=96=B0=E5=A2=9E=E5=95=86=E5=93=81=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/bst/chat/domain/ChatQuery.java | 5 ++- .../com/ruoyi/bst/chat/mapper/ChatMapper.xml | 1 + .../ruoyi/bst/chat/service/ChatService.java | 1 + .../chat/service/impl/ChatServiceImpl.java | 1 + .../com/ruoyi/bst/goods/domain/Goods.java | 18 +++++++- .../com/ruoyi/bst/goods/domain/GoodsVO.java | 1 + .../ruoyi/bst/goods/mapper/GoodsMapper.xml | 41 +++++++++++++------ .../ruoyi/bst/goods/service/GoodsService.java | 1 + .../goods/service/impl/GoodsServiceImpl.java | 35 ++++++++++++++++ .../java/com/ruoyi/bst/sku/domain/Sku.java | 2 +- .../bst/teamUser/domain/TeamUserQuery.java | 3 ++ .../bst/teamUser/mapper/TeamUserMapper.java | 2 + .../bst/teamUser/mapper/TeamUserMapper.xml | 9 ++++ .../bst/teamUser/service/TeamUserService.java | 1 + .../service/impl/TeamUserServiceImpl.java | 3 ++ .../com/ruoyi/web/app/AppChatController.java | 2 +- .../com/ruoyi/web/app/AppTeamController.java | 12 ++++++ .../com/ruoyi/web/bst/GoodsController.java | 17 ++++++++ 18 files changed, 138 insertions(+), 17 deletions(-) diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/chat/domain/ChatQuery.java b/ruoyi-service/src/main/java/com/ruoyi/bst/chat/domain/ChatQuery.java index dbbc6b1..6496494 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/chat/domain/ChatQuery.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/chat/domain/ChatQuery.java @@ -1,7 +1,5 @@ package com.ruoyi.bst.chat.domain; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.annotation.Excel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; @@ -25,4 +23,7 @@ public class ChatQuery extends ChatVO{ @ApiModelProperty("接收人名称") private String receiveName; + @ApiModelProperty("最大的ID,用于查询之前的数据") + private Long latestId; + } diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/chat/mapper/ChatMapper.xml b/ruoyi-service/src/main/java/com/ruoyi/bst/chat/mapper/ChatMapper.xml index e5bb1cb..c07c23d 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/chat/mapper/ChatMapper.xml +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/chat/mapper/ChatMapper.xml @@ -41,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and bc.create_time < #{query.deadline} and su_send.nick_name like concat ('%',#{query.senderName},'%') and su_receive.nick_name like concat ('%',#{query.receiverName},'%') + and bc.id < #{query.latestId} and bc.create_time > #{query.joinTime} ${query.params.dataScope} ${@com.ruoyi.framework.util.DataScopeUtil@create(query.scope) diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/chat/service/ChatService.java b/ruoyi-service/src/main/java/com/ruoyi/bst/chat/service/ChatService.java index 180c002..60ea2a9 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/chat/service/ChatService.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/chat/service/ChatService.java @@ -72,4 +72,5 @@ public interface ChatService List selectTeamMsgList(ChatQuery query); ChatVO selectOne(ChatQuery query); + } diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/chat/service/impl/ChatServiceImpl.java b/ruoyi-service/src/main/java/com/ruoyi/bst/chat/service/impl/ChatServiceImpl.java index 605db2c..6ea8a79 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/chat/service/impl/ChatServiceImpl.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/chat/service/impl/ChatServiceImpl.java @@ -186,6 +186,7 @@ public class ChatServiceImpl implements ChatService { } + @Override public int batchInsert(List list) { if (CollectionUtils.isEmptyElement(list)) { diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/goods/domain/Goods.java b/ruoyi-service/src/main/java/com/ruoyi/bst/goods/domain/Goods.java index 7abcb54..741939e 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/goods/domain/Goods.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/goods/domain/Goods.java @@ -7,9 +7,11 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import org.apache.poi.hpsf.Decimal; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; +import java.math.BigDecimal; import java.util.List; /** @@ -65,6 +67,20 @@ public class Goods extends BaseEntity @Excel(name = "排序") @ApiModelProperty("排序") - private Long sort; + private Integer sort; + + @Excel(name = "最小价格") + @ApiModelProperty("最小价格") + private BigDecimal minPrice; + + @Excel(name = "最大价格") + @ApiModelProperty("最大价格") + private BigDecimal maxPrice; + + @Excel(name = "库存") + @ApiModelProperty("库存") + private Integer totalStock; + + } diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/goods/domain/GoodsVO.java b/ruoyi-service/src/main/java/com/ruoyi/bst/goods/domain/GoodsVO.java index a940a5c..48dba59 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/goods/domain/GoodsVO.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/goods/domain/GoodsVO.java @@ -3,6 +3,7 @@ package com.ruoyi.bst.goods.domain; import com.ruoyi.bst.sku.domain.SkuVO; import com.ruoyi.bst.spec.domain.SpecVO; import com.ruoyi.bst.specValue.domain.SpecValueVO; +import com.ruoyi.common.annotation.Excel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/goods/mapper/GoodsMapper.xml b/ruoyi-service/src/main/java/com/ruoyi/bst/goods/mapper/GoodsMapper.xml index 69355bc..2f4555a 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/goods/mapper/GoodsMapper.xml +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/goods/mapper/GoodsMapper.xml @@ -16,21 +16,28 @@ + + + select bg.id, - bg.store_id, - bg.category_id, - bg.name, - bg.image, - bg.deposit, - bg.sales, - bg.virtual_sales, - bg.status, - bg.sort, - bg.create_time - from + bg.store_id, + bg.category_id, + bg.name, + bg.image, + bg.deposit, + bg.sales, + bg.virtual_sales, + bg.status, + bg.sort, + bg.create_time, + bg.min_price, + bg.max_price, + bg.total_stock + from + @@ -70,7 +77,8 @@ + + insert into bst_team_user diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/teamUser/service/TeamUserService.java b/ruoyi-service/src/main/java/com/ruoyi/bst/teamUser/service/TeamUserService.java index b59c053..91bc335 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/teamUser/service/TeamUserService.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/teamUser/service/TeamUserService.java @@ -74,4 +74,5 @@ public interface TeamUserService TeamUserVO getTeamUser(TeamUserQuery query); int kick(Long teamId,Long userId); + } diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/teamUser/service/impl/TeamUserServiceImpl.java b/ruoyi-service/src/main/java/com/ruoyi/bst/teamUser/service/impl/TeamUserServiceImpl.java index 3ce1332..7fc1d0f 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/teamUser/service/impl/TeamUserServiceImpl.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/teamUser/service/impl/TeamUserServiceImpl.java @@ -1,6 +1,7 @@ package com.ruoyi.bst.teamUser.service.impl; import java.util.Collections; +import java.util.Comparator; import java.util.List; import com.github.pagehelper.PageHelper; @@ -161,4 +162,6 @@ public class TeamUserServiceImpl implements TeamUserService public int kick(Long teamId, Long userId) { return teamService.kick(teamId, userId); } + + } diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/app/AppChatController.java b/ruoyi-web/src/main/java/com/ruoyi/web/app/AppChatController.java index fc41b1e..cd5ad33 100644 --- a/ruoyi-web/src/main/java/com/ruoyi/web/app/AppChatController.java +++ b/ruoyi-web/src/main/java/com/ruoyi/web/app/AppChatController.java @@ -25,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.time.LocalDateTime; import java.util.Collection; import java.util.List; import java.util.Set; @@ -63,7 +64,6 @@ public class AppChatController extends BaseController { public TableDataInfo receiveList(ChatQuery query) { startPage(); PageHelper.orderBy("create_time desc"); - query.setDeleted(false); List list = chatService.selectChatList(query); return getDataTable(list); } diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/app/AppTeamController.java b/ruoyi-web/src/main/java/com/ruoyi/web/app/AppTeamController.java index 105a037..5d158ce 100644 --- a/ruoyi-web/src/main/java/com/ruoyi/web/app/AppTeamController.java +++ b/ruoyi-web/src/main/java/com/ruoyi/web/app/AppTeamController.java @@ -1,5 +1,6 @@ package com.ruoyi.web.app; +import com.github.pagehelper.PageHelper; import com.ruoyi.bst.team.domain.Team; import com.ruoyi.bst.team.domain.TeamQuery; import com.ruoyi.bst.team.domain.TeamVO; @@ -178,5 +179,16 @@ public class AppTeamController extends BaseController { return getDataTable(list); } + @ApiOperation("历史拼桌人数信息") + @GetMapping("/teamJoinRecord") + public TableDataInfo teamJoinRecord(TeamUserQuery query) { + startPage(); + PageHelper.orderBy("create_time desc"); + List list = teamUserService.selectTeamUserList(query); + return getDataTable(list); + } + + + } diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/bst/GoodsController.java b/ruoyi-web/src/main/java/com/ruoyi/web/bst/GoodsController.java index 2899713..6007e83 100644 --- a/ruoyi-web/src/main/java/com/ruoyi/web/bst/GoodsController.java +++ b/ruoyi-web/src/main/java/com/ruoyi/web/bst/GoodsController.java @@ -125,4 +125,21 @@ public class GoodsController extends BaseController { } return toAjax(goodsService.deleteGoodsByIds(ids)); } + + /** + * 商品上架/下架 + */ + @PreAuthorize("@ss.hasPermi('bst:goods:changeStatus')") + @Log(title = "商品上架/下架,修改排序", businessType = BusinessType.UPDATE) + @PutMapping("/changeStatusAndSort") + public AjaxResult changeStatusAndSort(@RequestBody Goods goods) { + if (!goodsValidator.canEdit(goods.getId())){ + return error("您无权限修改该商品相关信息"); + } + if (!storeValidator.canEdit(goods.getStoreId())) { + return error("您无权限修改该店铺相关信息"); + } + return toAjax(goodsService.changeStatusAndSort(goods)); + } + }