From 353ec2376201dbfaac3477262deb40bf35ad3154 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 19 七月 2024 14:06:23 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java | 9 +
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/GoodsSkuClient.java | 4
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java | 17 ++
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java | 29 +++--
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderAuctionBondServiceImpl.java | 5
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsInfoTitleValueController.java | 8 +
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/OrderReturnDTO.java | 2
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java | 55 +++++++---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 56 +++++++---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java | 5
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/WdMemberAuctionSalesroomVO.java | 5 +
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberOrderListVO.java | 32 ++++++
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/mapper/AuctionSalesroomMapper.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsinfoVO.java | 1
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBrowseRecordServiceImpl.java | 15 +-
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderReturnRequestServiceImpl.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AuctionGoodsListDTO.java | 3
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/GoodsInfoTitleValueMapper.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/GoodsSkuFactory.java | 5 +
19 files changed, 190 insertions(+), 67 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AuctionGoodsListDTO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AuctionGoodsListDTO.java
index 245893f..69a3cfe 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AuctionGoodsListDTO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AuctionGoodsListDTO.java
@@ -20,4 +20,7 @@
@ApiModelProperty(value = "拍卖状态 0=预展中 1=拍卖中 2=已结束 4=全部")
private Integer startStatus;
+ @ApiModelProperty(value = "拍卖场名称")
+ private String salesroomName;
+
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/OrderReturnDTO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/OrderReturnDTO.java
index 076da58..bd66e6a 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/OrderReturnDTO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/OrderReturnDTO.java
@@ -21,7 +21,7 @@
private Long orderId;
@ApiModelProperty(value = "售后类型 1=退款 2=退款退货")
- private RequestTypeEnum requestType;
+ private Integer requestType;
@ApiModelProperty(value = "申请原因")
private String requestReason;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsinfoVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsinfoVO.java
index 75a14d1..57cd462 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsinfoVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsinfoVO.java
@@ -155,4 +155,5 @@
@ApiModelProperty(value = "商品信息")
List<getHomeGoodsSkuXxiVO> xxiVOS;
+
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberOrderListVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberOrderListVO.java
index a83ceaf..59d3f43 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberOrderListVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberOrderListVO.java
@@ -1,5 +1,6 @@
package com.ruoyi.system.api.domain.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.ruoyi.common.core.enums.OrderFromEnum;
import com.ruoyi.common.core.enums.OrderStatusEnum;
@@ -85,4 +86,35 @@
private String logisticsNum;
+ @ApiModelProperty(value = "收货人姓名")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private String receiverName;
+
+ @ApiModelProperty(value = "收货人电话")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private String receiverPhone;
+
+ @ApiModelProperty(value = "城市")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private String receiverCity;
+
+
+ @ApiModelProperty(value = "详细地址")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private String receiverDetailAddress;
+
+ @ApiModelProperty(value = "订单说明")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private String orderShuoMin;
+
+ @ApiModelProperty(value = "订单退货周期")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private Integer orderZq;
+
+ @ApiModelProperty(value = "确认收货时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private LocalDateTime receiveTime;
+
+
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/WdMemberAuctionSalesroomVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/WdMemberAuctionSalesroomVO.java
index 226e206..66201d5 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/WdMemberAuctionSalesroomVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/WdMemberAuctionSalesroomVO.java
@@ -11,6 +11,11 @@
import java.time.LocalDateTime;
@Data
public class WdMemberAuctionSalesroomVO {
+
+ @ApiModelProperty(value = "拍卖场id")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private Long id;
+
@ApiModelProperty(value = "拍卖场id")
@JsonInclude(JsonInclude.Include.ALWAYS)
private Long SalesroomId;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/GoodsSkuFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/GoodsSkuFactory.java
index 9dc6907..fc0c516 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/GoodsSkuFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/GoodsSkuFactory.java
@@ -32,6 +32,11 @@
}
@Override
+ public R<List<GoodsInfoTitleValueVO>> getlistByGoodsId1(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());
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/GoodsSkuClient.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/GoodsSkuClient.java
index 98efff1..451a38a 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/GoodsSkuClient.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/GoodsSkuClient.java
@@ -31,6 +31,10 @@
R<List<GoodsInfoTitleValueVO>> getlistByGoodsId(@RequestBody Long goodsSkuId,
@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+ @PostMapping("/goods-info-title-value/getlistByGoodsId1")
+ R<List<GoodsInfoTitleValueVO>> getlistByGoodsId1(@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);
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java
index 11d8c8e..67b677e 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java
@@ -93,9 +93,6 @@
return R.ok(iAuctionSalesroomService.isMiniLogin(appMiniLoginDto));
}
-
-
-
@PostMapping("/getMemberAuctionSalesroomList")
@ApiOperation(value = "用户端-拍卖场信息列表")
public R<PageDTO<MemberAuctionSalesroomVO>> getMemberAuctionSalesroomList(@RequestBody MemberAuctionSalesroomDTO MemberAuctionSalesroomDTO) {
@@ -119,7 +116,7 @@
public R<PayInfoVO> SaveSignUpNow(@RequestBody MemberAuctionSalesroomBondDTO memberAuctionSalesroomBondDTO) {
if (memberAuctionSalesroomBondDTO.getBondType()==1){
AuctionGoods auctionGoods = AuctionGoodsMapper.selectById(memberAuctionSalesroomBondDTO.getAuctionGoodsId());
- if (LocalDateTime.now().isAfter(auctionGoods.getEndTime())){
+ if (auctionGoods.getEndTime().isAfter(LocalDateTime.now())){
throw new ServiceException("商品拍卖已结束");
}
if (auctionGoods.getListingStatus().getCode()==1){
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/mapper/AuctionSalesroomMapper.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/mapper/AuctionSalesroomMapper.java
index 72ac888..a6ad8be 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/mapper/AuctionSalesroomMapper.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/mapper/AuctionSalesroomMapper.java
@@ -20,5 +20,5 @@
public interface AuctionSalesroomMapper extends BaseMapper<AuctionSalesroom> {
List<AuctionSalesroom> pageMemberAuctionSalesroomList(Page page, @Param("param") MemberAuctionSalesroomDTO memberAuctionSalesroomDTO);
- List<AuctionSalesroom> pageMemberAuctionSalesroomWdList(Page page,@Param("param") MemberAuctionSalesroomWdDTO memberAuctionSalesroomWdDTO);
+ Page<AuctionSalesroom> pageMemberAuctionSalesroomWdList(@Param("page") Page page,@Param("param") MemberAuctionSalesroomWdDTO memberAuctionSalesroomWdDTO);
}
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBrowseRecordServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBrowseRecordServiceImpl.java
index fcc0daf..418faaa 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBrowseRecordServiceImpl.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBrowseRecordServiceImpl.java
@@ -146,7 +146,7 @@
Set<Long> goodsSkuIdList = null;
goodsSkuIdList = list.stream().map(AuctionBrowseRecord::getTargetId)
.collect(Collectors.toSet());
- Page<WdMemberAuctionSalesroomVO> page = new Page<>();
+ Page<AuctionSalesroom> page = new Page<>();
page.setSize(MemberAuctionSalesroomDTO.getPageSize());
page.setCurrent(MemberAuctionSalesroomDTO.getPageCurr());
MemberAuctionSalesroomWdDTO memberAuctionSalesroomWdDTO=new MemberAuctionSalesroomWdDTO();
@@ -159,13 +159,14 @@
}
memberAuctionSalesroomWdDTO.setSalesroomName(MemberAuctionSalesroomDTO.getSalesroomName());
- List<AuctionSalesroom> auctionSalesroomList=auctionSalesroomMapper.pageMemberAuctionSalesroomWdList(page,memberAuctionSalesroomWdDTO);
- List<WdMemberAuctionSalesroomVO> List=new ArrayList<>();
- for (AuctionSalesroom auctionSalesroom:auctionSalesroomList){
+ Page<AuctionSalesroom> auctionSalesroomList=auctionSalesroomMapper.pageMemberAuctionSalesroomWdList(page,memberAuctionSalesroomWdDTO);
+ PageDTO<WdMemberAuctionSalesroomVO> wdMemberAuctionSalesroomVOPageDTO = PageDTO.of(auctionSalesroomList, WdMemberAuctionSalesroomVO.class);
+ List<WdMemberAuctionSalesroomVO> list1 = wdMemberAuctionSalesroomVOPageDTO.getList();
+ for (WdMemberAuctionSalesroomVO auctionSalesroom:list1){
WdMemberAuctionSalesroomVO memberAuctionSalesroomVO=new WdMemberAuctionSalesroomVO();
memberAuctionSalesroomVO.setSalesroomName(auctionSalesroom.getSalesroomName());
memberAuctionSalesroomVO.setDescription(auctionSalesroom.getDescription());
- memberAuctionSalesroomVO.setStatus(auctionSalesroom.getStatus().getCode());
+ memberAuctionSalesroomVO.setStatus(auctionSalesroom.getStatus());
memberAuctionSalesroomVO.setSalesroomId(auctionSalesroom.getId());
memberAuctionSalesroomVO.setCoverPic(auctionSalesroom.getCoverPic());
MemberAuctionSalesroomDTO memberAuctionSalesroomDTO1=new MemberAuctionSalesroomDTO();
@@ -182,9 +183,7 @@
List<OrderAuctionBond> data2 = orderClient.getOrderAuctionBondList1(memberAuctionSalesroomDTO2, SecurityConstants.INNER).getData();
memberAuctionSalesroomVO.setBondNum(data2.size());
memberAuctionSalesroomVO.setBond(auctionSalesroom.getBond());
- List.add(memberAuctionSalesroomVO);
}
- page.setRecords(List);
- return PageDTO.of(page);
+ return wdMemberAuctionSalesroomVOPageDTO;
}
}
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 a7c3b2b..9bc6db5 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
@@ -421,6 +421,15 @@
goodsSkuIdList = goodsSku.stream().map(GoodsSku::getId)
.collect(Collectors.toSet());
}
+
+ if (StringUtils.isNotEmpty(auctionGoodsListDTO.getSalesroomName())) {
+ List<GoodsSku> goodsSku = goodsSkuClient.getGoodsByName(auctionGoodsListDTO.getSalesroomName(),
+ SecurityConstants.INNER)
+ .getData();
+ goodsSkuIdList = goodsSku.stream().map(GoodsSku::getId)
+ .collect(Collectors.toSet());
+ }
+
AuctionGoodsListPageDTO auctionGoodsListPageDTO=new AuctionGoodsListPageDTO();
auctionGoodsListPageDTO.setGoodsSkuIdList(goodsSkuIdList);
@@ -564,11 +573,11 @@
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());
+ wrapper5.orderByDesc(AuctionBidRecord::getLastBidAmount);
+ List<AuctionBidRecord> list2 = auctionBidRecordService.list(wrapper5);
+ if (list2.size()>0){
+ auctionGoodsinfoVO.setZgBid(list2.get(0).getLastBidAmount());
}
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java
index 5f3e4b1..f4a9d77 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java
@@ -535,6 +535,12 @@
@Override
public AuctionSalesroomGoodsInfoVO getAuctionSalesroomGoodsInfo(AuctionSalesroomGoodsInfoDTO auctionSalesroomGoodsInfoDTO) {
AuctionSalesroom byId = auctionSalesroomMapper.selectById(auctionSalesroomGoodsInfoDTO.getAuctionSalesroomId());
+ if (byId==null){
+ LambdaQueryWrapper<AuctionSalesroom> wrapper=Wrappers.lambdaQuery();
+ wrapper.eq(AuctionSalesroom::getAuctionSalesroomNo,auctionSalesroomGoodsInfoDTO.getAuctionSalesroomId());
+ wrapper.eq(AuctionSalesroom::getDelFlag,0);
+ byId =auctionSalesroomMapper.selectOne(wrapper);
+ }
AuctionSalesroomGoods byId1 = this.getById(auctionSalesroomGoodsInfoDTO.getGoodsSkuId());
GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(byId1.getGoodsSkuId(), SecurityConstants.INNER).getData();
AuctionSalesroomGoodsInfoVO AuctionSalesroomGoodsInfoVO=new AuctionSalesroomGoodsInfoVO();
@@ -620,13 +626,16 @@
}
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);
- }
+ if (goodsInfoTitleValueVOList!=null){
+ 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;
@@ -655,13 +664,13 @@
}
LambdaQueryWrapper<AuctionBidRecord> wrapper1=Wrappers.lambdaQuery();
if (auctionSalesroomGoodsInfoDTO.getAuctionSalesroomId()!=null){
- wrapper.eq(AuctionBidRecord::getAuctionSalesroomId,auctionSalesroomGoodsInfoDTO.getAuctionSalesroomId());
+ wrapper1.eq(AuctionBidRecord::getAuctionSalesroomId,auctionSalesroomGoodsInfoDTO.getAuctionSalesroomId());
}
wrapper1.eq(AuctionBidRecord::getDelFlag,0);
wrapper1.eq(AuctionBidRecord::getTargetId,auctionSalesroomGoodsInfoDTO.getGoodsSkuId());
wrapper1.eq(AuctionBidRecord::getMemberId,auctionSalesroomGoodsInfoDTO.getMemberId());
- wrapper.last("limit 1");
- AuctionBidRecord auctionBidRecord = auctionBidRecordMapper.selectOne(wrapper);
+ wrapper1.last("limit 1");
+ AuctionBidRecord auctionBidRecord = auctionBidRecordMapper.selectOne(wrapper1);
if (auctionBidRecord!=null){
LambdaQueryWrapper<AuctionBidRecord> wrapper3=Wrappers.lambdaQuery();
wrapper3.eq(AuctionBidRecord::getAuctionSalesroomId,auctionSalesroomGoodsInfoDTO.getAuctionSalesroomId());
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
index 63bc930..8a9e834 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
@@ -636,6 +636,11 @@
throw new ServiceException("出价不能比当前最高价低");
}
}
+ if (one3!=null){
+ if (bidVO.getLastBidAmount().doubleValue()<one3.getLastBidAmount().add(byId.getMinimumMarkupAmount()).doubleValue()){
+ throw new ServiceException("出价不能比当前最高价低加每次加价低");
+ }
+ }
BigDecimal bigDecimal=byId.getStartingPrice().add(byId.getMinimumMarkupAmount());
if (bigDecimal.doubleValue()>bidVO.getLastBidAmount().doubleValue()){
@@ -724,7 +729,6 @@
wrapper1.orderByDesc(AuctionBidRecord::getLastBidAmount);
wrapper1.last("limit 1");
AuctionBidRecord one = auctionBidRecordService.getOne(wrapper1);
- if (byId.getAuctionStock()==1) {
if (one != null) {
BigDecimal bigDecimal1 = one.getLastBidAmount().add(byId.getMinimumMarkupAmount());
if (bigDecimal1.doubleValue() > bidVO.getLastBidAmount().doubleValue()) {
@@ -732,8 +736,6 @@
}
}
- }
-
LambdaQueryWrapper<AuctionBidRecord> wrapper3=Wrappers.lambdaQuery();
wrapper3.eq(AuctionBidRecord::getTargetId,bidVO.getTargetId());
wrapper3.eq(AuctionBidRecord::getDelFlag,0);
@@ -751,7 +753,7 @@
one3.setAuctionSalesroomId(bidVO.getAuctionSalesroomId());
one3.setTargetId(bidVO.getTargetId());
one3.setMemberId(bidVO.getMemberId());
- if(membeOne.getRealName()!=null||membeOne.getRealName()!=""){
+ if(membeOne.getRealName()!=null&&membeOne.getRealName()!=""){
one3.setNickname(membeOne.getRealName());
}else{
one3.setNickname(membeOne.getNickname());
@@ -972,10 +974,10 @@
Set<Long> goodsSkuIdList = null;
goodsSkuIdList = data.stream().map(OrderAuctionBond::getAuctionSalesroomId)
.collect(Collectors.toSet());
- Page<WdMemberAuctionSalesroomVO> page = new Page<>();
+ Page<AuctionSalesroom> page = new Page<>();
page.setSize(memberAuctionSalesroomDTO.getPageSize());
page.setCurrent(memberAuctionSalesroomDTO.getPageCurr());
- MemberAuctionSalesroomWdDTO memberAuctionSalesroomWdDTO=new MemberAuctionSalesroomWdDTO();
+ /* MemberAuctionSalesroomWdDTO memberAuctionSalesroomWdDTO=new MemberAuctionSalesroomWdDTO();
if (goodsSkuIdList.size()>0){
memberAuctionSalesroomWdDTO.setGoodsSkuIdList(goodsSkuIdList);
}else{
@@ -991,28 +993,49 @@
memberAuctionSalesroomWdDTO.setStatus(MemberAuctionSalesroomDTO.getStatus());
}
+ }*/
+
+ LambdaQueryWrapper<AuctionSalesroom> wrapper1=Wrappers.lambdaQuery();
+ if (goodsSkuIdList.size()>0){
+ wrapper1.in(AuctionSalesroom::getId,goodsSkuIdList);
+ }else{
+ Set<Long> goodsSkuIdList1 = new HashSet<>();
+ goodsSkuIdList1.add(0L);
+ wrapper1.in(AuctionSalesroom::getId,goodsSkuIdList);
}
- List<AuctionSalesroom> auctionSalesroomList=auctionSalesroomMapper.pageMemberAuctionSalesroomWdList(page,memberAuctionSalesroomWdDTO);
- List<WdMemberAuctionSalesroomVO> List=new ArrayList<>();
- for (AuctionSalesroom auctionSalesroom:auctionSalesroomList){
+ if (MemberAuctionSalesroomDTO.getSalesroomName()!=null){
+ wrapper1.like(AuctionSalesroom::getSalesroomName,MemberAuctionSalesroomDTO.getSalesroomName());
+ }
+ wrapper1.eq(AuctionSalesroom::getDelFlag,0);
+ if(MemberAuctionSalesroomDTO.getStatus()!=4){
+ wrapper1.eq(AuctionSalesroom::getStatus,MemberAuctionSalesroomDTO.getStatus());
+ }
+ wrapper1.last("ORDER BY\n" +
+ " CASE\n" +
+ " WHEN status = 0 THEN 2\n" +
+ " WHEN status = 1 THEN 1\n" +
+ " WHEN status = 2 THEN 3\n" +
+ " END,status");
+
+ Page<AuctionSalesroom> auctionSalesroomList=this.page(page,wrapper1);
+ PageDTO<WdMemberAuctionSalesroomVO> wdMemberAuctionSalesroomVOPageDTO = PageDTO.of(auctionSalesroomList, WdMemberAuctionSalesroomVO.class);
+ List<WdMemberAuctionSalesroomVO> list = wdMemberAuctionSalesroomVOPageDTO.getList();
+ for (WdMemberAuctionSalesroomVO auctionSalesroom:list){
WdMemberAuctionSalesroomVO memberAuctionSalesroomVO=new WdMemberAuctionSalesroomVO();
memberAuctionSalesroomVO.setSalesroomName(auctionSalesroom.getSalesroomName());
memberAuctionSalesroomVO.setDescription(auctionSalesroom.getDescription());
- memberAuctionSalesroomVO.setStatus(auctionSalesroom.getStatus().getCode());
+ memberAuctionSalesroomVO.setStatus(auctionSalesroom.getStatus());
memberAuctionSalesroomVO.setSalesroomId(auctionSalesroom.getId());
memberAuctionSalesroomVO.setCoverPic(auctionSalesroom.getCoverPic());
MemberAuctionSalesroomDTO memberAuctionSalesroomDTO1=new MemberAuctionSalesroomDTO();
- memberAuctionSalesroomDTO1.setAuctionSalesroomId(auctionSalesroom.getId());
- memberAuctionSalesroomDTO1.setMemberId(MemberAuctionSalesroomDTO.getMemberId());
+ memberAuctionSalesroomDTO1.setAuctionSalesroomId(auctionSalesroom.getSalesroomId());
+ memberAuctionSalesroomDTO1.setMemberId(auctionSalesroom.getId());
List<OrderAuctionBond> data1 = orderClient.getOrderAuctionBondList1(memberAuctionSalesroomDTO1, SecurityConstants.INNER).getData();
if (data1.size()>0){
memberAuctionSalesroomVO.setBondTime(data1.get(0).getCreateTime());
}
-
- List.add(memberAuctionSalesroomVO);
}
- page.setRecords(List);
- return PageDTO.of(page);
+ return wdMemberAuctionSalesroomVOPageDTO;
}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsInfoTitleValueController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsInfoTitleValueController.java
index 65d5c32..8fd5c3e 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsInfoTitleValueController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsInfoTitleValueController.java
@@ -33,4 +33,12 @@
}
+ @InnerAuth
+ @PostMapping("/getlistByGoodsId1")
+ @ResponseBody
+ public R<List<GoodsInfoTitleValueVO>> getlistByGoodsId1(@RequestBody Long goodsSkuId) {
+ return R.ok(goodsInfoTitleValueMapper.listByGoodsId1(goodsSkuId));
+
+ }
+
}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/GoodsInfoTitleValueMapper.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/GoodsInfoTitleValueMapper.java
index 8796eb9..dddf287 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/GoodsInfoTitleValueMapper.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/GoodsInfoTitleValueMapper.java
@@ -23,4 +23,6 @@
* @return List<GoodsInfoTitleValueVO>
*/
List<GoodsInfoTitleValueVO> listByGoodsId(@Param("id") Long id);
+
+ List<GoodsInfoTitleValueVO> listByGoodsId1(@Param("id") Long id);
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderAuctionBondServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderAuctionBondServiceImpl.java
index 0be4bdf..99e9b74 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderAuctionBondServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderAuctionBondServiceImpl.java
@@ -142,7 +142,7 @@
if (memberAuctionSalesroomBondDTO.getBondType() == 1) {
AuctionGoods data = auctionClient.getauctionGoodsOne(memberAuctionSalesroomBondDTO, SecurityConstants.INNER).getData();
- if (LocalDateTime.now().isAfter(data.getEndTime())){
+ if (data.getEndTime().isAfter(LocalDateTime.now())){
throw new ServiceException("商品拍卖已结束");
}
if (data.getListingStatus().getCode()==1){
@@ -191,8 +191,7 @@
}
} else {
AuctionSalesroom data = auctionClient.getauctionSalesroomOne(memberAuctionSalesroomBondDTO, SecurityConstants.INNER).getData();
-
- if (data.getBond().intValue() == 0) {
+ if (data.getBond()==null||data.getBond().intValue() == 0) {
OrderAuctionBond orderAuctionBond = new OrderAuctionBond();
orderAuctionBond.setOrderNo(OrderUtil.getOrderNoForPrefix("BO"));
orderAuctionBond.setAuctionSalesroomId(memberAuctionSalesroomBondDTO.getAuctionSalesroomId());
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderReturnRequestServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderReturnRequestServiceImpl.java
index ddd1eb9..5870ba1 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderReturnRequestServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderReturnRequestServiceImpl.java
@@ -80,7 +80,7 @@
OrderReturnRequest orderReturnRequest = new OrderReturnRequest();
orderReturnRequest.setOrderId(OrderReturnDTO.getOrderId());
orderReturnRequest.setRequestTime(LocalDateTime.now());
- orderReturnRequest.setRequestType(OrderReturnDTO.getRequestType());
+ orderReturnRequest.setRequestType(RequestTypeEnum.fromCode(OrderReturnDTO.getRequestType()));
orderReturnRequest.setRequestReason(OrderReturnDTO.getRequestReason());
orderReturnRequest.setStatus(ReturnRequestStatusEnum.TO_BE_REVIEWED);
orderReturnRequest.setAuditStatus(AuditStatusEnum.TO_BE_REVIEWED);
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index c01e6a1..a330f40 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -348,9 +348,12 @@
GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(data.getGoodsSkuId(), SecurityConstants.INNER).getData();
- if (data.getLimitNumber()<num1) {
- throw new ServiceException("该商品已售罄，暂无库存");
+ if (data.getLimitNumber()!=0){
+ if (data.getLimitNumber()<num1) {
+ throw new ServiceException("对不起，大于商品购买数");
+ }
}
+
order.setOrderFrom(OrderFromEnum.SNAP_ORDERS);
memberOrderVO.setGoodsSkuId(memberOrderDTO.getGoodsSkuId());
@@ -514,17 +517,22 @@
memberOrderDTO1.setGoodsSkuId(order.getGoodsSkuId());
Integer num=baseMapper.getSeckillMembers1(memberOrderDTO1);
Integer num1=0;
- if (num!=null){
- num1 =num+order.getGoodsQuantity();
+ if(num!=order.getGoodsQuantity()){
+ if (num!=null){
+ num1 =num+order.getGoodsQuantity();
+ }else{
+ num1=order.getGoodsQuantity();
+ }
}else{
- num1=order.getGoodsQuantity();
+ num1=num;
}
+
GoodsSeckill data = goodsSkuClient.getGoodsSeckillOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(data.getGoodsSkuId(), SecurityConstants.INNER).getData();
if (num1!=order.getGoodsQuantity()){
- if (data.getLimitNumber()<num1){
+ if (data.getLimitNumber()!=0||data.getLimitNumber()<num1){
throw new ServiceException("对不起，大于商品购买数");
}else{
@@ -613,6 +621,7 @@
pice=pice.subtract(data.getReductionAmount());
order.setDiscountMoney(data.getReductionAmount());
}else{
+ order.setDiscountMoney(pice);
pice=new BigDecimal(0);
}
@@ -620,10 +629,13 @@
if (data.getCouponType().getCode()==2){
pice= order.getTotalAmount();
if(pice.compareTo(data.getVoucherAmount())<0){
- throw new ServiceException("优惠卷抵扣金额不能大于实际支付金额");
+ order.setDiscountMoney(pice);
+ pice=new BigDecimal(0);
+ }else{
+ pice=pice.subtract(data.getVoucherAmount());
+ order.setDiscountMoney(data.getVoucherAmount());
}
- pice=pice.subtract(data.getVoucherAmount());
- order.setDiscountMoney(data.getVoucherAmount());
+
}
if (data.getCouponType().getCode()==3){
pice= order.getTotalAmount();
@@ -634,17 +646,20 @@
pice3=new BigDecimal(data.getMaxDiscount().doubleValue());
}
if(pice.compareTo(pice3)<0){
- throw new ServiceException("优惠卷抵扣金额不能大于实际支付金额");
+ BigDecimal pice4= pice.subtract(pice3);
+ if (pice4.doubleValue()>data.getMaxDiscount().doubleValue()){
+ pice=pice.subtract(data.getMaxDiscount());
+ order.setDiscountMoney(data.getMaxDiscount());
+ }else{
+ order.setDiscountMoney(pice4);
+ pice=pice3;
+ }
+ }else{
+ order.setDiscountMoney(pice);
+ pice=new BigDecimal(0);
}
- BigDecimal pice4= pice.subtract(pice3);
- if (pice4.doubleValue()>data.getMaxDiscount().doubleValue()){
- pice=pice.subtract(data.getMaxDiscount());
- order.setDiscountMoney(data.getMaxDiscount());
- }else{
- order.setDiscountMoney(pice4);
- pice=pice3;
- }
+
}
order.setCouponId(memberOrderDTO.getCouponId());
@@ -765,6 +780,11 @@
}else {
MemberOrderList.setIsAuctionBond(1);
}
+
+ CustomConfig memberPointsPoints = sysUserClient.getconfig("MALL_ORDER_DESCRIPTION").getData();
+ MemberOrderList.setOrderShuoMin(memberPointsPoints.getConfigValue());
+ CustomConfig ReturnCycle = sysUserClient.getconfig("RETURN_CYCLE").getData();
+ MemberOrderList.setOrderZq(Integer.valueOf(ReturnCycle.getConfigValue()));
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java
index 04526ed..6426061 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java
@@ -111,7 +111,8 @@
one1.setPaymentMethod(PaymentMethodEnum.WECHAT);
orderAuctionBondMapper.updateById(one1);
- if (one1.getBond().compareTo(new BigDecimal(0))==0){
+
+ if (one1.getBond()==null||one1.getBond().compareTo(new BigDecimal(0))==0){
one1.setBoundStatus(BondStatusEnum.PAID);
Map<String, Object> returnMap = new HashMap<>();
returnMap.put("Type",1);
@@ -127,6 +128,12 @@
page1.setOrderStatus(OrderStatusEnum.TO_BE_SHIPPED);
page1.setPaymentMethod(PaymentMethodEnum.WECHAT);
page1.setPayTime(LocalDateTime.now());
+ OrderMapper.updateById(page1);
+ if (page1.getTotalAmount().compareTo(new BigDecimal(0))==0){
+ Map<String, Object> returnMap = new HashMap<>();
+ returnMap.put("Type",1);
+ return R.ok(returnMap);
+ }
if(page1.getOrderNo().contains("SP")){
--
Gitblit v1.7.1