From 3c57e41dcef44b5d0994ab7c6edc12ec4c289803 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 14 六月 2024 19:04:09 +0800
Subject: [PATCH] 用户端商品
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 87 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 76 insertions(+), 11 deletions(-)
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 ceca2e9..0911361 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
@@ -74,7 +74,10 @@
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import javax.annotation.Resource;
+
import lombok.Synchronized;
+
+import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import org.springframework.stereotype.Service;
@@ -125,6 +128,10 @@
@Resource
private AuctionClient auctionClient;
+ @Resource
+ private GoodsSkuClient GoodsSkuClient;
+
+
@Override
public void saveOrderOne(OrderDTO OrderDTO) {
Order order=new Order();
@@ -153,7 +160,7 @@
order.setPoints(OrderDTO.getPoints());
order.setGoodsQuantity(OrderDTO.getGoodsQuantity());
order.setReceiverName(OrderDTO.getReceiverName());
- order.setReceiverphone(OrderDTO.getReceiverphone());
+ order.setReceiverPhone(OrderDTO.getReceiverphone());
order.setReceiverCity(OrderDTO.getReceiverCity());
order.setReceiverDetailAddress(OrderDTO.getReceiverDetailAddress());
order.setBound(OrderDTO.getBound());
@@ -302,7 +309,8 @@
GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(data.getGoodsSkuId(), SecurityConstants.INNER).getData();
memberOrderVO.setGoodsSkuId(memberOrderDTO.getGoodsSkuId());
- memberOrderVO.setPrice(goodsSku.getPrice());
+ memberOrderVO.setPrice(data.getSeckillPrice());
+ memberOrderVO.setSjPrice(goodsSku.getPrice());
memberOrderVO.setCoverPic(goodsSku.getCoverPic());
memberOrderVO.setSkuName(goodsSku.getSkuName());
memberOrderVO.setYouhiPrice(data.getSeckillPrice());
@@ -327,7 +335,8 @@
GoodsGroupPurchase data = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseOne(memberOrderDTO.getGoodsSkuId(), SecurityConstants.INNER).getData();
GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(data.getGoodsSkuId(), SecurityConstants.INNER).getData();
memberOrderVO.setGoodsSkuId(memberOrderDTO.getGoodsSkuId());
- memberOrderVO.setPrice(goodsSku.getPrice());
+ memberOrderVO.setPrice(data.getGroupPurchasePrice());
+ memberOrderVO.setSjPrice(goodsSku.getPrice());
memberOrderVO.setCoverPic(goodsSku.getCoverPic());
memberOrderVO.setSkuName(goodsSku.getSkuName());
memberOrderVO.setYouhiPrice(data.getGroupPurchasePrice());
@@ -355,7 +364,7 @@
order.setReceiverName(memberOrderDTO.getReceiverName());
order.setReceiverCity(memberOrderDTO.getReceiverCity());
order.setReceiverDetailAddress(memberOrderDTO.getReceiverDetailAddress());
- order.setReceiverphone(memberOrderDTO.getReceiverphone());
+ order.setReceiverPhone(memberOrderDTO.getReceiverphone());
}else{
MemberAddress data = memberClient.getMemberAddressOne(
memberOrderDTO.getMemberId(), SecurityConstants.INNER).getData();
@@ -363,7 +372,7 @@
order.setReceiverName(data.getRecipientName());
order.setReceiverCity(data.getReceiverCity());
order.setReceiverDetailAddress(data.getDetailedAddress());
- order.setReceiverphone(data.getRecipientPhone());
+ order.setReceiverPhone(data.getRecipientPhone());
}
}
@@ -384,7 +393,7 @@
memberOrderVO.setReceiverName(order.getReceiverName());
memberOrderVO.setReceiverCity(order.getReceiverCity());
memberOrderVO.setReceiverDetailAddress(order.getReceiverDetailAddress());
- memberOrderVO.setReceiverphone(order.getReceiverphone());
+ memberOrderVO.setReceiverphone(order.getReceiverPhone());
Integer delayTime = 30;
redisService.setCacheObject(CacheConstants.ORDER_AUTOMATIC_CANCEL + "-" + order.getId(), order.getId() , delayTime.longValue(), TimeUnit.MINUTES);
@@ -399,7 +408,7 @@
order.setReceiverName(memberOrderDTO.getReceiverName());
order.setReceiverCity(memberOrderDTO.getReceiverCity());
order.setReceiverDetailAddress(memberOrderDTO.getReceiverDetailAddress());
- order.setReceiverphone(memberOrderDTO.getReceiverphone());
+ order.setReceiverPhone(memberOrderDTO.getReceiverphone());
}
if (memberOrderDTO.getOrderRemark()!=null){
order.setOrderRemark(memberOrderDTO.getOrderRemark());
@@ -539,7 +548,7 @@
memberOrderVO.setReceiverName(order.getReceiverName());
memberOrderVO.setReceiverCity(order.getReceiverCity());
memberOrderVO.setReceiverDetailAddress(order.getReceiverDetailAddress());
- memberOrderVO.setReceiverphone(order.getReceiverphone());
+ memberOrderVO.setReceiverphone(order.getReceiverPhone());
memberOrderVO.setYouhiPrice(order.getDiscountMoney());
return memberOrderVO;
@@ -550,14 +559,44 @@
Page<Order> page = new Page<>(memberOrderListDTO.getPageCurr(), memberOrderListDTO.getPageSize());
LambdaQueryWrapper<Order> wrapper= Wrappers.lambdaQuery();
wrapper.eq(Order::getMemberId,memberOrderListDTO.getMemberId());
- wrapper.like(Order::getSkuName,memberOrderListDTO.getGoodsSkuName());
- wrapper.like(Order::getOrderNo,memberOrderListDTO.getOrderNo());
- wrapper.eq(Order::getOrderStatus,memberOrderListDTO.getOrderStatus());
+ if(memberOrderListDTO.getGoodsSkuName()!=null){
+ wrapper.like(Order::getSkuName,memberOrderListDTO.getGoodsSkuName());
+ }
+ if(memberOrderListDTO.getOrderNo()!=null){
+ wrapper.like(Order::getOrderNo,memberOrderListDTO.getOrderNo());
+ }
+ if(memberOrderListDTO.getOrderStatus()!=null){
+ wrapper.eq(Order::getOrderStatus,memberOrderListDTO.getOrderStatus().getCode());
+ }
wrapper.eq(Order::getDelFlag,0);
wrapper.orderByDesc(Order::getCancelTime);
Page<Order> page1 = this.page(page, wrapper);
PageDTO<MemberOrderListVO> memberOrderListVOPageDTO = PageDTO.of(page1, MemberOrderListVO.class);
+ List<MemberOrderListVO> list = memberOrderListVOPageDTO.getList();
+ for (MemberOrderListVO MemberOrderList:list){
+ OrderReturnRequest orderReturnRequest = orderReturnRequestService.getOne(
+ Wrappers.lambdaQuery(OrderReturnRequest.class)
+ .eq(OrderReturnRequest::getOrderId,
+ MemberOrderList.getId()).last("limit 1"));
+ if (StringUtils.isNotNull(orderReturnRequest)) {
+ MemberOrderList.setStatus(orderReturnRequest.getStatus());
+ }
+ LambdaQueryWrapper<OrderAuctionBond> wrapper3= Wrappers.lambdaQuery();
+ wrapper3.eq(OrderAuctionBond::getOrderId,MemberOrderList.getId());
+ OrderAuctionBond orderAuctionBond = orderAuctionBondMapper.selectOne(wrapper3);
+ if (orderAuctionBond!=null){
+ if (orderAuctionBond.getBoundStatus().getCode()==1||orderAuctionBond.getBoundStatus().getCode()==2){
+ MemberOrderList.setIsAuctionBond(1);
+ }else{
+ MemberOrderList.setIsAuctionBond(2);
+ }
+ }else {
+ MemberOrderList.setIsAuctionBond(1);
+ }
+ }
+
+
return memberOrderListVOPageDTO;
}
@@ -567,6 +606,32 @@
OrderVO orderVO=new OrderVO();
try {
orderVO = BeanUtils.copyBean(order, OrderVO.class);
+ if (orderVO.getOrderFrom().getCode()==3){
+ GoodsGroupPurchase data = GoodsSkuClient.getGoodsSeckiGoodsGroupPurchaseOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
+ orderVO.setGroupTime(data.getGroupTime());
+ }
+
+ OrderReturnRequest orderReturnRequest = orderReturnRequestService.getOne(
+ Wrappers.lambdaQuery(OrderReturnRequest.class)
+ .eq(OrderReturnRequest::getOrderId,
+ orderVO.getId()).last("limit 1"));
+ if (StringUtils.isNotNull(orderReturnRequest)) {
+ orderVO.setStatus(orderReturnRequest.getStatus());
+ }
+
+ LambdaQueryWrapper<OrderAuctionBond> wrapper3= Wrappers.lambdaQuery();
+ wrapper3.eq(OrderAuctionBond::getOrderId,order.getId());
+ OrderAuctionBond orderAuctionBond = orderAuctionBondMapper.selectOne(wrapper3);
+ if (orderAuctionBond!=null){
+ if (orderAuctionBond.getBoundStatus().getCode()==1||orderAuctionBond.getBoundStatus().getCode()==2){
+ orderVO.setIsAuctionBond(1);
+ }else{
+ orderVO.setIsAuctionBond(2);
+ }
+ }else {
+ orderVO.setIsAuctionBond(1);
+ }
+
} catch (Exception e) {
throw new RuntimeException(e);
}
--
Gitblit v1.7.1