From 95639988ed630dae4b2461b5f6c3ccb6d9af8d86 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 18 七月 2024 23:46:36 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 64 ++++++++++++++++++++++++++++----
1 files changed, 56 insertions(+), 8 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 595a1a4..c01e6a1 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
@@ -36,7 +36,18 @@
import com.ruoyi.order.util.OrderUtil;
import com.ruoyi.order.util.SinataUtil;
import com.ruoyi.system.api.constants.DelayTaskEnum;
-import com.ruoyi.system.api.domain.*;
+import com.ruoyi.system.api.domain.AuctionSalesroom;
+import com.ruoyi.system.api.domain.CouponMember;
+import com.ruoyi.system.api.domain.CustomConfig;
+import com.ruoyi.system.api.domain.DelayTask;
+import com.ruoyi.system.api.domain.GoodsGroupPurchase;
+import com.ruoyi.system.api.domain.GoodsGroupPurchaseInfo;
+import com.ruoyi.system.api.domain.GoodsSeckill;
+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.Order;
+import com.ruoyi.system.api.domain.OrderAuctionBond;
import com.ruoyi.system.api.domain.dto.CouponMemberDTO;
import com.ruoyi.system.api.domain.dto.GoodsStockUpdDTO;
import com.ruoyi.system.api.domain.dto.HomeGoodsSkuDTO;
@@ -60,7 +71,10 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDateTime;
-import java.util.*;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
import java.util.regex.Matcher;
@@ -71,6 +85,7 @@
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
/**
* <p>
@@ -123,6 +138,7 @@
private GoodsSkuClient GoodsSkuClient;
+
@Override
public void saveOrderOne(OrderDTO OrderDTO) {
Order order=new Order();
@@ -162,6 +178,7 @@
order.setSkuName(OrderDTO.getSkuName());
order.setPrice(OrderDTO.getPrice());
order.setCoverPic(OrderDTO.getCoverPic());
+ order.setOrderTimeSx(OrderDTO.getOrderTimeSx());
this.save(order);
if (OrderDTO.getOrderFrom().getCode()==4){
@@ -381,8 +398,6 @@
memberOrderVO.setYouhiPrice(data.getGroupPurchasePrice());
pice=data.getGroupPurchasePrice();
-
-
order.setSkuName(goodsSku.getSkuName());
order.setPrice(data.getGroupPurchasePrice());
order.setCoverPic(goodsSku.getCoverPic());
@@ -412,6 +427,11 @@
order.setReceiverCity(data.getReceiverCity());
order.setReceiverDetailAddress(data.getDetailedAddress());
order.setReceiverPhone(data.getRecipientPhone());
+
+ memberOrderVO.setReceiverName(data.getRecipientName());
+ memberOrderVO.setReceiverCity(data.getReceiverCity());
+ memberOrderVO.setReceiverDetailAddress(data.getDetailedAddress());
+ memberOrderVO.setReceiverphone(data.getRecipientPhone());
}
order.setGoodsSkuId(memberOrderDTO.getGoodsSkuId());
@@ -687,7 +707,7 @@
Page<Order> page = new Page<>(memberOrderListDTO.getPageCurr(), memberOrderListDTO.getPageSize());
LambdaQueryWrapper<Order> wrapper= Wrappers.lambdaQuery();
wrapper.eq(Order::getMemberId,memberOrderListDTO.getMemberId());
- if(memberOrderListDTO.getGoodsSkuName()!=null){
+ if(memberOrderListDTO.getGoodsSkuName()!=null&&memberOrderListDTO.getGoodsSkuName()!=""){
wrapper.like(Order::getSkuName,memberOrderListDTO.getGoodsSkuName());
}
if(memberOrderListDTO.getOrderNo()!=null){
@@ -1172,8 +1192,9 @@
pageVO = PageDTO.empty(page);
}
pageVO = PageDTO.of(page, MgtOrderVO.class);
+ List<MgtOrderVO> voList = pageVO.getList();
if (query.getOrderFrom() == OrderFromEnum.AUCTION_ORDERS) {
- List<MgtOrderVO> list = pageVO.getList();
+ List<MgtOrderVO> list = voList;
// 封装参数查询拍卖会
Set<Long> auctionSalesroomGoodsIdSet = list.stream()
.filter(order -> order.getAuctionType() == AuctionOrderTypeEnum.AUCTION_ITEMS)
@@ -1238,6 +1259,19 @@
}
});
}
+ Set<Long> memberVoIdSet = voList.stream().map(MgtOrderVO::getMemberId)
+ .collect(Collectors.toSet());
+ List<Member> data = memberClient.getMemberListByIds(memberVoIdSet, SecurityConstants.INNER)
+ .getData();
+ Map<Long, Member> memberMap = data.stream()
+ .collect(Collectors.toMap(Member::getId, e -> e));
+ voList = voList.stream().peek(order -> {
+ Member member = memberMap.get(order.getMemberId());
+ if (StringUtils.isNotNull(member)) {
+ order.setNickname(member.getNickname());
+ order.setPhone(member.getPhone());
+ }
+ }).collect(Collectors.toList());
return pageVO;
}
@@ -1269,7 +1303,7 @@
}
}
// 查询售后信息
- if (order.getOrderStatus() == OrderStatusEnum.AFTER_SALE) {
+ if (order.getIsRequest() == 2) {
OrderReturnRequest orderReturnRequest = orderReturnRequestService.getOne(
Wrappers.lambdaQuery(OrderReturnRequest.class)
.eq(OrderReturnRequest::getOrderId,
@@ -1340,6 +1374,7 @@
* @param id 订单id
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public void refund(Long id) {
Order order = getOrder(id);
String orderNo = order.getOrderNo();
@@ -1362,6 +1397,8 @@
orderReturnRequest.setAuditStatus(AuditStatusEnum.PASSED);
orderReturnRequestService.save(orderReturnRequest);
}
+ order.setIsRequest(2);
+ this.updateById(order);
}
private boolean handleRefund(PaymentMethodEnum paymentMethod, Paylog paylog, String orderNo) {
@@ -1396,7 +1433,7 @@
Order order = getOrder(id);
if (order.getOrderStatus() == OrderStatusEnum.FINISHED) {
OrderReturnRequest orderReturnRequest = new OrderReturnRequest();
- order.setOrderStatus(OrderStatusEnum.AFTER_SALE);
+ order.setIsRequest(2);
this.updateById(order);
MgtAfterSaleSettingDTO data = sysUserClient.getAfterSaleSetting().getData();
if (StringUtils.isNull(data)) {
@@ -1479,4 +1516,15 @@
public List<Order> getStaticsOrderList(LocalDateTime startTime, LocalDateTime endTime) {
return baseMapper.getStaticsOrderList(startTime, endTime);
}
+
+ @Override
+ public List<Order> getOrderListByMubres(List<String> mubres) {
+ return this.lambdaQuery().in(Order::getGroupNo, mubres).list();
+ }
+
+ @Override
+ public void updateOrderStatusByMubres(List<String> formedGroupMubres) {
+ this.lambdaUpdate().set(Order::getIsOrder, 1).in(Order::getGroupNo, formedGroupMubres)
+ .update();
+ }
}
--
Gitblit v1.7.1