From 5814d15a328979d3d97a65a8e6e3e70b5204ca32 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 15 七月 2024 11:36:26 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/dto/MgtAuctionSalesroomDTO.java | 1
ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml | 16 +-
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java | 12 +
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java | 18 ++
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java | 3
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/GoodsGroupPurchaseInfoMapper.java | 16 ++
/dev/null | 74 ------------
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java | 12 +
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/OrderClient.java | 4
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsGroupPurchaseInfoServiceImpl.java | 21 +++
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java | 2
ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsGroupPurchaseInfoMapper.xml | 5
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/GoodsGroupPurchaseInfo.java | 62 ++++++++++
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/forepart/GoodsGroupPurchaseInfoController.java | 19 +++
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/dto/MgtAuctionGoodsDTO.java | 1
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 2
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/StateCloudObsUtil.java | 19 ++
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/IGoodsGroupPurchaseInfoService.java | 16 ++
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillAppointmentServiceImpl.java | 10 -
19 files changed, 204 insertions(+), 109 deletions(-)
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 46d0d63..4882d3e 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
@@ -154,8 +154,8 @@
/**
* 根据优惠券id集合查询订单列表
*
- * @param couponIdSet 优惠券id集合
- * @param inner 内部调用标志
+ * @param couponIds 优惠券id集合
+ * @param source 内部调用标志
* @return List<Order>
*/
@PostMapping("/order/list-by-coupon")
diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java
index 5fdd992..9f8a426 100644
--- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java
+++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java
@@ -39,6 +39,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -347,6 +348,8 @@
.in(StringUtils.isNotEmpty(memberIdSet), Article::getMemberId, memberIdSet)
.eq(StringUtils.isNotNull(query.getListingStatus()), Article::getListingStatus,
query.getListingStatus())
+ .eq(StringUtils.isNotNull(query.getArticleType()), Article::getArticleType,
+ query.getArticleType())
.like(StringUtils.isNotBlank(query.getTitle()), Article::getTitle, query.getTitle())
.orderByDesc(Article::getReported)
.page(new Page<>(query.getPageCurr(), query.getPageSize()));
@@ -376,6 +379,10 @@
Set<Long> memIds = voList.stream().filter(articleVO -> articleVO.getArticleType()
.equals(ArticleTypeEnum.USER_POSTING)).map(MgtArticleVO::getMemberId).collect(
Collectors.toSet());
+ Set<Long> memIds2 = voList.stream().map(MgtArticleVO::getReportBy).filter(
+ Objects::nonNull).map(Long::valueOf).collect(
+ Collectors.toSet());
+ memIds.addAll(memIds2);
if (StringUtils.isNotEmpty(memIds)) {
List<Member> memberList = memberClient.getMemberListByIds(memIds,
SecurityConstants.INNER).getData();
@@ -384,7 +391,7 @@
} else {
memberMap = null;
}
- if (StringUtils.isNotNull(userMap)) {
+ if (StringUtils.isNotEmpty(userMap)) {
voList.stream().filter(articleVO -> articleVO.getArticleType()
.equals(ArticleTypeEnum.PLATFORM_RELEASE)).forEach(articleVO -> {
SysUser sysUser = userMap.get(Long.valueOf(articleVO.getCreateBy()));
@@ -394,7 +401,7 @@
}
});
}
- if (StringUtils.isNotNull(memberMap)) {
+ if (StringUtils.isNotEmpty(memberMap)) {
voList.stream().filter(articleVO -> articleVO.getArticleType()
.equals(ArticleTypeEnum.USER_POSTING)).forEach(articleVO -> {
Member member = memberMap.get(articleVO.getMemberId());
@@ -403,6 +410,13 @@
articleVO.setPhone(member.getPhone());
}
});
+ voList.stream().filter(articleVO -> articleVO.getReported().equals(Boolean.TRUE))
+ .peek(articleVO -> {
+ Member member = memberMap.get(Long.valueOf(articleVO.getReportBy()));
+ if (StringUtils.isNotNull(member)) {
+ articleVO.setReportBy(member.getNickname());
+ }
+ }).collect(Collectors.toList());
}
return pageVO;
}
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/dto/MgtAuctionGoodsDTO.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/dto/MgtAuctionGoodsDTO.java
index 254a5cf..b7d9304 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/dto/MgtAuctionGoodsDTO.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/dto/MgtAuctionGoodsDTO.java
@@ -47,7 +47,6 @@
private Integer auctionStock;
@ApiModelProperty(value = "保证金")
- @NotNull(message = "保证金不能为空")
private BigDecimal bond;
@ApiModelProperty(value = "实名认证 0=不需实名 1=需要实名")
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/dto/MgtAuctionSalesroomDTO.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/dto/MgtAuctionSalesroomDTO.java
index 89cf1e1..793b2b0 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/dto/MgtAuctionSalesroomDTO.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/dto/MgtAuctionSalesroomDTO.java
@@ -47,7 +47,6 @@
private AuthenticationEnum authentication;
@ApiModelProperty(value = "拍卖场说明")
- @NotBlank(message = "拍卖场说明不能为空")
private String description;
@ApiModelProperty(value = "拍卖场封面图")
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 cdcd3ee..8b60268 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
@@ -274,13 +274,17 @@
.collect(Collectors.toSet());
List<Member> memberList = memberClient.
getMemberListByIds(collect, SecurityConstants.INNER).getData();
- Map<Long, String> memberMap = memberList.stream()
- .collect(Collectors.toMap(Member::getId, Member::getNickname));
+ Map<Long, Member> memberMap = memberList.stream()
+ .collect(Collectors.toMap(Member::getId, e -> e));
List<MgtAuctionBidRecordVO> mgtAuctionBidRecordVOS = BeanUtils.copyList(list,
MgtAuctionBidRecordVO.class);
for (MgtAuctionBidRecordVO vo : mgtAuctionBidRecordVOS) {
- String memberName = memberMap.get(vo.getMemberId());
- vo.setMemberName(StringUtils.isNotEmpty(memberName) ? memberName : "");
+ Member member = memberMap.get(vo.getMemberId());
+ if (StringUtils.isNotNull(member)) {
+ vo.setMemberName(member.getNickname());
+ vo.setPhone(member.getPhone());
+ }
+
}
auctionGoodsVO.setRecordList(mgtAuctionBidRecordVOS);
}
diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java
index 56dae85..3a8113f 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java
@@ -3,6 +3,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.file.FileUtils;
import com.ruoyi.file.service.ISysFileService;
+import com.ruoyi.file.utils.StateCloudObsUtil;
import com.ruoyi.system.api.domain.SysFile;
import io.swagger.annotations.ApiOperation;
import java.io.InputStream;
@@ -60,8 +61,8 @@
public R<String> obsUpload(@RequestPart("file") MultipartFile file) {
try {
// 上传并返回访问地址
-
- return R.ok("1");
+ String url = StateCloudObsUtil.uploadFile(file);
+ return R.ok(url);
} catch (Exception e) {
log.error("上传文件失败", e);
return R.fail(e.getMessage());
@@ -77,7 +78,8 @@
List<String> urls = new ArrayList<>();
try {
for (MultipartFile multipartFile : file) {
- urls.add("1");
+ String url = StateCloudObsUtil.uploadFile(multipartFile);
+ urls.add(url);
}
// 上传并返回访问地址
return R.ok(urls);
@@ -92,8 +94,8 @@
@RequestParam("stream") InputStream stream) {
try {
// 上传并返回访问地址
-
- return R.ok("1");
+ String url = StateCloudObsUtil.obsUploadStream(code, stream);
+ return R.ok(url);
} catch (Exception e) {
log.error("上传文件失败", e);
return R.fail(e.getMessage());
diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/StateCloudObsUtil.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/StateCloudObsUtil.java
index 5229da9..a64ce85 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/StateCloudObsUtil.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/StateCloudObsUtil.java
@@ -1,18 +1,29 @@
-/*
+
package com.ruoyi.file.utils;
+import com.amazonaws.ClientConfiguration;
+import com.amazonaws.Protocol;
+import com.amazonaws.auth.AWSCredentials;
+import com.amazonaws.auth.AWSStaticCredentialsProvider;
+import com.amazonaws.auth.BasicAWSCredentials;
+import com.amazonaws.client.builder.AwsClientBuilder.EndpointConfiguration;
+import com.amazonaws.services.s3.AmazonS3;
+import com.amazonaws.services.s3.AmazonS3ClientBuilder;
+import com.amazonaws.services.s3.model.ObjectMetadata;
+import com.amazonaws.services.s3.model.PutObjectRequest;
+import com.amazonaws.services.s3.model.PutObjectResult;
+import java.io.IOException;
import java.io.InputStream;
import java.util.UUID;
import org.springframework.web.multipart.MultipartFile;
-*/
/**
* 天翼云OBS 工具类
*
* @author mitao
* @date 2024/6/17
- *//*
+ */
public class StateCloudObsUtil {
@@ -98,4 +109,4 @@
return fileName;
}
}
-*/
+
diff --git a/ruoyi-modules/ruoyi-file/target/classes/banner.txt b/ruoyi-modules/ruoyi-file/target/classes/banner.txt
deleted file mode 100644
index 27cacb9..0000000
--- a/ruoyi-modules/ruoyi-file/target/classes/banner.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Spring Boot Version: ${spring-boot.version}
-Spring Application Name: ${spring.application.name}
- _ __ _ _
- (_) / _|(_)| |
- _ __ _ _ ___ _ _ _ ______ | |_ _ | | ___
-| '__|| | | | / _ \ | | | || ||______|| _|| || | / _ \
-| | | |_| || (_) || |_| || | | | | || || __/
-|_| \__,_| \___/ \__, ||_| |_| |_||_| \___|
- __/ |
- |___/
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-file/target/classes/bootstrap.yml b/ruoyi-modules/ruoyi-file/target/classes/bootstrap.yml
deleted file mode 100644
index 689be79..0000000
--- a/ruoyi-modules/ruoyi-file/target/classes/bootstrap.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-# Tomcat
-server:
- port: 9300
-# Spring
-spring:
- application:
- # 应用名称
- name: ruoyi-file
- profiles:
- # 环境配置
- active: dev
----
-spring:
- config:
- activate:
- on-profile: dev
- cloud:
- nacos:
- discovery:
- # 服务注册地址
- server-addr: 127.0.0.1:8858
- service: ${spring.application.name}
- group: DEFAULT_GROUP
- namespace: 689e0f09-d102-460c-ac5c-5ea50a3174be
- config:
- # 配置中心地址
- server-addr: 127.0.0.1:8858
- namespace: 689e0f09-d102-460c-ac5c-5ea50a3174be
- group: DEFAULT_GROUP
- name: ${spring.application.name}
- # 配置文件格式
- file-extension: yml
- # 共享配置
- shared-configs:
- - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/ruoyi-modules/ruoyi-file/target/classes/logback.xml b/ruoyi-modules/ruoyi-file/target/classes/logback.xml
deleted file mode 100644
index ed6c17d..0000000
--- a/ruoyi-modules/ruoyi-file/target/classes/logback.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
- <!-- 日志存放路径 -->
- <property name="log.path" value="logs/ruoyi-file" />
- <!-- 日志输出格式 -->
- <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
-
- <!-- 控制台输出 -->
- <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>${log.pattern}</pattern>
- </encoder>
- </appender>
-
- <!-- 系统日志输出 -->
- <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${log.path}/info.log</file>
- <!-- 循环政策：基于时间创建日志文件 -->
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <!-- 日志文件名格式 -->
- <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
- <!-- 日志最大的历史 60天 -->
- <maxHistory>60</maxHistory>
- </rollingPolicy>
- <encoder>
- <pattern>${log.pattern}</pattern>
- </encoder>
- <filter class="ch.qos.logback.classic.filter.LevelFilter">
- <!-- 过滤的级别 -->
- <level>INFO</level>
- <!-- 匹配时的操作：接收（记录） -->
- <onMatch>ACCEPT</onMatch>
- <!-- 不匹配时的操作：拒绝（不记录） -->
- <onMismatch>DENY</onMismatch>
- </filter>
- </appender>
-
- <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${log.path}/error.log</file>
- <!-- 循环政策：基于时间创建日志文件 -->
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <!-- 日志文件名格式 -->
- <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
- <!-- 日志最大的历史 60天 -->
- <maxHistory>60</maxHistory>
- </rollingPolicy>
- <encoder>
- <pattern>${log.pattern}</pattern>
- </encoder>
- <filter class="ch.qos.logback.classic.filter.LevelFilter">
- <!-- 过滤的级别 -->
- <level>ERROR</level>
- <!-- 匹配时的操作：接收（记录） -->
- <onMatch>ACCEPT</onMatch>
- <!-- 不匹配时的操作：拒绝（不记录） -->
- <onMismatch>DENY</onMismatch>
- </filter>
- </appender>
-
- <!-- 系统模块日志级别控制 -->
- <logger name="com.ruoyi" level="info" />
- <!-- Spring日志级别控制 -->
- <logger name="org.springframework" level="warn" />
-
- <root level="info">
- <appender-ref ref="console" />
- </root>
-
- <!--系统操作日志-->
- <root level="info">
- <appender-ref ref="file_info" />
- <appender-ref ref="file_error" />
- </root>
-</configuration>
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/forepart/GoodsGroupPurchaseInfoController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/forepart/GoodsGroupPurchaseInfoController.java
new file mode 100644
index 0000000..03d73e1
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/forepart/GoodsGroupPurchaseInfoController.java
@@ -0,0 +1,19 @@
+package com.ruoyi.goods.controller.forepart;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 团购商品的成团 前端控制器
+ * </p>
+ *
+ * @author mitao
+ * @since 2024-07-15
+ */
+@RestController
+@RequestMapping("/goods-group-purchase-info")
+public class GoodsGroupPurchaseInfoController {
+
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/GoodsGroupPurchaseInfo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/GoodsGroupPurchaseInfo.java
new file mode 100644
index 0000000..95aa941
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/GoodsGroupPurchaseInfo.java
@@ -0,0 +1,62 @@
+package com.ruoyi.goods.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 团购商品的成团
+ * </p>
+ *
+ * @author mitao
+ * @since 2024-07-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_goods_group_purchase_info")
+@ApiModel(value="GoodsGroupPurchaseInfo对象", description="团购商品的成团")
+public class GoodsGroupPurchaseInfo implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private Long id;
+
+ @ApiModelProperty(value = "团购id")
+ private Long groupPurchaseId;
+
+ @ApiModelProperty(value = "当前人数")
+ private Integer currentNumber;
+
+ @ApiModelProperty(value = "团购唯一标识")
+ private Long mubre;
+
+ @ApiModelProperty(value = "成团人数")
+ private Integer groupSize;
+
+ @ApiModelProperty(value = "0 是未成团，1 是已经成团")
+ private Integer groupStatus;
+
+ @ApiModelProperty(value = "创建者")
+ private String createBy;
+
+ @ApiModelProperty(value = "创建时间")
+ private LocalDateTime createTime;
+
+ @ApiModelProperty(value = "更新者")
+ private String updateBy;
+
+ @ApiModelProperty(value = "更新时间")
+ private LocalDateTime updateTime;
+
+ @ApiModelProperty(value = "删除标志（0代表存在 1代表删除）")
+ private Integer delFlag;
+
+
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/GoodsGroupPurchaseInfoMapper.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/GoodsGroupPurchaseInfoMapper.java
new file mode 100644
index 0000000..1fd66da
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/GoodsGroupPurchaseInfoMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.goods.mapper;
+
+import com.ruoyi.goods.domain.GoodsGroupPurchaseInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 团购商品的成团 Mapper 接口
+ * </p>
+ *
+ * @author mitao
+ * @since 2024-07-15
+ */
+public interface GoodsGroupPurchaseInfoMapper extends BaseMapper<GoodsGroupPurchaseInfo> {
+
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/IGoodsGroupPurchaseInfoService.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/IGoodsGroupPurchaseInfoService.java
new file mode 100644
index 0000000..188892c
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/IGoodsGroupPurchaseInfoService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.goods.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.goods.domain.GoodsGroupPurchaseInfo;
+
+/**
+ * <p>
+ * 团购商品的成团 服务类
+ * </p>
+ *
+ * @author mitao
+ * @since 2024-07-15
+ */
+public interface IGoodsGroupPurchaseInfoService extends IService<GoodsGroupPurchaseInfo> {
+
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsGroupPurchaseInfoServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsGroupPurchaseInfoServiceImpl.java
new file mode 100644
index 0000000..b1be3dd
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsGroupPurchaseInfoServiceImpl.java
@@ -0,0 +1,21 @@
+package com.ruoyi.goods.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.goods.domain.GoodsGroupPurchaseInfo;
+import com.ruoyi.goods.mapper.GoodsGroupPurchaseInfoMapper;
+import com.ruoyi.goods.service.IGoodsGroupPurchaseInfoService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 团购商品的成团 服务实现类
+ * </p>
+ *
+ * @author mitao
+ * @since 2024-07-15
+ */
+@Service
+public class GoodsGroupPurchaseInfoServiceImpl extends ServiceImpl<GoodsGroupPurchaseInfoMapper, GoodsGroupPurchaseInfo> implements
+ IGoodsGroupPurchaseInfoService {
+
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillAppointmentServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillAppointmentServiceImpl.java
index 1ba0080..99b05b6 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillAppointmentServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillAppointmentServiceImpl.java
@@ -1,5 +1,6 @@
package com.ruoyi.goods.service.impl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.redis.service.RedisService;
@@ -7,19 +8,16 @@
import com.ruoyi.goods.mapper.GoodsSeckillAppointmentMapper;
import com.ruoyi.goods.mapper.GoodsSeckillMapper;
import com.ruoyi.goods.service.IGoodsSeckillAppointmentService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.goods.service.IGoodsSeckillService;
import com.ruoyi.system.api.constants.DelayTaskEnum;
import com.ruoyi.system.api.domain.DelayTask;
import com.ruoyi.system.api.domain.GoodsSeckill;
import com.ruoyi.system.api.domain.dto.HomeGoodsSkuDTO;
import com.ruoyi.system.api.feignClient.SysUserClient;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
import java.time.Duration;
import java.time.LocalDateTime;
import java.util.concurrent.TimeUnit;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Service;
/**
* <p>
@@ -32,7 +30,7 @@
@Service
public class GoodsSeckillAppointmentServiceImpl extends ServiceImpl<GoodsSeckillAppointmentMapper, GoodsSeckillAppointment> implements IGoodsSeckillAppointmentService {
@Resource
- private GoodsSeckillMapper goodsSeckillMapper;
+ private GoodsSeckillMapper goodsSeckillMapper;
@Resource
private SysUserClient sysUserClient;
diff --git a/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsGroupPurchaseInfoMapper.xml b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsGroupPurchaseInfoMapper.xml
new file mode 100644
index 0000000..1706a6b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsGroupPurchaseInfoMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.goods.mapper.GoodsGroupPurchaseInfoMapper">
+
+</mapper>
diff --git a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
index d11ca70..c7af134 100644
--- a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
+++ b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
@@ -107,16 +107,18 @@
</select>
<select id="getStaticsOrderList" resultType="com.ruoyi.system.api.domain.Order">
- SELECT o.*
- FROM t_order o
- LEFT JOIN t_order_return_request torr ON o.id = torr.order_id
+ SELECT
+ *
+ FROM
+ t_order
<where>
<if test="startTime != null and endTime != null">
- o.create_time between #{startTime} and #{endTime}
+ create_time between #{startTime} and #{endTime}
</if>
- AND o.order_status IN (1, 2, 3, 4)
- OR (o.order_status = 6 AND torr.audit_status != 2)
+ AND order_status IN ( 1, 2, 3, 4 ) AND
+ (is_request = 1 OR (is_request = 2 AND id in (SELECT order_id FROM t_order_return_request
+ WHERE
+ audit_status != 2)))
</where>
</select>
-
</mapper>
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
index fcd0fdc..a36beac 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
@@ -100,7 +100,8 @@
PageInfo<SysRole> page = roleService.page(pageInfo,
new LambdaQueryWrapper<SysRole>().ne(SysRole::getRoleId, 20)
.like(StringUtils.isNotBlank(query.getRoleName()), SysRole::getRoleName,
- query.getRoleName()).eq(SysRole::getDelFlag, "0"));
+ query.getRoleName()).eq(SysRole::getDelFlag, "0")
+ .orderByDesc(SysRole::getCreateTime));
return AjaxResult.success(page);
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
index b9e6e5d..8b1697f 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -116,7 +116,7 @@
public AjaxResult add(@Validated(InsertGroup.class) @RequestBody SysUserDTO dto) {
SysUser user = BeanUtils.copyBean(dto, SysUser.class);
user.setUserId(null);
- user.setUserType(dto.getIsAuctioneer() == 1 ? "04" : "00");
+ user.setUserType(dto.getIsAuctioneer() == 1 ? "00" : "04");
user.setUserName(user.getPhonenumber());
if(!org.springframework.util.StringUtils.hasLength(user.getNickName())){
user.setNickName(user.getPhonenumber());
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index 22c9d1d..3f506ee 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -475,7 +475,7 @@
// checkUserDataScope(userId);
}
// 删除用户与角色关联
-// userRoleMapper.deleteUserRole(userIds);
+ userRoleMapper.deleteUserRole(userIds);
// // 删除用户与岗位关联
// userPostMapper.deleteUserPost(userIds);
return userMapper.deleteUserByIds(userIds);
--
Gitblit v1.7.1