From f81ae4085304f74db4454e9168af75d59496bb87 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 18 六月 2024 08:43:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderReturnRequestService.java | 6
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderReturnVO.java | 8 +
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java | 30 ++--
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java | 63 +++++-----
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionSalesroomGoodsInfoVO.java | 6 +
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java | 4
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/OrderReturnDTO.java | 8 +
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderVO.java | 6
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderController.java | 39 ++++++
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java | 10 +
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 31 +++-
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/ReturnRequestStatusEnum.java | 3
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/OrderClient.java | 11 +
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartOrderReturnRequestController.java | 28 +++-
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberOrderListVO.java | 9 +
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsinfoVO.java | 13 ++
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/dto/MemberInvoiceDTO.java | 4
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderReturnRequestServiceImpl.java | 29 ++++
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/OrderReturnRequest.java | 2
20 files changed, 237 insertions(+), 75 deletions(-)
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 9a6cc07..076da58 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
@@ -12,7 +12,7 @@
@ApiModel(value = "售后订单传输对象", description = "售后订单传输对象")
public class OrderReturnDTO {
@ApiModelProperty(value = "数据id")
- private Integer id;
+ private Long id;
@ApiModelProperty(value = "备注")
private String remark;
@@ -27,11 +27,15 @@
private String requestReason;
@ApiModelProperty(value = "详情图，不超过五张图片")
- private MultipartFile[] album;
+ private String album;
@ApiModelProperty(value = "快递单号")
private String courierNumber;
+ @ApiModelProperty(value = "快递公司编号")
+ private String Logistics;
+
+
}
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 4b3e1f7..6b7e8d1 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
@@ -56,6 +56,7 @@
private String detail;
@ApiModelProperty(value = "商品年份")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@JsonInclude(JsonInclude.Include.ALWAYS)
private String years;
@@ -128,4 +129,16 @@
@ApiModelProperty(value = "分享图片")
@JsonInclude(JsonInclude.Include.ALWAYS)
private String sharePic;
+
+ @ApiModelProperty(value = "订单id")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private Long orderId;
+
+ @ApiModelProperty(value = "订单编号")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private String orderNo;
+
+ @ApiModelProperty(value = "保证金")
+ private BigDecimal bond;
+
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionSalesroomGoodsInfoVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionSalesroomGoodsInfoVO.java
index 115098d..84b2cb7 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionSalesroomGoodsInfoVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionSalesroomGoodsInfoVO.java
@@ -114,7 +114,13 @@
@JsonInclude(JsonInclude.Include.ALWAYS)
private String detail;
+ @ApiModelProperty(value = "订单id")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private Long orderId;
+ @ApiModelProperty(value = "订单编号")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private String orderNo;
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 81b758a..00241e4 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
@@ -69,4 +69,13 @@
@JsonInclude(JsonInclude.Include.ALWAYS)
private ReturnRequestStatusEnum status;
+ @ApiModelProperty(value = "是否售后")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private Integer isRequest;
+
+ @ApiModelProperty(value = "售后订单")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private Long requestId;
+
+
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderReturnVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderReturnVO.java
index e4301d7..041c894 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderReturnVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderReturnVO.java
@@ -71,4 +71,12 @@
@JsonInclude(JsonInclude.Include.ALWAYS)
private String courierNumber;
+ @ApiModelProperty("退货时间")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private LocalDateTime returnTime;
+
+ @ApiModelProperty("平台收货时间")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private LocalDateTime platformReceiptTime;
+
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderVO.java
index 0ba3f3c..651bd99 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderVO.java
@@ -149,7 +149,7 @@
@JsonInclude(JsonInclude.Include.ALWAYS)
private LocalDateTime purchase;
- @ApiModelProperty(value = "是否售后")
+ @ApiModelProperty(value = "是否售后 1否，2 是")
@JsonInclude(JsonInclude.Include.ALWAYS)
private Integer isRequest;
@@ -165,4 +165,8 @@
@JsonInclude(JsonInclude.Include.ALWAYS)
private Integer isAuctionBond;
+ @ApiModelProperty(value = "售后订单")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private Long requestId;
+
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java
index b5939b2..c27744c 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java
@@ -31,6 +31,16 @@
}
@Override
+ public R<Order> getOrderOne(OrderDTO orderDTO, String source) {
+ return R.fail("获取订单失败:" + cause.getMessage());
+ }
+
+ @Override
+ public R<Order> getOrderOne1(OrderDTO orderDTO, String source) {
+ return R.fail("获取订单失败:" + cause.getMessage());
+ }
+
+ @Override
public R<Boolean> getOrderAuctionBond(OrderAuctionBondDTO orderAuctionBondDTO,
String source) {
return R.fail("查询拍卖订单佣金失败:" + cause.getMessage());
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/OrderClient.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/OrderClient.java
index b2ac6fa..578cd1e 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/OrderClient.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/OrderClient.java
@@ -31,6 +31,15 @@
@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+ @PostMapping("/order/getOrderOne")
+ R<Order> getOrderOne(@RequestBody OrderDTO orderDTO,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+ @PostMapping("/order/getOrderOne1")
+ R<Order> getOrderOne1(@RequestBody OrderDTO orderDTO,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+
@PostMapping("/order-auction-bond/getOrderAuctionBond")
R<Boolean> getOrderAuctionBond(@RequestBody OrderAuctionBondDTO orderAuctionBondDTO,
@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
@@ -145,4 +154,6 @@
@PostMapping("/order/list-by-coupon")
R<List<Order>> getOrderByCouponIds(@RequestBody Collection<Long> couponIds,
@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+
}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/ReturnRequestStatusEnum.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/ReturnRequestStatusEnum.java
index a21cd15..92aab8b 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/ReturnRequestStatusEnum.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/ReturnRequestStatusEnum.java
@@ -16,7 +16,8 @@
TO_BE_RETURNED(2, "待退货"),
TO_BE_RECEIVED_BY_THE_PLATFORM(3, "待平台收货"),
COMPLETED(4, "已完成"),
- REJECTED(5, "已拒绝");
+ REJECTED(5, "已拒绝"),
+ QX(6, "已拒绝");
@EnumValue
private final int code;
@JsonValue
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 97b81b8..c193f7b 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,15 +33,7 @@
import com.ruoyi.common.core.utils.page.BeanUtils;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.system.api.constants.NotificationTypeConstant;
-import com.ruoyi.system.api.domain.AuctionGoods;
-import com.ruoyi.system.api.domain.GoodsBrand;
-import com.ruoyi.system.api.domain.GoodsCategory;
-import com.ruoyi.system.api.domain.GoodsFlavorType;
-import com.ruoyi.system.api.domain.GoodsSeries;
-import com.ruoyi.system.api.domain.GoodsSku;
-import com.ruoyi.system.api.domain.Member;
-import com.ruoyi.system.api.domain.MemberAddress;
-import com.ruoyi.system.api.domain.OrderAuctionBond;
+import com.ruoyi.system.api.domain.*;
import com.ruoyi.system.api.domain.dto.AuctionGoodsListDTO;
import com.ruoyi.system.api.domain.dto.AuctionGoodsListPageDTO;
import com.ruoyi.system.api.domain.dto.GoodsStockUpdDTO;
@@ -428,6 +420,7 @@
auctionGoodsinfoVO.setStartTime(byId.getStartTime());
auctionGoodsinfoVO.setEndTime(byId.getEndTime());
auctionGoodsinfoVO.setUnit(goodsSkuOne.getUnit());
+ auctionGoodsinfoVO.setBond(byId.getBond());
auctionGoodsinfoVO.setDescription(goodsSkuOne.getDescription());
auctionGoodsinfoVO.setYears(String.valueOf(goodsSkuOne.getYears()));
GoodsBrand data = goodsSkuClient.getBrandOne(goodsSkuOne.getBrandId(), SecurityConstants.INNER).getData();
@@ -447,6 +440,7 @@
auctionGoodsinfoVO.setShareTitle(goodsSkuOne.getShareTitle());
auctionGoodsinfoVO.setSpecUnit(goodsSkuOne.getSpecUnit());
auctionGoodsinfoVO.setDetail(goodsSkuOne.getDetail());
+ auctionGoodsinfoVO.setBond(byId.getBond());
auctionGoodsinfoVO.setYears(String.valueOf(goodsSkuOne.getYears()));
LambdaQueryWrapper<AuctionBidRecord> wrapper1= Wrappers.lambdaQuery();
wrapper1.eq(AuctionBidRecord::getMemberId,auctionGoodsListDTO.getMemberId());
@@ -459,6 +453,15 @@
auctionGoodsinfoVO.setPresentBid(list1.getLastBidAmount());
if (list1.getStatus().getCode()==2){
auctionGoodsinfoVO.setIsStatus(2);
+
+ OrderDTO orderDTO =new OrderDTO();
+ orderDTO.setMemberId(auctionGoodsListDTO.getMemberId());
+ orderDTO.setGoodsSkuId(byId.getId());
+ Order data4 = orderClient.getOrderOne1(orderDTO, SecurityConstants.INNER).getData();
+ if (data4!=null){
+ auctionGoodsinfoVO.setOrderId(data4.getId());
+ auctionGoodsinfoVO.setOrderNo(data4.getOrderNo());
+ }
}else{
auctionGoodsinfoVO.setIsStatus(1);
}
@@ -484,19 +487,14 @@
}
LocalDateTime now = LocalDateTime.now();
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
- String formattedDate = now.format(formatter);
- LocalDateTime parseTime = LocalDateTime.parse(formattedDate, formatter);
LocalDateTime newTime7 = now.minusDays(7);
- String formattedDate7 = newTime7.format(formatter);
- LocalDateTime parseTime7 = LocalDateTime.parse(formattedDate7, formatter);
LambdaQueryWrapper<AuctionBrowseRecord> wrapper3=Wrappers.lambdaQuery();
wrapper3.eq(AuctionBrowseRecord::getDelFlag,0);
wrapper3.eq(AuctionBrowseRecord::getTargetId,auctionGoodsListDTO.getGoodsSkuId());
wrapper3.eq(AuctionBrowseRecord::getMemberId,auctionGoodsListDTO.getMemberId());
- wrapper3.ge(AuctionBrowseRecord::getCreateTime, parseTime7)
- .le(AuctionBrowseRecord::getCreateTime, parseTime);
+ wrapper3.ge(AuctionBrowseRecord::getCreateTime, newTime7)
+ .le(AuctionBrowseRecord::getCreateTime, now);
List<AuctionBrowseRecord> list = iAuctionBrowseRecordService.list(wrapper3);
if (list.size()==0){
AuctionBrowseRecord auctionBrowseRecord=new AuctionBrowseRecord();
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 c1c40df..5661310 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
@@ -23,15 +23,7 @@
import com.ruoyi.common.core.enums.ClientTypeEnum;
import com.ruoyi.common.core.enums.OrderFromEnum;
import com.ruoyi.system.api.constants.NotificationTypeConstant;
-import com.ruoyi.system.api.domain.AuctionSalesroom;
-import com.ruoyi.system.api.domain.CustomConfig;
-import com.ruoyi.system.api.domain.GoodsBrand;
-import com.ruoyi.system.api.domain.GoodsCategory;
-import com.ruoyi.system.api.domain.GoodsFlavorType;
-import com.ruoyi.system.api.domain.GoodsSeries;
-import com.ruoyi.system.api.domain.GoodsSku;
-import com.ruoyi.system.api.domain.Member;
-import com.ruoyi.system.api.domain.MemberAddress;
+import com.ruoyi.system.api.domain.*;
import com.ruoyi.system.api.domain.dto.AuctionSalesroomDTO;
import com.ruoyi.system.api.domain.dto.AuctionSalesroomGoodsInfoDTO;
import com.ruoyi.system.api.domain.dto.GoodsStockUpdDTO;
@@ -553,6 +545,15 @@
AuctionSalesroomGoodsInfoVO.setPresentBid(list1.getLastBidAmount());
if (list1.getStatus().getCode()==2){
AuctionSalesroomGoodsInfoVO.setIsStatus(2);
+ OrderDTO orderDTO =new OrderDTO();
+ orderDTO.setMemberId(auctionSalesroomGoodsInfoDTO.getMemberId());
+ orderDTO.setGoodsSkuId(byId1.getId());
+ Order data4 = orderClient.getOrderOne(orderDTO, SecurityConstants.INNER).getData();
+ if (data4!=null){
+ AuctionSalesroomGoodsInfoVO.setOrderId(data4.getId());
+ AuctionSalesroomGoodsInfoVO.setOrderNo(data4.getOrderNo());
+ }
+
}else{
AuctionSalesroomGoodsInfoVO.setIsStatus(1);
}
@@ -579,10 +580,8 @@
auctionBidRecordVO.setSort(i+1);
auctionBidRecordVO.setLastBidAmount(auctionBidRecordList.get(i).getLastBidAmount());
auctionBidRecordVO.setLastBidTime(auctionBidRecordList.get(i).getLastBidTime());
- Member data = emberClient.getMembeOne(auctionBidRecordList.get(i).getMemberId(),
- SecurityConstants.INNER).getData();
- auctionBidRecordVO.setMemberName(data.getNickname());
- auctionBidRecordVO.setMemberId(data.getId());
+ auctionBidRecordVO.setMemberName(auctionBidRecordList.get(i).getNickname());
+ auctionBidRecordVO.setMemberId(auctionBidRecordList.get(i).getId());
auctionBidRecordVOList.add(auctionBidRecordVO);
}
LambdaQueryWrapper<AuctionBidRecord> wrapper1=Wrappers.lambdaQuery();
@@ -592,25 +591,27 @@
wrapper1.eq(AuctionBidRecord::getMemberId,auctionSalesroomGoodsInfoDTO.getMemberId());
wrapper.last("limit 1");
AuctionBidRecord auctionBidRecord = auctionBidRecordMapper.selectOne(wrapper);
-
- LambdaQueryWrapper<AuctionBidRecord> wrapper3=Wrappers.lambdaQuery();
- wrapper3.eq(AuctionBidRecord::getAuctionSalesroomId,auctionSalesroomGoodsInfoDTO.getAuctionSalesroomId());
- wrapper3.eq(AuctionBidRecord::getDelFlag,0);
- wrapper3.eq(AuctionBidRecord::getTargetId,auctionSalesroomGoodsInfoDTO.getGoodsSkuId());
- wrapper3.le(AuctionBidRecord::getId,auctionBidRecord.getId());
- wrapper3.orderByDesc(AuctionBidRecord::getLastBidAmount);
- Long count = auctionBidRecordMapper.selectCount(wrapper);
- if (count>0){
- AuctionBidRecordVO auctionBidRecordVO=new AuctionBidRecordVO();
- auctionBidRecordVO.setSort(Integer.valueOf(count.intValue()));
- auctionBidRecordVO.setLastBidAmount(auctionBidRecord.getLastBidAmount());
- auctionBidRecordVO.setLastBidTime(auctionBidRecord.getLastBidTime());
- Member data = emberClient.getMembeOne(auctionBidRecord.getMemberId(),
- SecurityConstants.INNER).getData();
- auctionBidRecordVO.setMemberName(data.getNickname());
- auctionBidRecordVO.setMemberId(data.getId());
- auctionBidRecordVOList.add(auctionBidRecordVO);
+ if (auctionBidRecord!=null){
+ LambdaQueryWrapper<AuctionBidRecord> wrapper3=Wrappers.lambdaQuery();
+ wrapper3.eq(AuctionBidRecord::getAuctionSalesroomId,auctionSalesroomGoodsInfoDTO.getAuctionSalesroomId());
+ wrapper3.eq(AuctionBidRecord::getDelFlag,0);
+ wrapper3.eq(AuctionBidRecord::getTargetId,auctionSalesroomGoodsInfoDTO.getGoodsSkuId());
+ wrapper3.le(AuctionBidRecord::getId,auctionBidRecord.getId());
+ wrapper3.orderByDesc(AuctionBidRecord::getLastBidAmount);
+ Long count = auctionBidRecordMapper.selectCount(wrapper);
+ if (count>0){
+ AuctionBidRecordVO auctionBidRecordVO=new AuctionBidRecordVO();
+ auctionBidRecordVO.setSort(Integer.valueOf(count.intValue()));
+ auctionBidRecordVO.setLastBidAmount(auctionBidRecord.getLastBidAmount());
+ auctionBidRecordVO.setLastBidTime(auctionBidRecord.getLastBidTime());
+ Member data = emberClient.getMembeOne(auctionBidRecord.getMemberId(),
+ SecurityConstants.INNER).getData();
+ auctionBidRecordVO.setMemberName(data.getNickname());
+ auctionBidRecordVO.setMemberId(data.getId());
+ auctionBidRecordVOList.add(auctionBidRecordVO);
+ }
}
+
return auctionBidRecordVOList;
}
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 df03e04..49c6355 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
@@ -610,6 +610,8 @@
one.setTargetId(bidVO.getTargetId());
one.setMemberId(bidVO.getMemberId());
one.setLastBidTime(LocalDateTime.now());
+ one.setNickname(membeOne.getNickname());
+ one.setPhone(membeOne.getPhone());
one.setAuctionType(AuctionOrderTypeEnum.AUCTION_ITEMS);
one.setStatus(BidStatusEnum.ELIMINATE);
one.setBidCount(1);
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartOrderReturnRequestController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartOrderReturnRequestController.java
index 395d773..07f5e70 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartOrderReturnRequestController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartOrderReturnRequestController.java
@@ -32,23 +32,35 @@
@PostMapping("/saveOrderReturnRequest")
@ApiOperation(value = "用户端-申请订单售后")
- public R saveOrderReturnRequest(@RequestBody OrderReturnDTO OrderReturnDTO) {
- OrderReturnRequestService.saveOrderReturnRequest(OrderReturnDTO);
- return R.ok();
+ public R<OrderReturnVO>saveOrderReturnRequest(@RequestBody OrderReturnDTO OrderReturnDTO) {
+ return R.ok(OrderReturnRequestService.saveOrderReturnRequest(OrderReturnDTO));
}
@PostMapping("/updOrderReturnRequest")
- @ApiOperation(value = "修改用户端-修改订单售后")
+ @ApiOperation(value = "用户端-修改订单售后")
public R updOrderReturnRequest(@RequestBody OrderReturnDTO OrderReturnDTO) {
OrderReturnRequestService.updOrderReturnRequest(OrderReturnDTO);
return R.ok();
}
- @PostMapping("/OrderReturnRequestInfo")
- @ApiOperation(value = "修改用户端-订单售后详情")
- public R<OrderReturnVO> OrderReturnRequestInfo(@RequestBody OrderReturnDTO OrderReturnDTO) {
- OrderReturnRequestService.OrderReturnRequestInfo(OrderReturnDTO);
+ @PostMapping("/qxReturnRequest")
+ @ApiOperation(value = "用户端-取消订单售后")
+ public R qxReturnRequest(@RequestBody OrderReturnDTO OrderReturnDTO) {
+ OrderReturnRequestService.qxReturnRequest(OrderReturnDTO);
return R.ok();
}
+ @PostMapping("/wlReturnRequest")
+ @ApiOperation(value = "用户端-订单售后填写物流")
+ public R wlReturnRequest(@RequestBody OrderReturnDTO OrderReturnDTO) {
+ OrderReturnRequestService.wlReturnRequest(OrderReturnDTO);
+ return R.ok();
+ }
+
+ @PostMapping("/OrderReturnRequestInfo")
+ @ApiOperation(value = "用户端-订单售后详情")
+ public R<OrderReturnVO> OrderReturnRequestInfo(@RequestBody OrderReturnDTO OrderReturnDTO) {
+ return R.ok( OrderReturnRequestService.OrderReturnRequestInfo(OrderReturnDTO));
+ }
+
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderController.java
index f01f4a8..29b2341 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderController.java
@@ -1,6 +1,9 @@
package com.ruoyi.order.controller.inner;
+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.common.core.domain.R;
import com.ruoyi.common.core.utils.page.BeanUtils;
import com.ruoyi.common.security.annotation.InnerAuth;
@@ -49,6 +52,42 @@
}
+ @PostMapping("/getOrderOne")
+ @ResponseBody
+ @InnerAuth
+ public R<Order> getOrderOne(@RequestBody OrderDTO OrderDTO) {
+
+ LambdaQueryWrapper<Order> wrapper= Wrappers.lambdaQuery();
+ wrapper.eq(Order::getMemberId,OrderDTO.getMemberId());
+ wrapper.eq(Order::getOrderStatus,4);
+ wrapper.eq(Order::getAuctionOrderType,2 );
+ wrapper.eq(Order::getGoodsSkuId,OrderDTO.getGoodsSkuId());
+ wrapper.eq(Order::getDelFlag,0);
+ wrapper.orderByDesc(Order::getCancelTime);
+ Order page1 = orderService.getOne(wrapper);
+
+ return R.ok(page1);
+
+ }
+
+ @PostMapping("/getOrderOne1")
+ @ResponseBody
+ @InnerAuth
+ public R<Order> getOrderOne1(@RequestBody OrderDTO OrderDTO) {
+
+ LambdaQueryWrapper<Order> wrapper= Wrappers.lambdaQuery();
+ wrapper.eq(Order::getMemberId,OrderDTO.getMemberId());
+ wrapper.eq(Order::getOrderStatus,4);
+ wrapper.eq(Order::getAuctionOrderType,1 );
+ wrapper.eq(Order::getGoodsSkuId,OrderDTO.getGoodsSkuId());
+ wrapper.eq(Order::getDelFlag,0);
+ wrapper.orderByDesc(Order::getCancelTime);
+ Order page1 = orderService.getOne(wrapper);
+
+ return R.ok(page1);
+
+ }
+
/**
* 获取某个商品的已购会员数
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/OrderReturnRequest.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/OrderReturnRequest.java
index 750b7a9..b6e0b76 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/OrderReturnRequest.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/OrderReturnRequest.java
@@ -50,7 +50,7 @@
@ApiModelProperty(value = "申请原因")
private String requestReason;
- @ApiModelProperty(value = "售后状态 1=待审核 2=待退货 3=待平台收货 4=已完成 5=已拒绝")
+ @ApiModelProperty(value = "售后状态 1=待审核 2=待退货 3=待平台收货 4=已完成 5=已拒绝 6取消")
private ReturnRequestStatusEnum status;
@ApiModelProperty(value = "审核状态 1=待审核 2=已通过 3=已拒绝")
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/dto/MemberInvoiceDTO.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/dto/MemberInvoiceDTO.java
index d5f0fc5..e6ef355 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/dto/MemberInvoiceDTO.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/dto/MemberInvoiceDTO.java
@@ -1,6 +1,7 @@
package com.ruoyi.order.dto;
import com.ruoyi.common.core.web.page.BasePage;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -8,6 +9,7 @@
import java.util.List;
@Data
+@ApiModel(value = "开发票传输对象", description = "开发票传输对象")
public class MemberInvoiceDTO extends BasePage {
@ApiModelProperty(value = "数据id")
private Integer id;
@@ -48,5 +50,5 @@
private String corporationAccount;
@ApiModelProperty(value = "订单编号List")
- private List<Integer> orderId;
+ private List<Long> orderId;
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderReturnRequestService.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderReturnRequestService.java
index cdf00c8..15f6fb3 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderReturnRequestService.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderReturnRequestService.java
@@ -20,8 +20,12 @@
*/
public interface IOrderReturnRequestService extends IService<OrderReturnRequest> {
- void saveOrderReturnRequest(OrderReturnDTO OrderReturnDTO);
+ OrderReturnVO saveOrderReturnRequest(OrderReturnDTO OrderReturnDTO);
void updOrderReturnRequest(@RequestBody OrderReturnDTO OrderReturnDTO);
+ void qxReturnRequest(@RequestBody OrderReturnDTO OrderReturnDTO);
+
+ void wlReturnRequest(@RequestBody OrderReturnDTO OrderReturnDTO);
+
OrderReturnVO OrderReturnRequestInfo(@RequestBody OrderReturnDTO OrderReturnDTO);
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java
index 9a4ee14..3277c38 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java
@@ -79,8 +79,8 @@
memberInvoice.setRiseType(memberInvoiceDTO.getRiseType());
this.save(memberInvoice);
- List<Integer> memberInvoiceOrderList=memberInvoiceDTO.getOrderId();
- for (Integer memberInvoiceOrder:memberInvoiceOrderList){
+ List<Long> memberInvoiceOrderList=memberInvoiceDTO.getOrderId();
+ for (Long memberInvoiceOrder:memberInvoiceOrderList){
MemberInvoiceOrder memberInvoiceOrder1=new MemberInvoiceOrder();
Order order= iOrderService.getById(memberInvoiceOrder);
order.setInvoiceStatus(1);
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 82324cd..91e39eb 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
@@ -59,6 +59,8 @@
*/
@Service
public class OrderReturnRequestServiceImpl extends ServiceImpl<OrderReturnRequestMapper, OrderReturnRequest> implements IOrderReturnRequestService {
+
+
@Resource
private SysUserClient sysUserClient;
@@ -71,7 +73,7 @@
@Resource
private PaylogServiceImpl paylogService;
@Override
- public void saveOrderReturnRequest(OrderReturnDTO OrderReturnDTO) {
+ public OrderReturnVO saveOrderReturnRequest(OrderReturnDTO OrderReturnDTO) {
Order order = orderMapper.selectById(OrderReturnDTO.getOrderId());
order.setOrderStatus(OrderStatusEnum.AFTER_SALE);
@@ -83,7 +85,7 @@
orderReturnRequest.setRequestReason(OrderReturnDTO.getRequestReason());
orderReturnRequest.setStatus(ReturnRequestStatusEnum.TO_BE_REVIEWED);
orderReturnRequest.setAuditStatus(AuditStatusEnum.TO_BE_REVIEWED);
- orderReturnRequest.setAlbum(OrderReturnDTO.toString());
+ orderReturnRequest.setAlbum(OrderReturnDTO.getAlbum());
CustomConfig returnAddressUserName = sysUserClient.getconfig("RETURN_ADDRESS_USER_NAME").getData();
orderReturnRequest.setRecipientName(returnAddressUserName.getConfigValue());
CustomConfig returnAddressUserPhone = sysUserClient.getconfig("RETURN_ADDRESS_USER_PHONE").getData();
@@ -91,6 +93,10 @@
CustomConfig returnAddressUserAddress = sysUserClient.getconfig("RETURN_ADDRESS_USER_ADDRESS").getData();
orderReturnRequest.setDetailedAddress(returnAddressUserAddress.getConfigValue());
this.save(orderReturnRequest);
+
+ OrderReturnRequest one = this.getById(orderReturnRequest.getId());
+ OrderReturnVO orderReturnVO = BeanUtils.copyBean(one, OrderReturnVO.class);
+ return orderReturnVO;
}
@@ -110,6 +116,25 @@
return orderReturnVO;
}
+ @Override
+ public void qxReturnRequest(OrderReturnDTO OrderReturnDTO) {
+ OrderReturnRequest byId = this.getById(OrderReturnDTO.getId());
+ byId.setStatus(ReturnRequestStatusEnum.QX);
+ Order order = orderMapper.selectById(byId.getOrderId());
+ order.setOrderStatus(OrderStatusEnum.FINISHED);
+ orderMapper.updateById(order);
+ this.updateById(byId);
+ }
+
+ @Override
+ public void wlReturnRequest(OrderReturnDTO OrderReturnDTO) {
+ OrderReturnRequest byId = this.getById(OrderReturnDTO.getId());
+ byId.setStatus(ReturnRequestStatusEnum.TO_BE_RECEIVED_BY_THE_PLATFORM);
+ byId.setLogisticsNum(OrderReturnDTO.getLogistics());
+ byId.setCourierNumber(OrderReturnDTO.getCourierNumber());
+ this.updateById(byId);
+ }
+
/**
* 获取售后管理列表分页数据
*
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 0e7ea2a..3dc4f91 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
@@ -250,6 +250,7 @@
BigDecimal pice=new BigDecimal(0);
Order order=new Order();
+ order.setMemberId(memberOrderDTO.getMemberId());
if (memberOrderDTO.getOrderFrom()==1){
order.setOrderFrom(OrderFromEnum.COMMODITY_ORDER);
order.setOrderNo(OrderUtil.getOrderNoForPrefix("SP"));
@@ -416,7 +417,7 @@
order.setOrderRemark(memberOrderDTO.getOrderRemark());
}if (memberOrderDTO.getGoodsQuantity()!=null){
if (order.getOrderFrom().getCode()==1){
- GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(memberOrderDTO.getGoodsSkuId(), SecurityConstants.INNER).getData();
+ GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
if (goodsSku.getStock()<memberOrderDTO.getGoodsQuantity()){
throw new ServiceException("对不起，购买数大于库存");
}else{
@@ -520,23 +521,24 @@
CouponMember data = promotionClient.getCouponMember(couponMemberDTO, SecurityConstants.INNER).getData();
- if (order.getCouponId()!=null){
+ if (order.getCouponId()!=0){
CouponMemberDTO couponMemberDTO1=new CouponMemberDTO();
couponMemberDTO1.setId(memberOrderDTO.getCouponId());
- couponMemberDTO1.setCouponStatus(1);
+ couponMemberDTO1.setCouponStatus(0);
promotionClient.updCouponMember(couponMemberDTO1, SecurityConstants.INNER);
}
+ order.setCouponId(data.getId());
if (data.getCouponType().getCode()==1){
if (pice.doubleValue()>=data.getFullReductionAmount().doubleValue()){
- pice.subtract(data.getReductionAmount());
+ pice=pice.subtract(data.getReductionAmount());
order.setDiscountMoney(data.getReductionAmount());
}
}
if (data.getCouponType().getCode()==2){
pice= order.getTotalAmount();
- pice.subtract(data.getVoucherAmount());
+ pice=pice.subtract(data.getVoucherAmount());
order.setDiscountMoney(data.getVoucherAmount());
}
if (data.getCouponType().getCode()==3){
@@ -557,11 +559,20 @@
order.setCouponId(memberOrderDTO.getCouponId());
CouponMemberDTO couponMemberDTO2=new CouponMemberDTO();
couponMemberDTO2.setId(memberOrderDTO.getCouponId());
- couponMemberDTO2.setCouponStatus(2);
+ couponMemberDTO2.setCouponStatus(1);
promotionClient.updCouponMember(couponMemberDTO2, SecurityConstants.INNER);
+ }else{
+ if (order.getCouponId()!=0){
+ CouponMemberDTO couponMemberDTO1=new CouponMemberDTO();
+ couponMemberDTO1.setId(order.getCouponId());
+ couponMemberDTO1.setCouponStatus(0);
+ promotionClient.updCouponMember(couponMemberDTO1, SecurityConstants.INNER);
+ }
+ order.setCouponId(0L);
+ order.setDiscountMoney(new BigDecimal(0));
}
order.setTotalAmount(pice);
@@ -588,7 +599,7 @@
memberOrderVO.setReceiverCity(order.getReceiverCity());
memberOrderVO.setReceiverDetailAddress(order.getReceiverDetailAddress());
memberOrderVO.setReceiverphone(order.getReceiverPhone());
- memberOrderVO.setYouhiPrice(order.getDiscountMoney());
+ memberOrderVO.setDiscountMoney(order.getDiscountMoney());
return memberOrderVO;
}
@@ -618,8 +629,9 @@
Wrappers.lambdaQuery(OrderReturnRequest.class)
.eq(OrderReturnRequest::getOrderId,
MemberOrderList.getId()).last("limit 1"));
- if (StringUtils.isNotNull(orderReturnRequest)) {
+ if (StringUtils.isNotNull(orderReturnRequest)&&orderReturnRequest!=null) {
MemberOrderList.setStatus(orderReturnRequest.getStatus());
+ MemberOrderList.setRequestId(orderReturnRequest.getId());
}
LambdaQueryWrapper<OrderAuctionBond> wrapper3= Wrappers.lambdaQuery();
wrapper3.eq(OrderAuctionBond::getOrderId,MemberOrderList.getId());
@@ -654,8 +666,9 @@
Wrappers.lambdaQuery(OrderReturnRequest.class)
.eq(OrderReturnRequest::getOrderId,
orderVO.getId()).last("limit 1"));
- if (StringUtils.isNotNull(orderReturnRequest)) {
+ if (StringUtils.isNotNull(orderReturnRequest)&&orderReturnRequest!=null) {
orderVO.setStatus(orderReturnRequest.getStatus());
+ orderVO.setRequestId(orderReturnRequest.getId());
}
LambdaQueryWrapper<OrderAuctionBond> wrapper3= Wrappers.lambdaQuery();
--
Gitblit v1.7.1