From e0502b670f7cdd957d3bc60365b49bbba32f1e45 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 17 六月 2024 11:16:11 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-promotion/src/main/resources/bootstrap.yml | 1 +
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 7 ++++++-
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/management/vo/MgtCouponVO.java | 3 ++-
3 files changed, 9 insertions(+), 2 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 8fdd137..0e7ea2a 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
@@ -54,7 +54,11 @@
import com.ruoyi.system.api.domain.dto.MemberOrderListDTO;
import com.ruoyi.system.api.domain.dto.OrderDTO;
import com.ruoyi.system.api.domain.dto.updMembeOneDTO;
-import com.ruoyi.system.api.domain.vo.*;
+import com.ruoyi.system.api.domain.vo.Express100VO;
+import com.ruoyi.system.api.domain.vo.MemberOrderListVO;
+import com.ruoyi.system.api.domain.vo.MemberOrderNumVO;
+import com.ruoyi.system.api.domain.vo.MemberTiOrderVO;
+import com.ruoyi.system.api.domain.vo.OrderVO;
import com.ruoyi.system.api.feignClient.AuctionClient;
import com.ruoyi.system.api.feignClient.GoodsSkuClient;
import com.ruoyi.system.api.feignClient.MemberClient;
@@ -862,6 +866,7 @@
query.getSkuName())
.eq(StringUtils.isNotNull(query.getOrderStatus()), Order::getOrderStatus,
query.getOrderStatus())
+ .orderByDesc(Order::getCreateTime)
.page(new Page<>(query.getPageCurr(), query.getPageSize()));
if (StringUtils.isEmpty(page.getRecords())) {
pageVO = PageDTO.empty(page);
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/management/vo/MgtCouponVO.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/management/vo/MgtCouponVO.java
index b37ee48..90f19b4 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/management/vo/MgtCouponVO.java
+++ b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/management/vo/MgtCouponVO.java
@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.enums.CouponTypeEnum;
import com.ruoyi.common.core.enums.DistributionMethodEnum;
+import com.ruoyi.common.core.enums.ListingStatusEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.math.BigDecimal;
@@ -27,7 +28,7 @@
private CouponTypeEnum couponType;
@ApiModelProperty(value = "状态 0=已上架 1=已下架")
- private Integer couponStatus;
+ private ListingStatusEnum couponStatus;
@ApiModelProperty(value = "满减金额，例如：满100元")
private BigDecimal fullReductionAmount;
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-promotion/src/main/resources/bootstrap.yml
index 2d3960a..7042ef6 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-promotion/src/main/resources/bootstrap.yml
@@ -21,6 +21,7 @@
service: ${spring.application.name}
group: DEFAULT_GROUP
namespace: 689e0f09-d102-460c-ac5c-5ea50a3174be
+ ip: 192.168.110.188
config:
# 配置中心地址
server-addr: 127.0.0.1:8858
--
Gitblit v1.7.1