From 53aaef5c3c3521ca7a173ffe481b7f9f8020a382 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期三, 31 七月 2024 09:26:37 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 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 73b7bee..8b6c194 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
@@ -789,7 +789,7 @@
}
wrapper.eq(Order::getIsOrder,1);
wrapper.eq(Order::getDelFlag,0);
- wrapper.orderByDesc(Order::getCancelTime);
+ wrapper.orderByDesc(Order::getCreateTime);
Page<Order> page1 = this.page(page, wrapper);
PageDTO<MemberOrderListVO> memberOrderListVOPageDTO = PageDTO.of(page1, MemberOrderListVO.class);
@@ -886,6 +886,7 @@
try {
orderVO = BeanUtils.copyBean(order, OrderVO.class);
orderVO.setAuctionType(order.getAuctionOrderType());
+ orderVO.setCouponId(order.getCouponId());
if (orderVO.getOrderFrom().getCode()==3){
GoodsGroupPurchase data = GoodsSkuClient.getGoodsSeckiGoodsGroupPurchaseOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
orderVO.setGroupTime(data.getGroupTime());
@@ -981,6 +982,7 @@
goodsGroupPurchaseInfo.setMubre(order.getGroupNo());
GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = GoodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo2(order.getGroupNo(), SecurityConstants.INNER).getData();
if (goodsSeckiGoodsGroupPurchaseInfo!=null){
+ goodsSeckiGoodsGroupPurchaseInfo.setPurchaseNum(order.getGoodsQuantity());
GoodsSkuClient.updgoodsGroupPurchaseInfo1(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER);
}
@@ -1023,6 +1025,7 @@
goodsGroupPurchaseInfo.setMubre(order.getGroupNo());
GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = GoodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo2(order.getGroupNo(), SecurityConstants.INNER).getData();
if (goodsSeckiGoodsGroupPurchaseInfo!=null){
+ goodsSeckiGoodsGroupPurchaseInfo.setPurchaseNum(order.getGoodsQuantity());
GoodsSkuClient.updgoodsGroupPurchaseInfo1(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER);
}
@@ -1088,11 +1091,9 @@
Order byId = this.getById(memberOrderListDTO.getId());
if(byId.getOrderNo().contains("TG")){
- GoodsGroupPurchaseInfo goodsGroupPurchaseInfo =new GoodsGroupPurchaseInfo();
- goodsGroupPurchaseInfo.setGroupPurchaseId(byId.getGoodsSkuId());
- goodsGroupPurchaseInfo.setMubre(byId.getGroupNo());
- GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = GoodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo1(goodsGroupPurchaseInfo, SecurityConstants.INNER).getData();
+ GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = GoodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo2(byId.getGroupNo(), SecurityConstants.INNER).getData();
if (goodsSeckiGoodsGroupPurchaseInfo!=null){
+ goodsSeckiGoodsGroupPurchaseInfo.setPurchaseNum(byId.getGoodsQuantity());
GoodsSkuClient.updgoodsGroupPurchaseInfo1(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER);
}
@@ -1310,6 +1311,7 @@
wrapper1.eq(Order::getOrderFrom,3);
wrapper1.eq(Order::getDelFlag,0);
wrapper1.eq(Order::getOrderStatus,2);
+ wrapper1.orderByDesc(Order::getCreateTime);
Page<Order> page = new Page<>(homeGoodsSkuDTO1.getPageCurr(), homeGoodsSkuDTO1.getPageSize());
Page< Order> page1 = this.page(page, wrapper1);
PageDTO<WdOrderVO> HomeGoodsSeckillVOPageDTO = PageDTO.of(page1, WdOrderVO.class);
@@ -1813,6 +1815,9 @@
@Override
public List<Order> updateOrderStatusByMubres2(String formedGroupMubres) {
- return this.lambdaQuery().eq(Order::getGroupNo, formedGroupMubres).list();
+ LambdaQueryWrapper<Order> wrapper = Wrappers.lambdaQuery();
+ wrapper.eq(Order::getGroupNo, formedGroupMubres);
+ List<Order> page1 = this.list(wrapper);
+ return page1;
}
}
--
Gitblit v1.7.1