From 31267d9b3a33c8b3fbb1b9f810ab08e01c49b846 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期二, 16 七月 2024 19:12:28 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java | 137 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 104 insertions(+), 33 deletions(-)
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java
index cbd7b2a..8b60268 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java
@@ -33,6 +33,7 @@
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.page.BeanUtils;
import com.ruoyi.common.core.utils.page.PageDTO;
+import com.ruoyi.system.api.constants.ConfigEnum;
import com.ruoyi.system.api.constants.NotificationTypeConstant;
import com.ruoyi.system.api.domain.AuctionGoods;
import com.ruoyi.system.api.domain.CustomConfig;
@@ -45,6 +46,7 @@
import com.ruoyi.system.api.domain.MemberAddress;
import com.ruoyi.system.api.domain.Order;
import com.ruoyi.system.api.domain.OrderAuctionBond;
+import com.ruoyi.system.api.domain.WebsocketMessageDTO;
import com.ruoyi.system.api.domain.dto.AuctionGoodsListDTO;
import com.ruoyi.system.api.domain.dto.AuctionGoodsListPageDTO;
import com.ruoyi.system.api.domain.dto.GoodsStockUpdDTO;
@@ -54,15 +56,19 @@
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;
import com.ruoyi.system.api.feignClient.OrderClient;
import com.ruoyi.system.api.feignClient.SysUserClient;
-import com.ruoyi.system.api.util.WebSocketUsers;
import io.seata.spring.annotation.GlobalTransactional;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -141,6 +147,7 @@
query.getListingStatus())
.eq(StringUtils.isNotNull(query.getStartStatus()), AuctionGoods::getStartStatus,
query.getStartStatus())
+ .orderByDesc(AuctionGoods::getCreateTime)
.page(new Page<>(query.getPageCurr(), query.getPageSize()));
if (StringUtils.isEmpty(page.getRecords())) {
return PageDTO.empty(page);
@@ -213,6 +220,15 @@
if (goodsSku.getStock() + auctionGoodsOrg.getAuctionStock() < dto.getAuctionStock()) {
throw new ServiceException("商品库存不足");
}
+ if (!auctionGoodsOrg.getAuctionStock().equals(dto.getAuctionStock())) {
+ // 更新商品库存
+ GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
+ goodsStockUpdDTO.setGoodsSkuId(goodsSkuId);
+ goodsStockUpdDTO.setAuctionStock(
+ auctionGoodsOrg.getAuctionStock() - dto.getAuctionStock());
+ goodsSkuClient.updGoodsStock(Lists.newArrayList(goodsStockUpdDTO),
+ SecurityConstants.INNER);
+ }
auctionGoodsOrg.setStartingPrice(dto.getStartingPrice());
auctionGoodsOrg.setMinimumMarkupAmount(dto.getMinimumMarkupAmount());
auctionGoodsOrg.setStartTime(dto.getStartTime());
@@ -224,15 +240,8 @@
auctionGoodsOrg.setShareTitle(dto.getShareTitle());
auctionGoodsOrg.setSharePic(dto.getSharePic());
this.updateById(auctionGoodsOrg);
- // 更新商品库存
- GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
- goodsStockUpdDTO.setGoodsSkuId(goodsSkuId);
- goodsStockUpdDTO.setAuctionStock(
- auctionGoodsOrg.getAuctionStock() - dto.getAuctionStock());
- goodsSkuClient.updGoodsStock(Lists.newArrayList(goodsStockUpdDTO),
- SecurityConstants.INNER);
- auctionAsyncMethodService.auctionGoodsScheduleTask(Lists.newArrayList(auctionGoods));
}
+ auctionAsyncMethodService.auctionGoodsScheduleTask(Lists.newArrayList(auctionGoods));
}
/**
@@ -265,13 +274,17 @@
.collect(Collectors.toSet());
List<Member> memberList = memberClient.
getMemberListByIds(collect, SecurityConstants.INNER).getData();
- Map<Long, String> memberMap = memberList.stream()
- .collect(Collectors.toMap(Member::getId, Member::getNickname));
+ Map<Long, Member> memberMap = memberList.stream()
+ .collect(Collectors.toMap(Member::getId, e -> e));
List<MgtAuctionBidRecordVO> mgtAuctionBidRecordVOS = BeanUtils.copyList(list,
MgtAuctionBidRecordVO.class);
for (MgtAuctionBidRecordVO vo : mgtAuctionBidRecordVOS) {
- String memberName = memberMap.get(vo.getMemberId());
- vo.setMemberName(StringUtils.isNotEmpty(memberName) ? memberName : "");
+ Member member = memberMap.get(vo.getMemberId());
+ if (StringUtils.isNotNull(member)) {
+ vo.setMemberName(member.getNickname());
+ vo.setPhone(member.getPhone());
+ }
+
}
auctionGoodsVO.setRecordList(mgtAuctionBidRecordVOS);
}
@@ -293,6 +306,10 @@
if (StringUtils.isNull(auctionGoods)) {
throw new ServiceException("拍卖商品不存在");
}
+ // 远程调用商品服务，获取商品信息
+ GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(auctionGoods.getGoodsSkuId(),
+ SecurityConstants.INNER)
+ .getData();
if (auctionGoods.getStartStatus().equals(AuctionStartStatusEnum.IN_AUCTION)) {
// 查询出价记录
List<AuctionBidRecord> auctionBidRecords = auctionBidRecordService.getBidRecordByGoodsId(
@@ -305,15 +322,25 @@
auctionBidRecordService.updateById(auctionBidRecord);
memberId = auctionBidRecord.getMemberId();
// 创建待支付订单
+ CustomConfig moneyConfig = sysUserClient.getconfig(
+ ConfigEnum.MEMBER_POINTS_MONEY.getKey()).getData();
+ CustomConfig pointsConfig = sysUserClient.getconfig(
+ ConfigEnum.MEMBER_POINTS_POINTS.getKey()).getData();
+ double ratio =
+ Double.parseDouble(
+ pointsConfig.getConfigValue()) / Double.parseDouble(
+ moneyConfig.getConfigValue());
OrderDTO orderDTO = new OrderDTO();
orderDTO.setAuctionType(AuctionOrderTypeEnum.REGULAR_ITEMS);
orderDTO.setGoodsQuantity(auctionGoods.getAuctionStock());
- orderDTO.setGoodsSkuId(auctionGoods.getGoodsSkuId());
+ orderDTO.setGoodsSkuId(auctionGoods.getId());
orderDTO.setBound(auctionGoods.getBond());
orderDTO.setMemberId(auctionBidRecord.getMemberId());
orderDTO.setTotalAmount(auctionBidRecord.getLastBidAmount());
orderDTO.setOrderFrom(OrderFromEnum.AUCTION_ORDERS);
orderDTO.setOrderTime(LocalDateTime.now());
+ orderDTO.setPoints(auctionBidRecord.getLastBidAmount()
+ .multiply(BigDecimal.valueOf(ratio)).intValue());
MemberAddress data = memberClient.getMemberAddressOne(
auctionBidRecord.getMemberId(), SecurityConstants.INNER).getData();
if (StringUtils.isNotNull(data)) {
@@ -321,6 +348,11 @@
orderDTO.setReceiverCity(data.getReceiverCity());
orderDTO.setReceiverDetailAddress(data.getDetailedAddress());
orderDTO.setReceiverphone(data.getRecipientPhone());
+ }
+ if (StringUtils.isNotNull(goodsSku)) {
+ orderDTO.setCoverPic(goodsSku.getCoverPic());
+ orderDTO.setPrice(goodsSku.getPrice());
+ orderDTO.setSkuName(goodsSku.getSkuName());
}
orderClient.saveOrderOne(orderDTO, SecurityConstants.INNER);
} else {
@@ -434,18 +466,27 @@
auctionGoodsinfoVO.setUnit(goodsSkuOne.getUnit());
auctionGoodsinfoVO.setBond(byId.getBond());
auctionGoodsinfoVO.setDescription(goodsSkuOne.getDescription());
+ auctionGoodsinfoVO.setExplain(byId.getDescription());
auctionGoodsinfoVO.setYears(goodsSkuOne.getYears());
GoodsBrand data = goodsSkuClient.getBrandOne(goodsSkuOne.getBrandId(), SecurityConstants.INNER).getData();
GoodsCategory data1 = goodsSkuClient.getCategoryOne(goodsSkuOne.getCategoryId(), SecurityConstants.INNER).getData();
GoodsSeries data2 = goodsSkuClient.getSeriesOne(goodsSkuOne.getSeriesId(), SecurityConstants.INNER).getData();
GoodsFlavorType data3 = goodsSkuClient.getFlavorTypeOne(goodsSkuOne.getFlavorTypeId(), SecurityConstants.INNER).getData();
- auctionGoodsinfoVO.setBrand(data.getBrandName());
- auctionGoodsinfoVO.setCategory(data1.getCategoryName());
+ if (data!=null){
+ auctionGoodsinfoVO.setBrand(data.getBrandName());
+ }
+ if (data1!=null){
+ auctionGoodsinfoVO.setCategory(data1.getCategoryName());
+ }
+ if (data2!=null){
auctionGoodsinfoVO.setSeries(data2.getSeriesName());
- auctionGoodsinfoVO.setFlavorType(data3.getFlavorTypeName());
+ }
+ if (data3!=null) {
+ auctionGoodsinfoVO.setFlavorType(data3.getFlavorTypeName());
+ }
auctionGoodsinfoVO.setCoverPic(goodsSkuOne.getCoverPic());
auctionGoodsinfoVO.setAlbum(goodsSkuOne.getAlbum());
- auctionGoodsinfoVO.setAuthentication(byId.getAuthentication());
+ auctionGoodsinfoVO.setAuthentication(byId.getAuthentication().getCode());
auctionGoodsinfoVO.setMinimumMarkupAmount(byId.getMinimumMarkupAmount());
auctionGoodsinfoVO.setSpec(goodsSkuOne.getSpec());
auctionGoodsinfoVO.setSpecUnit(goodsSkuOne.getSpecUnit());
@@ -454,12 +495,12 @@
auctionGoodsinfoVO.setDetail(goodsSkuOne.getDetail());
auctionGoodsinfoVO.setBond(byId.getBond());
auctionGoodsinfoVO.setYears(goodsSkuOne.getYears());
- auctionGoodsinfoVO.setSharePic(goodsSkuOne.getSharePic());
- auctionGoodsinfoVO.setShareTitle(goodsSkuOne.getShareTitle());
+ auctionGoodsinfoVO.setSharePic(byId.getSharePic());
+ auctionGoodsinfoVO.setShareTitle(byId.getShareTitle());
LambdaQueryWrapper<AuctionBidRecord> wrapper1= Wrappers.lambdaQuery();
- wrapper1.eq(AuctionBidRecord::getMemberId,auctionGoodsListDTO.getMemberId());
wrapper1.eq(AuctionBidRecord::getAuctionType,1);
wrapper1.eq(AuctionBidRecord::getTargetId,byId.getId());
+ wrapper1.eq(AuctionBidRecord::getMemberId,auctionGoodsListDTO.getMemberId());
wrapper1.eq(AuctionBidRecord::getDelFlag,0);
AuctionBidRecord list1 = auctionBidRecordService.getOne(wrapper1);
if (list1!=null){
@@ -506,6 +547,7 @@
LambdaQueryWrapper<AuctionBrowseRecord> wrapper3=Wrappers.lambdaQuery();
wrapper3.eq(AuctionBrowseRecord::getDelFlag,0);
wrapper3.eq(AuctionBrowseRecord::getTargetId,auctionGoodsListDTO.getGoodsSkuId());
+ wrapper3.eq(AuctionBrowseRecord::getBrowseType,AuctionOrderTypeEnum.REGULAR_ITEMS);
wrapper3.eq(AuctionBrowseRecord::getMemberId,auctionGoodsListDTO.getMemberId());
wrapper3.ge(AuctionBrowseRecord::getCreateTime, newTime7)
.le(AuctionBrowseRecord::getCreateTime, now);
@@ -518,9 +560,32 @@
iAuctionBrowseRecordService.save(auctionBrowseRecord);
}
+ LambdaQueryWrapper<AuctionBidRecord> wrapper5= Wrappers.lambdaQuery();
+ wrapper5.eq(AuctionBidRecord::getAuctionType,1);
+ wrapper5.eq(AuctionBidRecord::getTargetId,byId.getId());
+ wrapper5.eq(AuctionBidRecord::getMemberId,auctionGoodsListDTO.getMemberId());
+ wrapper5.eq(AuctionBidRecord::getDelFlag,0);
+ AuctionBidRecord list5 = auctionBidRecordService.getOne(wrapper5);
+ if (list5!=null){
+ auctionGoodsinfoVO.setZgBid(list5.getLastBidAmount());
+ }
- CustomConfig returnAddressUserName = sysUserClient.getconfig("MALL_ORDER_DESCRIPTION").getData();
- auctionGoodsinfoVO.setExplain(returnAddressUserName.getConfigValue());
+
+ /*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;
}
@@ -530,8 +595,8 @@
memberAuctionSalesroomDTO.setMemberId(auctionGoodsListDTO.getMemberId());
List<OrderAuctionBond> data = orderClient.getAuctionGoodsOrderAuctionBondList(auctionGoodsListDTO, SecurityConstants.INNER).getData();
Set<Long> goodsSkuIdList = null;
- if (data!=null){
- goodsSkuIdList = data.stream().map(OrderAuctionBond::getAuctionSalesroomId)
+ if (data.size()>0){
+ goodsSkuIdList = data.stream().map(OrderAuctionBond::getAuctionGoodsId)
.collect(Collectors.toSet());
}else {
Set<Long> goodsSkuIdList1 =new HashSet<>();
@@ -545,7 +610,12 @@
}
if (auctionGoodsListDTO.getStartStatus()!=4){
- auctionGoodsListPageDTO.setStartStatus(auctionGoodsListDTO.getStartStatus());
+ if (auctionGoodsListDTO.getStartStatus()==0){
+ auctionGoodsListPageDTO.setStartStatus(5);
+ }else{
+ auctionGoodsListPageDTO.setStartStatus(auctionGoodsListDTO.getStartStatus());
+ }
+
}
Page<AuctionGoodsListVO> page = new Page<>();
@@ -597,9 +667,8 @@
if (StringUtils.isNotNull(auctionGoods) && auctionGoods.getListingStatus().equals(
ListingStatusEnum.ON_SHELVES) && auctionGoods.getStartStatus()
.equals(AuctionStartStatusEnum.IN_AUCTION)) {
- this.lambdaUpdate().set(AuctionGoods::getStartStatus, AuctionStartStatusEnum.ENDED)
- .eq(AuctionGoods::getId, id);
- // TODO 退保证金
+ auctionGoods.setStartStatus(AuctionStartStatusEnum.ENDED);
+ this.updateById(auctionGoods);
orderClient.returnBondByAuctionGoodsId(id, SecurityConstants.INNER);
Map<String, Object> map = new ConcurrentHashMap<>();
@@ -608,7 +677,8 @@
map.put("target_id", id);
map.put("message_type", "end");
String msg = objectMapper.writeValueAsString(map);
- WebSocketUsers.sendMessageToUsersByType(ClientTypeEnum.MEMBER.getCode(), msg);
+ sysUserClient.pushByClientType(WebsocketMessageDTO.builder().message(msg)
+ .clientType(ClientTypeEnum.MEMBER).build(), SecurityConstants.INNER);
log.info("===================>发送websocket通知，消息体{}", msg);
}
}
@@ -619,15 +689,16 @@
if (StringUtils.isNotNull(auctionGoods) && auctionGoods.getListingStatus().equals(
ListingStatusEnum.ON_SHELVES) && auctionGoods.getStartStatus()
.equals(AuctionStartStatusEnum.IN_PREVIEW)) {
- this.lambdaUpdate().set(AuctionGoods::getStartStatus, AuctionStartStatusEnum.IN_AUCTION)
- .eq(AuctionGoods::getId, id);
+ auctionGoods.setStartStatus(AuctionStartStatusEnum.IN_AUCTION);
+ this.updateById(auctionGoods);
Map<String, Object> map = new ConcurrentHashMap<>();
map.put("notification_type", NotificationTypeConstant.AUCTION_GOODS);
map.put("notification_time", DateUtils.dateTimeNow("yyyy-MM-dd HH:mm:ss"));
map.put("target_id", id);
map.put("message_type", "start");
String msg = objectMapper.writeValueAsString(map);
- WebSocketUsers.sendMessageToUsersByType(ClientTypeEnum.MEMBER.getCode(), msg);
+ sysUserClient.pushByClientType(WebsocketMessageDTO.builder().message(msg)
+ .clientType(ClientTypeEnum.MEMBER).build(), SecurityConstants.INNER);
log.info("===================>发送websocket通知，消息体{}", msg);
}
}
--
Gitblit v1.7.1