ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AuctionCollectionDTO.java
New file @@ -0,0 +1,23 @@ package com.ruoyi.system.api.domain.dto; import com.ruoyi.common.core.web.page.BasePage; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data public class AuctionCollectionDTO extends BasePage { @ApiModelProperty(value = "商品id") private Long goodsSkuId; @ApiModelProperty(value = "会员id") private Long memberId; @ApiModelProperty(value = "1收藏,2 取消收藏") private Long state; @ApiModelProperty(value = "商品名称") private String goodsSkuName; } ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberAuctionSalesroomWdDTO.java
New file @@ -0,0 +1,15 @@ package com.ruoyi.system.api.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Set; @Data public class MemberAuctionSalesroomWdDTO { @ApiModelProperty(value = "会员id") private Long memberId; @ApiModelProperty(value = "拍卖会id") private Set<Long> goodsSkuIdList; } ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/WdMemberAuctionSalesroomDTO.java
New file @@ -0,0 +1,7 @@ package com.ruoyi.system.api.domain.dto; import lombok.Data; @Data public class WdMemberAuctionSalesroomDTO { } ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsListVO.java
@@ -41,4 +41,7 @@ @ApiModelProperty(value = "规格单位") private String specUnit; @ApiModelProperty(value = "是中标 1未中标,2中标") private Integer isStatus; } ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/WdMemberAuctionSalesroomVO.java
New file @@ -0,0 +1,28 @@ package com.ruoyi.system.api.domain.vo; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.time.LocalDateTime; @Data public class WdMemberAuctionSalesroomVO { @ApiModelProperty(value = "拍卖场id") private Long SalesroomId; @ApiModelProperty(value = "拍卖场名称") private String salesroomName; @ApiModelProperty(value = "拍卖状态 0=预展中 1=拍卖中 2=已结束") private Integer status; @ApiModelProperty(value = "拍卖场说明") private String description; @ApiModelProperty(value = "拍卖场封面图") private String coverPic; @ApiModelProperty(value = "加入时间") private LocalDateTime BondTime; } ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionGoodsController.java
@@ -7,8 +7,10 @@ import com.ruoyi.common.security.annotation.InnerAuth; import com.ruoyi.system.api.domain.AuctionGoods; import com.ruoyi.system.api.domain.dto.AuctionGoodsListDTO; import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomDTO; import com.ruoyi.system.api.domain.vo.AuctionGoodsListVO; import com.ruoyi.system.api.domain.vo.AuctionGoodsinfoVO; import com.ruoyi.system.api.domain.vo.WdMemberAuctionSalesroomVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; @@ -54,4 +56,11 @@ public R<AuctionGoodsinfoVO> getAuctionGoodsInfo(@RequestBody AuctionGoodsListDTO auctionGoodsListDTO) { return R.ok(iAuctionGoodsService.getAuctionGoodsInfo(auctionGoodsListDTO)); } @RequestMapping("/getWdAuctionSalesList") @ResponseBody @ApiOperation(value = "用户端-我的拍卖-我的加入了的普通拍品") public R<PageDTO<AuctionGoodsListVO>> getWdAuctionSalesList(@RequestBody AuctionGoodsListDTO auctionGoodsListDTO) { return R.ok(iAuctionGoodsService.getWdAuctionSalesList(auctionGoodsListDTO)); } } ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java
@@ -17,6 +17,7 @@ import com.ruoyi.system.api.domain.AppMiniLoginVO; import com.ruoyi.system.api.domain.dto.AppMiniLoginDTO; import com.ruoyi.system.api.domain.vo.PayInfoVO; import com.ruoyi.system.api.domain.vo.WdMemberAuctionSalesroomVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import javax.annotation.Resource; @@ -144,5 +145,10 @@ } @RequestMapping("/getWdAuctionSalesroomList") @ResponseBody @ApiOperation(value = "用户端-我的拍卖-我的加入了的拍卖场") public R<PageDTO<WdMemberAuctionSalesroomVO>> getWdAuctionSalesroomList(@RequestBody MemberAuctionSalesroomDTO MemberAuctionSalesroomDTO) { return R.ok(iAuctionSalesroomService.getWdAuctionSalesroomList(MemberAuctionSalesroomDTO)); } } ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/MemberAuctionCollectionController.java
@@ -1,8 +1,18 @@ package com.ruoyi.auction.controller.forepart; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.ruoyi.auction.service.IMemberAuctionCollectionService; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.utils.page.PageDTO; import com.ruoyi.system.api.domain.dto.AuctionCollectionDTO; import com.ruoyi.system.api.domain.dto.AuctionGoodsListDTO; import com.ruoyi.system.api.domain.vo.AuctionGoodsListVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.poi.ss.formula.functions.T; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; /** * <p> @@ -14,6 +24,22 @@ */ @RestController @RequestMapping("/member-auction-collection") @Api(value = "用户收藏的普通拍卖商品相关接口", tags = "用户收藏的普通拍卖商品相关接口", description = "用户收藏的普通拍卖商品相关接口") public class MemberAuctionCollectionController { @Resource private IMemberAuctionCollectionService memberAuctionCollectionService; @PostMapping("/saveAuctionCollection") @ResponseBody @ApiOperation(value = "用户端-普通拍品收藏和取消收藏") public R saveAuctionCollection(@RequestBody AuctionCollectionDTO auctionCollectionDTO) { memberAuctionCollectionService.saveAuctionCollection(auctionCollectionDTO); return R.ok(); } @RequestMapping("/getMemberAuctionCollectionList") @ResponseBody @ApiOperation(value = "用户端-普通拍品收藏列表") public R<PageDTO<AuctionGoodsListVO>> getMemberAuctionCollectionList(@RequestBody AuctionCollectionDTO auctionCollectionDTO) { return R.ok(memberAuctionCollectionService.getMemberAuctionCollectionList(auctionCollectionDTO)); } } ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/mapper/AuctionSalesroomMapper.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomDTO; import com.ruoyi.system.api.domain.AuctionSalesroom; import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomWdDTO; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -19,4 +20,5 @@ public interface AuctionSalesroomMapper extends BaseMapper<AuctionSalesroom> { List<AuctionSalesroom> pageMemberAuctionSalesroomList(Page page, @Param("param") MemberAuctionSalesroomDTO memberAuctionSalesroomDTO); List<AuctionSalesroom> pageMemberAuctionSalesroomWdList(Page page, MemberAuctionSalesroomWdDTO memberAuctionSalesroomWdDTO); } ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionGoodsService.java
@@ -48,4 +48,6 @@ PageDTO<AuctionGoodsListVO> getAuctionGoodsList(AuctionGoodsListDTO auctionGoodsListDTO); AuctionGoodsinfoVO getAuctionGoodsInfo(@RequestBody AuctionGoodsListDTO auctionGoodsListDTO); PageDTO<AuctionGoodsListVO> getWdAuctionSalesList(@RequestBody AuctionGoodsListDTO auctionGoodsListDTO); } ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionSalesroomService.java
@@ -17,6 +17,7 @@ import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomBondDTO; import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomDTO; import com.ruoyi.system.api.domain.vo.PayInfoVO; import com.ruoyi.system.api.domain.vo.WdMemberAuctionSalesroomVO; import org.springframework.web.bind.annotation.RequestBody; /** @@ -74,4 +75,6 @@ void saveAuctionSalesroom(MgtAuctionSalesroomDTO dto); PageDTO<WdMemberAuctionSalesroomVO> getWdAuctionSalesroomList(@RequestBody MemberAuctionSalesroomDTO MemberAuctionSalesroomDTO); } ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IMemberAuctionCollectionService.java
@@ -2,6 +2,10 @@ import com.ruoyi.auction.domain.MemberAuctionCollection; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.core.utils.page.PageDTO; import com.ruoyi.system.api.domain.dto.AuctionCollectionDTO; import com.ruoyi.system.api.domain.vo.AuctionGoodsListVO; import org.springframework.web.bind.annotation.RequestBody; /** * <p> @@ -13,4 +17,8 @@ */ public interface IMemberAuctionCollectionService extends IService<MemberAuctionCollection> { void saveAuctionCollection(AuctionCollectionDTO auctionCollectionDTO); PageDTO<AuctionGoodsListVO> getMemberAuctionCollectionList(@RequestBody AuctionCollectionDTO auctionCollectionDTO); } ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java
@@ -27,10 +27,7 @@ import com.ruoyi.common.core.utils.page.BeanUtils; import com.ruoyi.common.core.utils.page.PageDTO; import com.ruoyi.system.api.domain.AuctionGoods; import com.ruoyi.system.api.domain.dto.AuctionGoodsListDTO; import com.ruoyi.system.api.domain.dto.AuctionGoodsListPageDTO; import com.ruoyi.system.api.domain.dto.OrderDTO; import com.ruoyi.system.api.domain.dto.RefundDTO; import com.ruoyi.system.api.domain.dto.*; import com.ruoyi.system.api.domain.vo.AuctionGoodsListVO; import com.ruoyi.system.api.domain.vo.AuctionGoodsinfoVO; import com.ruoyi.system.api.feignClient.GoodsSkuClient; @@ -412,4 +409,59 @@ } return auctionGoodsinfoVO; } @Override public PageDTO<AuctionGoodsListVO> getWdAuctionSalesList(AuctionGoodsListDTO auctionGoodsListDTO) { MemberAuctionSalesroomDTO memberAuctionSalesroomDTO =new MemberAuctionSalesroomDTO(); memberAuctionSalesroomDTO.setMemberId(auctionGoodsListDTO.getMemberId()); List<OrderAuctionBond> data = orderClient.getAuctionGoodsOrderAuctionBondList(auctionGoodsListDTO, SecurityConstants.INNER).getData(); Set<Long> goodsSkuIdList = null; goodsSkuIdList = data.stream().map(OrderAuctionBond::getAuctionSalesroomId) .collect(Collectors.toSet()); AuctionGoodsListPageDTO auctionGoodsListPageDTO=new AuctionGoodsListPageDTO(); auctionGoodsListPageDTO.setGoodsSkuIdList(goodsSkuIdList); Page<AuctionGoodsListVO> page = new Page<>(); page.setSize(auctionGoodsListDTO.getPageSize()); page.setCurrent(auctionGoodsListDTO.getPageCurr()); List<AuctionGoods> auctionGoodsPgeList = auctionGoodsMapper.getAuctionGoodsPgeList(page, auctionGoodsListPageDTO); List<AuctionGoodsListVO> auctionGoodsVOS=new ArrayList<>(); for (AuctionGoods auctionGoods:auctionGoodsPgeList){ AuctionGoodsListVO auctionGoodsVO=new AuctionGoodsListVO(); auctionGoodsVO.setAuctionStock(auctionGoods.getAuctionStock()); auctionGoodsVO.setGoodsSkuId(auctionGoods.getId()); auctionGoodsVO.setEndTime(auctionGoods.getEndTime()); auctionGoodsVO.setStartTime(auctionGoods.getStartTime()); auctionGoodsVO.setStartingPrice(auctionGoods.getStartingPrice()); auctionGoodsVO.setStartStatus(auctionGoods.getStartStatus()); GoodsSku goodsSkuOne = goodsSkuClient.getGoodsSkuOne(auctionGoods.getGoodsSkuId(), SecurityConstants.INNER).getData(); auctionGoodsVO.setUnit(goodsSkuOne.getUnit()); auctionGoodsVO.setSpec(goodsSkuOne.getSpec()); auctionGoodsVO.setSpecUnit(goodsSkuOne.getSpecUnit()); auctionGoodsVO.setGoodsSkuName(goodsSkuOne.getSkuName()); auctionGoodsVO.setCoverPic(goodsSkuOne.getCoverPic()); LambdaQueryWrapper<AuctionBidRecord> wrapper1= Wrappers.lambdaQuery(); wrapper1.eq(AuctionBidRecord::getMemberId,auctionGoodsListDTO.getMemberId()); wrapper1.eq(AuctionBidRecord::getAuctionType,1); wrapper1.eq(AuctionBidRecord::getTargetId,auctionGoods.getId()); wrapper1.eq(AuctionBidRecord::getDelFlag,0); AuctionBidRecord list1 = auctionBidRecordService.getOne(wrapper1); if (list1!=null){ if (list1.getStatus().getCode()==2){ auctionGoodsVO.setIsStatus(2); }else{ auctionGoodsVO.setIsStatus(1); } }else{ auctionGoodsVO.setIsStatus(1); } auctionGoodsVOS.add(auctionGoodsVO); } page.setRecords(auctionGoodsVOS); return PageDTO.of(page); } } ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
@@ -55,26 +55,23 @@ import com.ruoyi.system.api.domain.Member; import com.ruoyi.system.api.domain.OrderAuctionBond; import com.ruoyi.system.api.domain.SysUser; import com.ruoyi.system.api.domain.dto.AppMiniLoginDTO; import com.ruoyi.system.api.domain.dto.BidDTO; import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomBondDTO; import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomDTO; import com.ruoyi.system.api.domain.dto.*; import com.ruoyi.system.api.domain.vo.PayInfoVO; import com.ruoyi.system.api.domain.vo.WdMemberAuctionSalesroomVO; import com.ruoyi.system.api.feignClient.GoodsSkuClient; import com.ruoyi.system.api.feignClient.MemberClient; import com.ruoyi.system.api.feignClient.OrderClient; import com.ruoyi.system.api.feignClient.SysUserClient; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.*; import java.util.stream.Collectors; import javax.annotation.Resource; import org.apache.http.HttpResponse; import org.apache.http.util.EntityUtils; import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; /** * <p> @@ -639,4 +636,38 @@ // 添加拍卖商品 auctionSalesroomGoodsService.saveBatch(auctionSalesroomGoods); } @Override public PageDTO<WdMemberAuctionSalesroomVO> getWdAuctionSalesroomList(MemberAuctionSalesroomDTO MemberAuctionSalesroomDTO) { MemberAuctionSalesroomDTO memberAuctionSalesroomDTO =new MemberAuctionSalesroomDTO(); memberAuctionSalesroomDTO.setMemberId(MemberAuctionSalesroomDTO.getMemberId()); List<OrderAuctionBond> data = orderClient.getOrderAuctionBondList(memberAuctionSalesroomDTO, SecurityConstants.INNER).getData(); Set<Long> goodsSkuIdList = null; goodsSkuIdList = data.stream().map(OrderAuctionBond::getAuctionSalesroomId) .collect(Collectors.toSet()); Page<WdMemberAuctionSalesroomVO> page = new Page<>(); page.setSize(memberAuctionSalesroomDTO.getPageSize()); page.setCurrent(memberAuctionSalesroomDTO.getPageCurr()); MemberAuctionSalesroomWdDTO memberAuctionSalesroomWdDTO=new MemberAuctionSalesroomWdDTO(); memberAuctionSalesroomWdDTO.setGoodsSkuIdList(goodsSkuIdList); List<AuctionSalesroom> auctionSalesroomList=auctionSalesroomMapper.pageMemberAuctionSalesroomWdList(page,memberAuctionSalesroomWdDTO); List<WdMemberAuctionSalesroomVO> List=new ArrayList<>(); for (AuctionSalesroom auctionSalesroom:auctionSalesroomList){ WdMemberAuctionSalesroomVO memberAuctionSalesroomVO=new WdMemberAuctionSalesroomVO(); memberAuctionSalesroomVO.setSalesroomName(auctionSalesroom.getSalesroomName()); memberAuctionSalesroomVO.setDescription(auctionSalesroom.getDescription()); memberAuctionSalesroomVO.setStatus(auctionSalesroom.getStatus().getCode()); memberAuctionSalesroomVO.setSalesroomId(auctionSalesroom.getId()); memberAuctionSalesroomVO.setCoverPic(auctionSalesroom.getCoverPic()); MemberAuctionSalesroomDTO memberAuctionSalesroomDTO1=new MemberAuctionSalesroomDTO(); memberAuctionSalesroomDTO1.setAuctionSalesroomId(auctionSalesroom.getId()); memberAuctionSalesroomDTO1.setMemberId(MemberAuctionSalesroomDTO.getMemberId()); List<OrderAuctionBond> data1 = orderClient.getOrderAuctionBondList(memberAuctionSalesroomDTO1, SecurityConstants.INNER).getData(); memberAuctionSalesroomVO.setBondTime(data1.get(0).getCreateTime()); List.add(memberAuctionSalesroomVO); } page.setRecords(List); return PageDTO.of(page); } } ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/MemberAuctionCollectionServiceImpl.java
@@ -1,12 +1,30 @@ package com.ruoyi.auction.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.auction.domain.MemberAuctionCollection; import com.ruoyi.auction.mapper.MemberAuctionCollectionMapper; import com.ruoyi.auction.service.IAuctionGoodsService; import com.ruoyi.auction.service.IMemberAuctionCollectionService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.constant.SecurityConstants; import com.ruoyi.common.core.exception.ServiceException; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.utils.page.PageDTO; import com.ruoyi.system.api.domain.AuctionGoods; import com.ruoyi.system.api.domain.GoodsSku; import com.ruoyi.system.api.domain.dto.AuctionCollectionDTO; import com.ruoyi.system.api.domain.dto.AuctionGoodsListPageDTO; import com.ruoyi.system.api.domain.vo.AuctionGoodsListVO; import com.ruoyi.system.api.feignClient.GoodsSkuClient; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; import java.util.Set; import java.util.stream.Collectors; /** * <p> @@ -19,4 +37,85 @@ @Service public class MemberAuctionCollectionServiceImpl extends ServiceImpl<MemberAuctionCollectionMapper, MemberAuctionCollection> implements IMemberAuctionCollectionService { @Resource private IMemberAuctionCollectionService memberAuctionCollectionService; @Resource private GoodsSkuClient goodsSkuClient; @Resource private IAuctionGoodsService auctionGoodsService; @Override public void saveAuctionCollection(AuctionCollectionDTO auctionCollectionDTO) { if (auctionCollectionDTO.getMemberId()!=null) { throw new ServiceException("用户ID不能为空"); } if (auctionCollectionDTO.getState()!=null) { throw new ServiceException("类型不能为空"); } LambdaQueryWrapper< MemberAuctionCollection> wrapper= Wrappers.lambdaQuery(); wrapper.eq(MemberAuctionCollection::getMemberId,auctionCollectionDTO.getMemberId()); wrapper.eq(MemberAuctionCollection::getTargetId,auctionCollectionDTO.getGoodsSkuId()); if (auctionCollectionDTO.getState()==1){ List<MemberAuctionCollection> list = memberAuctionCollectionService.list(wrapper); if (list.size()==0){ MemberAuctionCollection m =new MemberAuctionCollection(); m.setMemberId(auctionCollectionDTO.getMemberId()); m.setTargetId(auctionCollectionDTO.getGoodsSkuId()); memberAuctionCollectionService.save(m); } }else{ List<MemberAuctionCollection> list = memberAuctionCollectionService.list(wrapper); if (list.size()>0){ for (MemberAuctionCollection memberArticleCollection:list){ memberAuctionCollectionService.removeById(memberArticleCollection); } } } } @Override public PageDTO<AuctionGoodsListVO> getMemberAuctionCollectionList(AuctionCollectionDTO auctionCollectionDTO) { Set<Long> goodsSkuIdList = null; if (StringUtils.isNotEmpty(auctionCollectionDTO.getGoodsSkuName())) { List<GoodsSku> goodsSku = goodsSkuClient.getGoodsByName(auctionCollectionDTO.getGoodsSkuName(), SecurityConstants.INNER) .getData(); goodsSkuIdList = goodsSku.stream().map(GoodsSku::getId) .collect(Collectors.toSet()); } AuctionGoodsListPageDTO auctionGoodsListPageDTO=new AuctionGoodsListPageDTO(); auctionGoodsListPageDTO.setGoodsSkuIdList(goodsSkuIdList); Page<AuctionGoodsListVO> page = new Page<>(); page.setSize(auctionCollectionDTO.getPageSize()); page.setCurrent(auctionCollectionDTO.getPageCurr()); LambdaQueryWrapper< MemberAuctionCollection> wrapper= Wrappers.lambdaQuery(); wrapper.in( MemberAuctionCollection::getTargetId, goodsSkuIdList); List<MemberAuctionCollection> list = memberAuctionCollectionService.list(wrapper); List<AuctionGoodsListVO> auctionGoodsVOS=new ArrayList<>(); for (MemberAuctionCollection auctionCollection:list){ AuctionGoods auctionGoods= auctionGoodsService.getById(auctionCollection.getId()); AuctionGoodsListVO auctionGoodsVO=new AuctionGoodsListVO(); auctionGoodsVO.setAuctionStock(auctionGoods.getAuctionStock()); auctionGoodsVO.setGoodsSkuId(auctionGoods.getId()); auctionGoodsVO.setEndTime(auctionGoods.getEndTime()); auctionGoodsVO.setStartTime(auctionGoods.getStartTime()); auctionGoodsVO.setStartingPrice(auctionGoods.getStartingPrice()); auctionGoodsVO.setStartStatus(auctionGoods.getStartStatus()); GoodsSku goodsSkuOne = goodsSkuClient.getGoodsSkuOne(auctionGoods.getGoodsSkuId(), SecurityConstants.INNER).getData(); auctionGoodsVO.setUnit(goodsSkuOne.getUnit()); auctionGoodsVO.setSpec(goodsSkuOne.getSpec()); auctionGoodsVO.setSpecUnit(goodsSkuOne.getSpecUnit()); auctionGoodsVO.setGoodsSkuName(goodsSkuOne.getSkuName()); auctionGoodsVO.setCoverPic(goodsSkuOne.getCoverPic()); auctionGoodsVOS.add(auctionGoodsVO); } page.setRecords(auctionGoodsVOS); return PageDTO.of(page); } } ruoyi-modules/ruoyi-auction/src/main/resources/mapper/auction/AuctionSalesroomMapper.xml
@@ -15,4 +15,21 @@ WHEN status = 2 THEN 3 END,status </select> <select id="pageMemberAuctionSalesroomWdList" resultType="com.ruoyi.system.api.domain.AuctionSalesroom"> SELECT * FROM t_auction_salesroom ta WHERE ta.del_flag = 0 <if test="param.goodsSkuIdList != null and param.goodsSkuIdList.size()>0"> OR ta.goods_sku_id IN <foreach collection="param.goodsSkuIdList" item="item" open="(" separator="," close=")"> #{item} </foreach> </if> ORDER BY CASE WHEN status = 0 THEN 2 WHEN status = 1 THEN 1 WHEN status = 2 THEN 3 END,status </select> </mapper>