ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsinfoVO.java
@@ -10,6 +10,8 @@ import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; @Data public class AuctionGoodsinfoVO { @@ -150,4 +152,7 @@ @ApiModelProperty(value = "保证金") private BigDecimal bond; @ApiModelProperty(value = "商品信息") List<getHomeGoodsSkuXxiVO> xxiVOS; } ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionSalesroomGoodsInfoVO.java
@@ -7,6 +7,7 @@ import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; @Data public class AuctionSalesroomGoodsInfoVO { @@ -138,5 +139,8 @@ @JsonInclude(JsonInclude.Include.ALWAYS) private String explain; @ApiModelProperty(value = "商品信息") List<getHomeGoodsSkuXxiVO> xxiVOS; } ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/GoodsInfoTitleValueVO.java
File was renamed from ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/vo/GoodsInfoTitleValueVO.java @@ -1,4 +1,4 @@ package com.ruoyi.goods.controller.management.vo; package com.ruoyi.system.api.domain.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/GoodsSkuFactory.java
@@ -3,6 +3,7 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.system.api.domain.*; import com.ruoyi.system.api.domain.dto.GoodsStockUpdDTO; import com.ruoyi.system.api.domain.vo.GoodsInfoTitleValueVO; import com.ruoyi.system.api.feignClient.GoodsSkuClient; import java.util.Collection; import java.util.List; @@ -26,6 +27,11 @@ } @Override public R<List<GoodsInfoTitleValueVO>> getlistByGoodsId(Long goodsSkuId, String source) { return R.fail("获取项目信息失败" + cause.getMessage()); } @Override public R<GoodsCategory> getCategoryOne(Long categoryId, String source) { return R.fail("通过id查询商品分类i失败:" + cause.getMessage()); } ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/GoodsSkuClient.java
@@ -5,6 +5,7 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.system.api.domain.*; import com.ruoyi.system.api.domain.dto.GoodsStockUpdDTO; import com.ruoyi.system.api.domain.vo.GoodsInfoTitleValueVO; import com.ruoyi.system.api.factory.GoodsSkuFactory; import java.util.Collection; import java.util.List; @@ -26,6 +27,10 @@ R<GoodsSku> getGoodsSkuOne(@RequestBody Long goodsSkuId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); @PostMapping("/goods-info-title-value/getlistByGoodsId") R<List<GoodsInfoTitleValueVO>> getlistByGoodsId(@RequestBody Long goodsSkuId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); @PostMapping("/goods-category/getCategoryOne") R<GoodsCategory> getCategoryOne(@RequestBody Long categoryId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java
@@ -56,6 +56,8 @@ import com.ruoyi.system.api.domain.dto.RefundDTO; import com.ruoyi.system.api.domain.vo.AuctionGoodsListVO; import com.ruoyi.system.api.domain.vo.AuctionGoodsinfoVO; import com.ruoyi.system.api.domain.vo.GoodsInfoTitleValueVO; import com.ruoyi.system.api.domain.vo.getHomeGoodsSkuXxiVO; import com.ruoyi.system.api.feignClient.AuctionClient; import com.ruoyi.system.api.feignClient.GoodsSkuClient; import com.ruoyi.system.api.feignClient.MemberClient; @@ -64,12 +66,7 @@ import io.seata.spring.annotation.GlobalTransactional; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Set; import java.util.*; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; import javax.annotation.Resource; @@ -552,6 +549,19 @@ CustomConfig returnAddressUserName = sysUserClient.getconfig("MALL_ORDER_DESCRIPTION").getData(); auctionGoodsinfoVO.setExplain(returnAddressUserName.getConfigValue()); List<getHomeGoodsSkuXxiVO> homeGoodsSkuXxiVOS=new ArrayList<>(); List<GoodsInfoTitleValueVO> goodsInfoTitleValueVOList = goodsSkuClient.getlistByGoodsId(goodsSkuOne.getId(), SecurityConstants.INNER).getData(); Collections.sort(goodsInfoTitleValueVOList, Comparator.comparingInt(GoodsInfoTitleValueVO::getSortNum)); for (GoodsInfoTitleValueVO goodsInfoTitleValueVO:goodsInfoTitleValueVOList){ getHomeGoodsSkuXxiVO getHomeGoodsSkuXxiVOs=new getHomeGoodsSkuXxiVO(); getHomeGoodsSkuXxiVOs.setContent(goodsInfoTitleValueVO.getContent()); getHomeGoodsSkuXxiVOs.setTitleName(goodsInfoTitleValueVO.getTitleName()); homeGoodsSkuXxiVOS.add(getHomeGoodsSkuXxiVOs); } auctionGoodsinfoVO.setXxiVOS(homeGoodsSkuXxiVOS); return auctionGoodsinfoVO; }
@@ -279,6 +279,8 @@ auctionSalesroomVO.setElseAuctionSalesroomGoods(auctionSalesroomGoodsVOS); return auctionSalesroomVO; } @@ -593,15 +595,16 @@ if (list2!=null){ AuctionSalesroomGoodsInfoVO.setZgBid(list2.getLastBidAmount()); } /* List<GoodsInfoTitleValueVO> goodsInfoTitleValueVOList = goodsInfoTitleValueService.listByGoodsId(homeGoodsSkuDTO.getGoodsSkuId()); List<getHomeGoodsSkuXxiVO> homeGoodsSkuXxiVOS=new ArrayList<>(); List<GoodsInfoTitleValueVO> goodsInfoTitleValueVOList = goodsSkuClient.getlistByGoodsId(goodsSku.getId(), SecurityConstants.INNER).getData(); Collections.sort(goodsInfoTitleValueVOList, Comparator.comparingInt(GoodsInfoTitleValueVO::getSortNum)); for (GoodsInfoTitleValueVO goodsInfoTitleValueVO:goodsInfoTitleValueVOList){ getHomeGoodsSkuXxiVO getHomeGoodsSkuXxiVOs=new getHomeGoodsSkuXxiVO(); getHomeGoodsSkuXxiVOs.setContent(goodsInfoTitleValueVO.getContent()); getHomeGoodsSkuXxiVOs.setTitleName(goodsInfoTitleValueVO.getTitleName()); homeGoodsSkuXxiVOS.add(getHomeGoodsSkuXxiVOs); }*/ } AuctionSalesroomGoodsInfoVO.setXxiVOS(homeGoodsSkuXxiVOS); return AuctionSalesroomGoodsInfoVO; } ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsInfoTitleValueController.java
@@ -1,8 +1,15 @@ package com.ruoyi.goods.controller.inner; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.security.annotation.InnerAuth; import com.ruoyi.goods.mapper.GoodsInfoTitleValueMapper; import com.ruoyi.system.api.domain.GoodsSku; import com.ruoyi.system.api.domain.vo.GoodsInfoTitleValueVO; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.List; /** * <p> @@ -16,4 +23,14 @@ @RequestMapping("/goods-info-title-value") public class GoodsInfoTitleValueController { @Resource private GoodsInfoTitleValueMapper goodsInfoTitleValueMapper; @InnerAuth @PostMapping("/getlistByGoodsId") @ResponseBody public R<List<GoodsInfoTitleValueVO>> getlistByGoodsId(@RequestBody Long goodsSkuId) { return R.ok(goodsInfoTitleValueMapper.listByGoodsId(goodsSkuId)); } } ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/vo/GoodsSkuVO.java
@@ -9,7 +9,7 @@ import java.time.LocalDateTime; import java.util.List; import lombok.Data; import com.ruoyi.goods.controller.management.vo.GoodsInfoTitleValueVO; import com.ruoyi.system.api.domain.vo.GoodsInfoTitleValueVO; /** * @author mitao * @date 2024/5/20 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/GoodsInfoTitleValueMapper.java
@@ -1,7 +1,7 @@ package com.ruoyi.goods.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.goods.controller.management.vo.GoodsInfoTitleValueVO; import com.ruoyi.system.api.domain.vo.GoodsInfoTitleValueVO; import com.ruoyi.goods.domain.GoodsInfoTitleValue; import java.util.List; import org.apache.ibatis.annotations.Param; ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/IGoodsInfoTitleValueService.java
@@ -1,7 +1,7 @@ package com.ruoyi.goods.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.goods.controller.management.vo.GoodsInfoTitleValueVO; import com.ruoyi.system.api.domain.vo.GoodsInfoTitleValueVO; import com.ruoyi.goods.domain.GoodsInfoTitleValue; import java.util.List;
@@ -1,7 +1,7 @@ package com.ruoyi.goods.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.goods.controller.management.vo.GoodsInfoTitleValueVO; import com.ruoyi.system.api.domain.vo.GoodsInfoTitleValueVO; import com.ruoyi.goods.domain.GoodsInfoTitleValue; import com.ruoyi.goods.mapper.GoodsInfoTitleValueMapper; import com.ruoyi.goods.service.IGoodsInfoTitleValueService; ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java
@@ -7,7 +7,6 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.ruoyi.common.core.constant.SecurityConstants; import com.ruoyi.common.core.enums.AuctionOrderTypeEnum; import com.ruoyi.common.core.enums.ListingStatusEnum; import com.ruoyi.common.core.exception.ServiceException; import com.ruoyi.common.core.utils.StringUtils; @@ -18,7 +17,7 @@ import com.ruoyi.goods.controller.management.dto.GoodsInfoTitleValueDTO; import com.ruoyi.goods.controller.management.dto.GoodsSkuDTO; import com.ruoyi.goods.controller.management.dto.GoodsSkuQuery; import com.ruoyi.goods.controller.management.vo.GoodsInfoTitleValueVO; import com.ruoyi.system.api.domain.vo.GoodsInfoTitleValueVO; import com.ruoyi.goods.controller.management.vo.GoodsSkuVO; import com.ruoyi.goods.domain.GoodsBrowseRecord; import com.ruoyi.goods.domain.GoodsInfoTitleValue; ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsInfoTitleValueMapper.xml
@@ -3,7 +3,7 @@ <mapper namespace="com.ruoyi.goods.mapper.GoodsInfoTitleValueMapper"> <select id="listByGoodsId" resultType="com.ruoyi.goods.controller.management.vo.GoodsInfoTitleValueVO" resultType="com.ruoyi.system.api.domain.vo.GoodsInfoTitleValueVO" parameterType="java.lang.Long"> SELECT titv.goods_info_title_id, titv.content,
