diff --git a/sql/mysql/brokerage.sql b/sql/mysql/brokerage.sql
index 179bfcda0..797f2563a 100644
--- a/sql/mysql/brokerage.sql
+++ b/sql/mysql/brokerage.sql
@@ -1,24 +1,28 @@
-- 增加配置表
-create table trade_config
+CREATE TABLE trade_config
(
- id bigint auto_increment comment '自增主键' primary key,
- brokerage_enabled bit default 1 not null comment '是否启用分佣',
- brokerage_enabled_condition tinyint default 0 not null comment '分佣模式：1-人人分销 2-指定分销',
- brokerage_bind_mode tinyint default 0 not null comment '分销关系绑定模式: 1-没有推广人，2-新用户, 3-扫码覆盖',
- brokerage_post_urls varchar(2000) default '' null comment '分销海报图地址数组',
- brokerage_first_percent int default 0 not null comment '一级返佣比例',
- brokerage_second_percent int default 0 not null comment '二级返佣比例',
- brokerage_withdraw_min_price int default 0 not null comment '用户提现最低金额',
- brokerage_bank_names varchar(200) default '' not null comment '提现银行（字典类型=brokerage_bank_name）',
- brokerage_frozen_days int default 7 not null comment '佣金冻结时间(天)',
- brokerage_withdraw_type varchar(32) default '1,2,3,4' not null comment '提现方式：1-钱包；2-银行卡；3-微信；4-支付宝',
- creator varchar(64) default '' null comment '创建者',
- create_time datetime default CURRENT_TIMESTAMP not null comment '创建时间',
- updater varchar(64) default '' null comment '更新者',
- update_time datetime default CURRENT_TIMESTAMP not null on update CURRENT_TIMESTAMP comment '更新时间',
- deleted bit default b'0' not null comment '是否删除',
- tenant_id bigint default 0 not null comment '租户编号'
-) comment '交易中心配置';
+ id BIGINT AUTO_INCREMENT COMMENT '自增主键' PRIMARY KEY,
+ brokerage_enabled BIT DEFAULT 1 NOT NULL COMMENT '是否启用分佣',
+ brokerage_enabled_condition TINYINT DEFAULT 1 NOT NULL COMMENT '分佣模式：1-人人分销 2-指定分销',
+ brokerage_bind_mode TINYINT DEFAULT 1 NOT NULL COMMENT '分销关系绑定模式: 1-没有推广人，2-新用户, 3-扫码覆盖',
+ brokerage_poster_urls VARCHAR(2000) DEFAULT '' NULL COMMENT '分销海报图地址数组',
+ brokerage_first_percent INT DEFAULT 0 NOT NULL COMMENT '一级返佣比例',
+ brokerage_second_percent INT DEFAULT 0 NOT NULL COMMENT '二级返佣比例',
+ brokerage_withdraw_min_price INT DEFAULT 0 NOT NULL COMMENT '用户提现最低金额',
+ brokerage_withdraw_fee_percent INT DEFAULT 0 NOT NULL COMMENT '提现手续费百分比',
+ brokerage_bank_names VARCHAR(200) DEFAULT '' NOT NULL COMMENT '提现银行（字典类型=brokerage_bank_name）',
+ brokerage_frozen_days INT DEFAULT 7 NOT NULL COMMENT '佣金冻结时间(天)',
+ brokerage_withdraw_types VARCHAR(32) DEFAULT '1,2,3,4' NOT NULL COMMENT '提现方式：1-钱包；2-银行卡；3-微信；4-支付宝',
+ creator VARCHAR(64) DEFAULT '' NULL COMMENT '创建者',
+ create_time DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL COMMENT '创建时间',
+ updater VARCHAR(64) DEFAULT '' NULL COMMENT '更新者',
+ update_time DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+ deleted BIT DEFAULT b'0' NOT NULL COMMENT '是否删除',
+ tenant_id BIGINT DEFAULT 0 NOT NULL COMMENT '租户编号'
+) COMMENT '交易中心配置';
+
+# alter table trade_config
+# add brokerage_withdraw_fee_percent int default 0 not null comment '提现手续费百分比' after brokerage_withdraw_min_price;
# alter table trade_brokerage_user
# add level int not null default 1 comment '等级' after frozen_price;
@@ -36,8 +40,6 @@ create table trade_brokerage_user
brokerage_time datetime null comment '成为分销员时间',
price int default 0 not null comment '可用佣金',
frozen_price int default 0 not null comment '冻结佣金',
- level int default 1 not null comment '等级',
- path varchar(2000) null comment '路径',
creator varchar(64) default '' null comment '创建者',
create_time datetime default CURRENT_TIMESTAMP not null comment '创建时间',
updater varchar(64) default '' null comment '更新者',
@@ -83,7 +85,7 @@ create index idx_status on trade_brokerage_record (status) comment '状态';
create table trade_brokerage_withdraw
(
- id int auto_increment comment '编号'
+ id bigint auto_increment comment '编号'
primary key,
user_id bigint not null comment '用户编号',
price int default 0 not null comment '提现金额',
@@ -137,7 +139,8 @@ insert into system_dict_type(type, name)
values ('brokerage_record_biz_type', '佣金记录业务类型');
insert into system_dict_data(dict_type, label, value, sort)
values ('brokerage_record_biz_type', '订单返佣', 1, 1),
- ('brokerage_record_biz_type', '申请提现', 2, 2);
+ ('brokerage_record_biz_type', '申请提现', 2, 2),
+ ('brokerage_record_biz_type', '申请提现驳回', 3, 3);
insert into system_dict_type(type, name)
values ('brokerage_record_status', '佣金记录状态');
diff --git a/sql/mysql/point.sql b/sql/mysql/point.sql
new file mode 100644
index 000000000..44123ea1b
--- /dev/null
+++ b/sql/mysql/point.sql
@@ -0,0 +1,6 @@
+ALTER TABLE trade_order ADD COLUMN use_point int NOT NULL DEFAULT 0 COMMENT '使用的积分' AFTER point_price;
+ALTER TABLE trade_order ADD COLUMN refund_point int NOT NULL DEFAULT 0 COMMENT '退还的使用积分' AFTER use_point;
+ALTER TABLE trade_order ADD COLUMN give_point int NOT NULL DEFAULT 0 COMMENT '赠送的积分' AFTER refund_point;
+
+ALTER TABLE trade_order_item ADD COLUMN use_point int NOT NULL DEFAULT 0 COMMENT '使用的积分' AFTER point_price;
+ALTER TABLE trade_order_item ADD COLUMN give_point int NOT NULL DEFAULT 0 COMMENT '赠送的积分' AFTER use_point;
diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/LocalDateTimeUtils.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/LocalDateTimeUtils.java
index 275e9f5a1..414c0af7d 100644
--- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/LocalDateTimeUtils.java
+++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/LocalDateTimeUtils.java
@@ -43,17 +43,6 @@ public class LocalDateTimeUtils {
return LocalDateTime.of(year, mouth, day, 0, 0, 0);
}
- /**
- * 创建指定时间
- *
- * @param timeStr 时间字符串
- * @return 指定时间
- */
- public static LocalDateTime buildTime(String timeStr) {
- // TODO @puhui999：这个方法的实现，和 LocalDateTimeUtil.parse() 的差异点是啥呀
- return LocalDateTime.of(LocalDate.now(), LocalTime.parse(timeStr));
- }
-
public static LocalDateTime[] buildBetweenTime(int year1, int mouth1, int day1,
int year2, int mouth2, int day2) {
return new LocalDateTime[]{buildTime(year1, mouth1, day1), buildTime(year2, mouth2, day2)};
diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/number/MoneyUtils.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/number/MoneyUtils.java
index e2fd3fa6e..e0b739920 100644
--- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/number/MoneyUtils.java
+++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/number/MoneyUtils.java
@@ -1,5 +1,6 @@
package cn.iocoder.yudao.framework.common.util.number;
+import cn.hutool.core.math.Money;
import cn.hutool.core.util.NumberUtil;
import java.math.BigDecimal;
@@ -16,7 +17,7 @@ public class MoneyUtils {
* 计算百分比金额，四舍五入
*
* @param price 金额
- * @param rate 百分比，例如说 56.77% 则传入 56.77
+ * @param rate 百分比，例如说 56.77% 则传入 56.77
* @return 百分比金额
*/
public static Integer calculateRatePrice(Integer price, Double rate) {
@@ -27,24 +28,46 @@ public class MoneyUtils {
* 计算百分比金额，向下传入
*
* @param price 金额
- * @param rate 百分比，例如说 56.77% 则传入 56.77
+ * @param rate 百分比，例如说 56.77% 则传入 56.77
* @return 百分比金额
*/
public static Integer calculateRatePriceFloor(Integer price, Double rate) {
return calculateRatePrice(price, rate, 0, RoundingMode.FLOOR).intValue();
}
- /**
- * 计算百分比金额
- *
- * @param price 金额
- * @param rate 百分比，例如说 56.77% 则传入 56.77
- * @param scale 保留小数位数
- * @param roundingMode 舍入模式
- */
- public static BigDecimal calculateRatePrice(Number price, Number rate, int scale, RoundingMode roundingMode) {
- return NumberUtil.toBigDecimal(price).multiply(NumberUtil.toBigDecimal(rate)) // 乘以
- .divide(BigDecimal.valueOf(100), scale, roundingMode); // 除以 100
- }
+ /**
+ * 计算百分比金额
+ *
+ * @param price 金额
+ * @param rate 百分比，例如说 56.77% 则传入 56.77
+ * @param scale 保留小数位数
+ * @param roundingMode 舍入模式
+ */
+ public static BigDecimal calculateRatePrice(Number price, Number rate, int scale, RoundingMode roundingMode) {
+ return NumberUtil.toBigDecimal(price).multiply(NumberUtil.toBigDecimal(rate)) // 乘以
+ .divide(BigDecimal.valueOf(100), scale, roundingMode); // 除以 100
+ }
+
+ /**
+ * 分转元
+ *
+ * @param fen 分
+ * @return 元
+ */
+ public static BigDecimal fenToYuan(int fen) {
+ return new Money(0, fen).getAmount();
+ }
+
+ /**
+ * 分转元（字符串）
+ *
+ * 例如说 fen 为 1 时，则结果为 0.01
+ *
+ * @param fen 分
+ * @return 元
+ */
+ public static String fenToYuanStr(int fen) {
+ return new Money(0, fen).toString();
+ }
}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-error-code/pom.xml b/yudao-framework/yudao-spring-boot-starter-biz-error-code/pom.xml
index ff3c32d97..06e41c1eb 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-error-code/pom.xml
+++ b/yudao-framework/yudao-spring-boot-starter-biz-error-code/pom.xml
@@ -14,7 +14,7 @@
<name>${project.artifactId}</name>
<description>
错误码 ErrorCode 的自动配置功能，提供如下功能：
- 1. 远程读取：项目启动时，从 system-server 服务，读取数据库中的 ErrorCode 错误码，实现错误码的提水可配置；
+ 1. 远程读取：项目启动时，从 system-server 服务，读取数据库中的 ErrorCode 错误码，实现错误码的提示可配置；
2. 自动更新：管理员在管理后台修数据库中的 ErrorCode 错误码时，项目自动从 system-server 服务加载最新的 ErrorCode 错误码；
3. 自动写入：项目启动时，将项目本地的错误码写到 system-server 服务中，方便管理员在管理后台编辑；
</description>
diff --git a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/LambdaQueryWrapperX.java b/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/LambdaQueryWrapperX.java
index 7cfd096a4..a728365e6 100644
--- a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/LambdaQueryWrapperX.java
+++ b/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/LambdaQueryWrapperX.java
@@ -100,14 +100,6 @@ public class LambdaQueryWrapperX<T> extends LambdaQueryWrapper<T> {
return betweenIfPresent(column, val1, val2);
}
- // TODO @疯狂：这个是 mysql 独有的，不好做成通用的哈。如果多层级，有没可能先查询一个层级，再查询一个层级；形成 set 后，直接去 in？
- public LambdaQueryWrapperX<T> findInSetIfPresent(SFunction<T, ?> column, Object val) {
- if (val != null) {
- return (LambdaQueryWrapperX<T>) super.apply("FIND_IN_SET({0}, " + columnToString(column) + ")", val);
- }
- return this;
- }
-
// ========== 重写父类方法，方便链式调用 ==========
@Override
diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java b/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
index 56f9aeaa6..40b446b28 100644
--- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
+++ b/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
@@ -1,18 +1,24 @@
package cn.iocoder.yudao.framework.jackson.config;
-import cn.iocoder.yudao.framework.jackson.core.databind.NumberSerializer;
+import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
import cn.iocoder.yudao.framework.jackson.core.databind.LocalDateTimeDeserializer;
import cn.iocoder.yudao.framework.jackson.core.databind.LocalDateTimeSerializer;
-import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
+import cn.iocoder.yudao.framework.jackson.core.databind.NumberSerializer;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.config.BeanPostProcessor;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.context.annotation.Bean;
+import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.time.LocalTime;
@AutoConfiguration
@Slf4j
@@ -36,6 +42,10 @@ public class YudaoJacksonAutoConfiguration {
simpleModule
.addSerializer(Long.class, NumberSerializer.INSTANCE)
.addSerializer(Long.TYPE, NumberSerializer.INSTANCE)
+ .addSerializer(LocalDate.class, LocalDateSerializer.INSTANCE)
+ .addDeserializer(LocalDate.class, LocalDateDeserializer.INSTANCE)
+ .addSerializer(LocalTime.class, LocalTimeSerializer.INSTANCE)
+ .addDeserializer(LocalTime.class, LocalTimeDeserializer.INSTANCE)
.addSerializer(LocalDateTime.class, LocalDateTimeSerializer.INSTANCE)
.addDeserializer(LocalDateTime.class, LocalDateTimeDeserializer.INSTANCE);
diff --git a/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/spu/dto/ProductSpuRespDTO.java b/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/spu/dto/ProductSpuRespDTO.java
index ab93431f4..cad6bfcb2 100644
--- a/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/spu/dto/ProductSpuRespDTO.java
+++ b/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/spu/dto/ProductSpuRespDTO.java
@@ -110,6 +110,11 @@ public class ProductSpuRespDTO {
// ========== 物流相关字段 =========
+ /**
+ * 赠送积分
+ */
+ private Integer giveIntegral;
+
/**
* 物流配置模板编号
*
@@ -132,4 +137,15 @@ public class ProductSpuRespDTO {
*/
private Integer clickCount;
+
+ // ========== 分销相关字段 =========
+
+ /**
+ * 分销类型
+ *
+ * false - 默认
+ * true - 自行设置
+ */
+ private Boolean subCommissionType;
+
}
diff --git a/yudao-module-mall/yudao-module-product-biz/pom.xml b/yudao-module-mall/yudao-module-product-biz/pom.xml
index 674f49fc4..f6190ceda 100644
--- a/yudao-module-mall/yudao-module-product-biz/pom.xml
+++ b/yudao-module-mall/yudao-module-product-biz/pom.xml
@@ -23,12 +23,6 @@
<artifactId>yudao-module-product-api</artifactId>
<version>${revision}</version>
</dependency>
- <!-- TODO 芋艿：看看~~~ -->
- <dependency>
- <groupId>cn.iocoder.boot</groupId>
- <artifactId>yudao-module-trade-api</artifactId>
- <version>${revision}</version>
- </dependency>
<dependency>
<groupId>cn.iocoder.boot</groupId>
<artifactId>yudao-module-member-api</artifactId>
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/property/ProductPropertyValueApiImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/property/ProductPropertyValueApiImpl.java
index 9aab9e560..d3eaaf42d 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/property/ProductPropertyValueApiImpl.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/property/ProductPropertyValueApiImpl.java
@@ -1,7 +1,7 @@
package cn.iocoder.yudao.module.product.api.property;
import cn.iocoder.yudao.module.product.api.property.dto.ProductPropertyValueDetailRespDTO;
-import cn.iocoder.yudao.module.product.convert.propertyvalue.ProductPropertyValueConvert;
+import cn.iocoder.yudao.module.product.convert.property.ProductPropertyValueConvert;
import cn.iocoder.yudao.module.product.service.property.ProductPropertyValueService;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/ProductPropertyValueController.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/ProductPropertyValueController.java
index fbac32712..54ce881d1 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/ProductPropertyValueController.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/ProductPropertyValueController.java
@@ -1,14 +1,12 @@
package cn.iocoder.yudao.module.product.controller.admin.property;
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.crypto.symmetric.AES;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.product.controller.admin.property.vo.value.ProductPropertyValueCreateReqVO;
import cn.iocoder.yudao.module.product.controller.admin.property.vo.value.ProductPropertyValuePageReqVO;
import cn.iocoder.yudao.module.product.controller.admin.property.vo.value.ProductPropertyValueRespVO;
import cn.iocoder.yudao.module.product.controller.admin.property.vo.value.ProductPropertyValueUpdateReqVO;
-import cn.iocoder.yudao.module.product.convert.propertyvalue.ProductPropertyValueConvert;
+import cn.iocoder.yudao.module.product.convert.property.ProductPropertyValueConvert;
import cn.iocoder.yudao.module.product.service.property.ProductPropertyValueService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@@ -20,9 +18,6 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.Valid;
-import java.util.Arrays;
-import java.util.List;
-
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@Tag(name = "管理后台 - 商品属性值")
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/AppProductSpuController.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/AppProductSpuController.java
index 5d79ba7d1..3c9d8f8be 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/AppProductSpuController.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/AppProductSpuController.java
@@ -1,10 +1,15 @@
package cn.iocoder.yudao.module.product.controller.app.spu;
+import cn.hutool.core.collection.CollUtil;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.member.api.level.MemberLevelApi;
+import cn.iocoder.yudao.module.member.api.level.dto.MemberLevelRespDTO;
+import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
+import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
import cn.iocoder.yudao.module.product.controller.app.spu.vo.AppProductSpuDetailRespVO;
-import cn.iocoder.yudao.module.product.controller.app.spu.vo.AppProductSpuPageRespVO;
import cn.iocoder.yudao.module.product.controller.app.spu.vo.AppProductSpuPageReqVO;
+import cn.iocoder.yudao.module.product.controller.app.spu.vo.AppProductSpuPageRespVO;
import cn.iocoder.yudao.module.product.convert.spu.ProductSpuConvert;
import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSpuDO;
@@ -23,10 +28,12 @@ import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.validation.Valid;
+import java.util.Collections;
import java.util.List;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.SPU_NOT_ENABLE;
import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.SPU_NOT_EXISTS;
@@ -41,6 +48,11 @@ public class AppProductSpuController {
@Resource
private ProductSkuService productSkuService;
+ @Resource
+ private MemberLevelApi memberLevelApi;
+ @Resource
+ private MemberUserApi memberUserApi;
+
@GetMapping("/list")
@Operation(summary = "获得商品 SPU 列表")
@Parameters({
@@ -51,14 +63,32 @@ public class AppProductSpuController {
@RequestParam("recommendType") String recommendType,
@RequestParam(value = "count", defaultValue = "10") Integer count) {
List<ProductSpuDO> list = productSpuService.getSpuList(recommendType, count);
- return success(ProductSpuConvert.INSTANCE.convertListForGetSpuList(list));
+ if (CollUtil.isEmpty(list)) {
+ return success(Collections.emptyList());
+ }
+
+ // 拼接返回
+ List<AppProductSpuPageRespVO> voList = ProductSpuConvert.INSTANCE.convertListForGetSpuList(list);
+ // 处理 vip 价格
+ MemberLevelRespDTO memberLevel = getMemberLevel();
+ voList.forEach(vo -> vo.setVipPrice(calculateVipPrice(vo.getPrice(), memberLevel)));
+ return success(voList);
}
@GetMapping("/page")
@Operation(summary = "获得商品 SPU 分页")
public CommonResult<PageResult<AppProductSpuPageRespVO>> getSpuPage(@Valid AppProductSpuPageReqVO pageVO) {
PageResult<ProductSpuDO> pageResult = productSpuService.getSpuPage(pageVO);
- return success(ProductSpuConvert.INSTANCE.convertPageForGetSpuPage(pageResult));
+ if (CollUtil.isEmpty(pageResult.getList())) {
+ return success(PageResult.empty(pageResult.getTotal()));
+ }
+
+ // 拼接返回
+ PageResult<AppProductSpuPageRespVO> voPageResult = ProductSpuConvert.INSTANCE.convertPageForGetSpuPage(pageResult);
+ // 处理 vip 价格
+ MemberLevelRespDTO memberLevel = getMemberLevel();
+ voPageResult.getList().forEach(vo -> vo.setVipPrice(calculateVipPrice(vo.getPrice(), memberLevel)));
+ return success(voPageResult);
}
@GetMapping("/get-detail")
@@ -74,10 +104,40 @@ public class AppProductSpuController {
throw exception(SPU_NOT_ENABLE);
}
- // 查询商品 SKU
+ // 拼接返回
List<ProductSkuDO> skus = productSkuService.getSkuListBySpuId(spu.getId());
- // 拼接
- return success(ProductSpuConvert.INSTANCE.convertForGetSpuDetail(spu, skus));
+ AppProductSpuDetailRespVO detailVO = ProductSpuConvert.INSTANCE.convertForGetSpuDetail(spu, skus);
+ // 处理 vip 价格
+ MemberLevelRespDTO memberLevel = getMemberLevel();
+ detailVO.setVipPrice(calculateVipPrice(detailVO.getPrice(), memberLevel));
+ return success(detailVO);
+ }
+
+ private MemberLevelRespDTO getMemberLevel() {
+ Long userId = getLoginUserId();
+ if (userId == null) {
+ return null;
+ }
+ MemberUserRespDTO user = memberUserApi.getUser(userId);
+ if (user.getLevelId() == null || user.getLevelId() <= 0) {
+ return null;
+ }
+ return memberLevelApi.getMemberLevel(user.getLevelId());
+ }
+
+ /**
+ * 计算会员 VIP 优惠价格
+ *
+ * @param price 原价
+ * @param memberLevel 会员等级
+ * @return 优惠价格
+ */
+ public Integer calculateVipPrice(Integer price, MemberLevelRespDTO memberLevel) {
+ if (memberLevel == null || memberLevel.getDiscountPercent() == null) {
+ return 0;
+ }
+ Integer newPrice = price * memberLevel.getDiscountPercent() / 100;
+ return price - newPrice;
}
}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/propertyvalue/ProductPropertyValueConvert.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/property/ProductPropertyValueConvert.java
similarity index 97%
rename from yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/propertyvalue/ProductPropertyValueConvert.java
rename to yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/property/ProductPropertyValueConvert.java
index d6167c174..5429f35fe 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/propertyvalue/ProductPropertyValueConvert.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/property/ProductPropertyValueConvert.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.product.convert.propertyvalue;
+package cn.iocoder.yudao.module.product.convert.property;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/spu/ProductSpuConvert.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/spu/ProductSpuConvert.java
index 6d52e5cad..e8e6a8bc1 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/spu/ProductSpuConvert.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/spu/ProductSpuConvert.java
@@ -79,8 +79,6 @@ public interface ProductSpuConvert {
ProductSpuDO spu = list.get(i);
AppProductSpuPageRespVO spuVO = voList.get(i);
spuVO.setUnitName(DictFrameworkUtils.getDictDataLabel(DictTypeConstants.PRODUCT_UNIT, spu.getUnit()));
- // 计算 vip 价格 TODO 芋艿：临时的逻辑，等 vip 支持后
- spuVO.setVipPrice((int) (spuVO.getPrice() * 0.9));
}
return voList;
}
@@ -95,11 +93,6 @@ public interface ProductSpuConvert {
.setUnitName(DictFrameworkUtils.getDictDataLabel(DictTypeConstants.PRODUCT_UNIT, spu.getUnit()));
// 处理 SKU
spuVO.setSkus(convertListForGetSpuDetail(skus));
- // 计算 vip 价格 TODO 芋艿：临时的逻辑，等 vip 支持后
- if (true) {
- spuVO.setVipPrice((int) (spuVO.getPrice() * 0.9));
- spuVO.getSkus().forEach(sku -> sku.setVipPrice((int) (sku.getPrice() * 0.9)));
- }
return spuVO;
}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java
index 905bb890b..9e073fee7 100755
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java
@@ -179,6 +179,7 @@ public class ProductSpuDO extends BaseDO {
@TableField(typeHandler = JacksonTypeHandler.class)
private List<Long> giveCouponTemplateIds;
+ // TODO @puhui999：字段估计要改成 brokerageType
/**
* 分销类型
*
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/package-info.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/package-info.java
index 01967857e..e32942933 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/package-info.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/package-info.java
@@ -1,5 +1,5 @@
/**
- * trade 模块，主要实现交易相关功能
+ * product 模块，主要实现交易相关功能
* 例如：订单、退款、购物车等功能。
*
* 1. Controller URL：以 /product/ 开头，避免和其它 Module 冲突
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/property/ProductPropertyValueServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/property/ProductPropertyValueServiceImpl.java
index 6b4d1e9c8..0f74bca1f 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/property/ProductPropertyValueServiceImpl.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/property/ProductPropertyValueServiceImpl.java
@@ -5,7 +5,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.product.controller.admin.property.vo.value.ProductPropertyValueCreateReqVO;
import cn.iocoder.yudao.module.product.controller.admin.property.vo.value.ProductPropertyValuePageReqVO;
import cn.iocoder.yudao.module.product.controller.admin.property.vo.value.ProductPropertyValueUpdateReqVO;
-import cn.iocoder.yudao.module.product.convert.propertyvalue.ProductPropertyValueConvert;
+import cn.iocoder.yudao.module.product.convert.property.ProductPropertyValueConvert;
import cn.iocoder.yudao.module.product.dal.dataobject.property.ProductPropertyDO;
import cn.iocoder.yudao.module.product.dal.dataobject.property.ProductPropertyValueDO;
import cn.iocoder.yudao.module.product.dal.mysql.property.ProductPropertyValueMapper;
diff --git a/yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/api/bargain/BargainActivityApi.java b/yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/api/bargain/BargainActivityApi.java
index eb912e417..0f9812629 100644
--- a/yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/api/bargain/BargainActivityApi.java
+++ b/yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/api/bargain/BargainActivityApi.java
@@ -11,7 +11,7 @@ public interface BargainActivityApi {
* 更新砍价活动库存
*
* @param id 砍价活动编号
- * @param count 购买数量
+ * @param count 购买数量
*/
void updateBargainActivityStock(Long id, Integer count);
diff --git a/yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/api/seckill/SeckillActivityApi.java b/yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/api/seckill/SeckillActivityApi.java
index ebe4bb0e5..11cc22864 100644
--- a/yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/api/seckill/SeckillActivityApi.java
+++ b/yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/api/seckill/SeckillActivityApi.java
@@ -7,14 +7,13 @@ package cn.iocoder.yudao.module.promotion.api.seckill;
*/
public interface SeckillActivityApi {
- // TODO @puhui999：activityId 改成 id 好点哈；
/**
* 更新秒杀库存
*
- * @param activityId 活动编号
+ * @param id 活动编号
* @param skuId sku 编号
* @param count 数量
*/
- void updateSeckillStock(Long activityId, Long skuId, Integer count);
+ void updateSeckillStock(Long id, Long skuId, Integer count);
}
diff --git a/yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java b/yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
index c39fbb316..4fc58004a 100644
--- a/yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
+++ b/yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
@@ -56,7 +56,6 @@ public interface ErrorCodeConstants {
ErrorCode SECKILL_ACTIVITY_DELETE_FAIL_STATUS_NOT_CLOSED_OR_END = new ErrorCode(1013008004, "秒杀活动未关闭或未结束，不能删除");
ErrorCode SECKILL_ACTIVITY_CLOSE_FAIL_STATUS_CLOSED = new ErrorCode(1013008005, "秒杀活动已关闭，不能重复关闭");
ErrorCode SECKILL_ACTIVITY_UPDATE_STOCK_FAIL = new ErrorCode(1013008006, "秒杀失败，原因秒杀库存不足");
- ErrorCode SECKILL_ACTIVITY_FAIL_STATUS_CLOSED = new ErrorCode(1013008007, "秒杀活动已关闭");
// ========== 秒杀时段 1013009000 ==========
ErrorCode SECKILL_CONFIG_NOT_EXISTS = new ErrorCode(1013009000, "秒杀时段不存在");
diff --git a/yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/common/PromotionTypeEnum.java b/yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/common/PromotionTypeEnum.java
index 874651ea3..009781c5c 100644
--- a/yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/common/PromotionTypeEnum.java
+++ b/yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/common/PromotionTypeEnum.java
@@ -22,8 +22,9 @@ public enum PromotionTypeEnum implements IntArrayValuable {
DISCOUNT_ACTIVITY(4, "限时折扣"),
REWARD_ACTIVITY(5, "满减送"),
- MEMBER(6, "会员折扣"),
- COUPON(7, "优惠劵")
+ MEMBER_LEVEL(6, "会员折扣"),
+ COUPON(7, "优惠劵"),
+ POINT(8, "积分")
;
public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(PromotionTypeEnum::getType).toArray();
diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/seckill/SeckillActivityApiImpl.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/seckill/SeckillActivityApiImpl.java
index 624af86c6..9a15a0ca9 100644
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/seckill/SeckillActivityApiImpl.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/seckill/SeckillActivityApiImpl.java
@@ -17,8 +17,8 @@ public class SeckillActivityApiImpl implements SeckillActivityApi {
private SeckillActivityService activityService;
@Override
- public void updateSeckillStock(Long activityId, Long skuId, Integer count) {
- activityService.updateSeckillStock(activityId, skuId, count);
+ public void updateSeckillStock(Long id, Long skuId, Integer count) {
+ activityService.updateSeckillStock(id, skuId, count);
}
}
diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/AppBargainActivityController.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/AppBargainActivityController.java
index 72facf935..a996b4521 100644
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/AppBargainActivityController.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/AppBargainActivityController.java
@@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
+import static cn.hutool.core.util.ObjectUtil.defaultIfNull;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
@@ -39,7 +40,7 @@ public class AppBargainActivityController {
@GetMapping("/page")
@Operation(summary = "获得砍价活动分页")
public CommonResult<PageResult<AppBargainActivityRespVO>> getBargainActivityPage(PageParam pageReqVO) {
- PageResult<BargainActivityDO> result = bargainActivityService.getBargainActivityPageForApp(pageReqVO);
+ PageResult<BargainActivityDO> result = bargainActivityService.getBargainActivityPage(pageReqVO);
if (CollUtil.isEmpty(result.getList())) {
return success(PageResult.empty(result.getTotal()));
}
@@ -54,7 +55,7 @@ public class AppBargainActivityController {
@Parameter(name = "count", description = "需要展示的数量", example = "6")
public CommonResult<List<AppBargainActivityRespVO>> getBargainActivityList(
@RequestParam(name = "count", defaultValue = "6") Integer count) {
- List<BargainActivityDO> list = bargainActivityService.getBargainActivityListForApp(count);
+ List<BargainActivityDO> list = bargainActivityService.getBargainActivityListByCount(defaultIfNull(count, 6));
if (CollUtil.isEmpty(list)) {
return success(BargainActivityConvert.INSTANCE.convertAppList(list));
}
diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationActivityController.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationActivityController.java
index 75693f90b..ee1d5ed17 100644
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationActivityController.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationActivityController.java
@@ -1,10 +1,19 @@
package cn.iocoder.yudao.module.promotion.controller.app.combination;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.product.api.spu.ProductSpuApi;
+import cn.iocoder.yudao.module.product.api.spu.dto.ProductSpuRespDTO;
import cn.iocoder.yudao.module.promotion.controller.app.combination.vo.activity.AppCombinationActivityDetailRespVO;
import cn.iocoder.yudao.module.promotion.controller.app.combination.vo.activity.AppCombinationActivityRespVO;
+import cn.iocoder.yudao.module.promotion.convert.combination.CombinationActivityConvert;
+import cn.iocoder.yudao.module.promotion.dal.dataobject.combination.CombinationActivityDO;
+import cn.iocoder.yudao.module.promotion.dal.dataobject.combination.CombinationProductDO;
+import cn.iocoder.yudao.module.promotion.service.combination.CombinationActivityService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -14,11 +23,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
+import javax.annotation.Resource;
+import java.util.Collections;
import java.util.List;
+import static cn.hutool.core.util.ObjectUtil.defaultIfNull;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
@Tag(name = "用户 APP - 拼团活动")
@RestController
@@ -26,104 +37,51 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@Validated
public class AppCombinationActivityController {
+ @Resource
+ private CombinationActivityService activityService;
+ @Resource
+ private ProductSpuApi spuApi;
+
+ // TODO 芋艿：增加 Spring Cache
@GetMapping("/list")
@Operation(summary = "获得拼团活动列表", description = "用于小程序首页")
- // TODO 芋艿：增加 Spring Cache
- // TODO 芋艿：缺少 swagger 注解
+ @Parameter(name = "count", description = "需要展示的数量", example = "6")
public CommonResult<List<AppCombinationActivityRespVO>> getCombinationActivityList(
@RequestParam(name = "count", defaultValue = "6") Integer count) {
- List<AppCombinationActivityRespVO> activityList = new ArrayList<>();
- AppCombinationActivityRespVO activity1 = new AppCombinationActivityRespVO();
- activity1.setId(1L);
- activity1.setName("618 大拼团");
- activity1.setUserSize(3);
- activity1.setSpuId(2048L);
- activity1.setPicUrl("https://static.iocoder.cn/mall/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg");
- activity1.setMarketPrice(50);
- activity1.setCombinationPrice(100);
- activityList.add(activity1);
-
- AppCombinationActivityRespVO activity2 = new AppCombinationActivityRespVO();
- activity2.setId(2L);
- activity2.setName("双十一拼团");
- activity2.setUserSize(5);
- activity2.setSpuId(4096L);
- activity2.setPicUrl("https://static.iocoder.cn/mall/132.jpeg");
- activity2.setMarketPrice(100);
- activity2.setCombinationPrice(200);
- activityList.add(activity2);
-
- return success(activityList);
+ List<CombinationActivityDO> list = activityService.getCombinationActivityListByCount(defaultIfNull(count, 6));
+ if (CollUtil.isEmpty(list)) {
+ return success(Collections.emptyList());
+ }
+ // 拼接返回
+ List<ProductSpuRespDTO> spuList = spuApi.getSpuList(convertList(list, CombinationActivityDO::getSpuId));
+ return success(CombinationActivityConvert.INSTANCE.convertAppList(list, spuList));
}
@GetMapping("/page")
@Operation(summary = "获得拼团活动分页")
public CommonResult<PageResult<AppCombinationActivityRespVO>> getCombinationActivityPage(PageParam pageParam) {
- List<AppCombinationActivityRespVO> activityList = new ArrayList<>();
- AppCombinationActivityRespVO activity1 = new AppCombinationActivityRespVO();
- activity1.setId(1L);
- activity1.setName("618 大拼团");
- activity1.setUserSize(3);
- activity1.setSpuId(2048L);
- activity1.setPicUrl("商品图片地址");
- activity1.setMarketPrice(50);
- activity1.setCombinationPrice(100);
- activityList.add(activity1);
-
- AppCombinationActivityRespVO activity2 = new AppCombinationActivityRespVO();
- activity2.setId(2L);
- activity2.setName("双十一拼团");
- activity2.setUserSize(5);
- activity2.setSpuId(4096L);
- activity2.setPicUrl("商品图片地址");
- activity2.setMarketPrice(100);
- activity2.setCombinationPrice(200);
- activityList.add(activity2);
-
- return success(new PageResult<>(activityList, 2L));
+ PageResult<CombinationActivityDO> result = activityService.getCombinationActivityPage(pageParam);
+ if (CollUtil.isEmpty(result.getList())) {
+ return success(PageResult.empty(result.getTotal()));
+ }
+ // 拼接返回
+ List<ProductSpuRespDTO> spuList = spuApi.getSpuList(convertList(result.getList(), CombinationActivityDO::getSpuId));
+ return success(CombinationActivityConvert.INSTANCE.convertAppPage(result, spuList));
}
@GetMapping("/get-detail")
@Operation(summary = "获得拼团活动明细")
@Parameter(name = "id", description = "活动编号", required = true, example = "1024")
public CommonResult<AppCombinationActivityDetailRespVO> getCombinationActivityDetail(@RequestParam("id") Long id) {
- // TODO 芋艿：如果禁用的时候，需要抛出异常；
- AppCombinationActivityDetailRespVO obj = new AppCombinationActivityDetailRespVO();
- // 设置其属性的值
- obj.setId(id);
- obj.setName("晚九点限时秒杀");
- obj.setStatus(1);
- obj.setStartTime(LocalDateTime.of(2023, 6, 15, 0, 0, 0));
- obj.setEndTime(LocalDateTime.of(2023, 6, 20, 23, 59, 0));
- obj.setUserSize(2);
- obj.setSuccessCount(100);
- obj.setSpuId(633L);
- obj.setSingleLimitCount(2);
- obj.setTotalLimitCount(3);
-
- // 创建一个Product对象的列表
- List<AppCombinationActivityDetailRespVO.Product> productList = new ArrayList<>();
- // 创建三个新的Product对象并设置其属性的值
- AppCombinationActivityDetailRespVO.Product product1 = new AppCombinationActivityDetailRespVO.Product();
- product1.setSkuId(1L);
- product1.setCombinationPrice(100);
- // 将第一个Product对象添加到列表中
- productList.add(product1);
- // 创建第二个Product对象并设置其属性的值
- AppCombinationActivityDetailRespVO.Product product2 = new AppCombinationActivityDetailRespVO.Product();
- product2.setSkuId(2L);
- product2.setCombinationPrice(200);
- // 将第二个Product对象添加到列表中
- productList.add(product2);
- // 创建第三个Product对象并设置其属性的值
- AppCombinationActivityDetailRespVO.Product product3 = new AppCombinationActivityDetailRespVO.Product();
- product3.setSkuId(3L);
- product3.setCombinationPrice(300);
- // 将第三个Product对象添加到列表中
- productList.add(product3);
- // 将Product列表设置为对象的属性值
- obj.setProducts(productList);
- return success(obj);
+ // 1、获取活动
+ CombinationActivityDO combinationActivity = activityService.getCombinationActivity(id);
+ if (combinationActivity == null
+ || ObjectUtil.equal(combinationActivity.getStatus(), CommonStatusEnum.DISABLE.getStatus())) {
+ return success(null);
+ }
+ // 2、获取活动商品
+ List<CombinationProductDO> products = activityService.getCombinationProductsByActivityId(combinationActivity.getId());
+ return success(CombinationActivityConvert.INSTANCE.convert3(combinationActivity, products));
}
}
diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/vo/activity/AppCombinationActivityRespVO.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/vo/activity/AppCombinationActivityRespVO.java
index b536e8abe..64462a377 100644
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/vo/activity/AppCombinationActivityRespVO.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/vo/activity/AppCombinationActivityRespVO.java
@@ -28,7 +28,6 @@ public class AppCombinationActivityRespVO {
private Integer marketPrice;
@Schema(description = "拼团金额，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
- // 从拼团商品里取最低价
private Integer combinationPrice;
}
diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/AppSeckillActivityController.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/AppSeckillActivityController.java
index 66aa3bd97..a83b87ae2 100644
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/AppSeckillActivityController.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/AppSeckillActivityController.java
@@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.promotion.controller.app.seckill;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
@@ -27,14 +28,10 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
-import java.util.Arrays;
import java.util.List;
-import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
-import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.isBetween;
-import static cn.iocoder.yudao.module.promotion.enums.ErrorCodeConstants.SECKILL_ACTIVITY_FAIL_STATUS_CLOSED;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
@Tag(name = "用户 App - 秒杀活动")
@RestController
@@ -50,27 +47,21 @@ public class AppSeckillActivityController {
@Resource
private ProductSpuApi spuApi;
- @GetMapping("/get-now")
- @Operation(summary = "获得当前秒杀活动") // 提供给首页使用
// TODO 芋艿：需要增加 spring cache
+ @GetMapping("/get-now")
+ @Operation(summary = "获得当前秒杀活动", description = "获取当前正在进行的活动，提供给首页使用")
public CommonResult<AppSeckillActivityNowRespVO> getNowSeckillActivity() {
// 1. 获取当前时间处在哪个秒杀阶段
- // TODO @puhui999：可以考虑在 service 写个方法；这样 controller 不用关注过多逻辑
- List<SeckillConfigDO> configList = configService.getSeckillConfigList();
- SeckillConfigDO filteredConfig = findFirst(configList, config -> ObjectUtil.equal(config.getStatus(),
- CommonStatusEnum.ENABLE.getStatus()) && isBetween(config.getStartTime(), config.getEndTime()));
- if (filteredConfig == null) { // 时段不存在直接返回 null
+ SeckillConfigDO configList = configService.getSeckillConfigListByStatusOnCurrentTime(CommonStatusEnum.ENABLE.getStatus());
+ if (configList == null) { // 时段不存在直接返回 null
return success(null);
}
// 2. 查询满足当前阶段的活动
- // TODO @puhui999：最好直接返回开启的；不多查询数据
- List<SeckillActivityDO> activityList = activityService.getSeckillActivityListByConfigIds(Arrays.asList(filteredConfig.getId()));
- List<SeckillActivityDO> filteredList = filterList(activityList, item -> ObjectUtil.equal(item.getStatus(), CommonStatusEnum.ENABLE.getStatus()));
-
- // 3. 拼接数据
- List<ProductSpuRespDTO> spuList = spuApi.getSpuList(convertList(filteredList, SeckillActivityDO::getSpuId));
- return success(SeckillActivityConvert.INSTANCE.convert(filteredConfig, filteredList, spuList));
+ List<SeckillActivityDO> activityList = activityService.getSeckillActivityListByConfigIdAndStatus(configList.getId(), CommonStatusEnum.ENABLE.getStatus());
+ // 3 获取 spu 信息
+ List<ProductSpuRespDTO> spuList = spuApi.getSpuList(convertList(activityList, SeckillActivityDO::getSpuId));
+ return success(SeckillActivityConvert.INSTANCE.convert(configList, activityList, spuList));
}
@GetMapping("/page")
@@ -78,7 +69,9 @@ public class AppSeckillActivityController {
public CommonResult<PageResult<AppSeckillActivityRespVO>> getSeckillActivityPage(AppSeckillActivityPageReqVO pageReqVO) {
// 1. 查询满足当前阶段的活动
PageResult<SeckillActivityDO> pageResult = activityService.getSeckillActivityAppPageByConfigId(pageReqVO);
-
+ if (CollUtil.isEmpty(pageResult.getList())) {
+ return success(PageResult.empty(pageResult.getTotal()));
+ }
// 2. 拼接数据
List<ProductSpuRespDTO> spuList = spuApi.getSpuList(convertList(pageResult.getList(), SeckillActivityDO::getSpuId));
return success(SeckillActivityConvert.INSTANCE.convertPage(pageResult, spuList));
@@ -88,28 +81,22 @@ public class AppSeckillActivityController {
@Operation(summary = "获得秒杀活动明细")
@Parameter(name = "id", description = "活动编号", required = true, example = "1024")
public CommonResult<AppSeckillActivityDetailRespVO> getSeckillActivity(@RequestParam("id") Long id) {
- // 1、获取当前时间处在哪个秒杀阶段
- // TODO puhui999：这里，和 58 行是雷同的
- List<SeckillConfigDO> configList = configService.getSeckillConfigList();
- SeckillConfigDO filteredConfig = findFirst(configList, config -> ObjectUtil.equal(config.getStatus(),
- CommonStatusEnum.ENABLE.getStatus()) && isBetween(config.getStartTime(), config.getEndTime()));
- if (filteredConfig == null) { // 时段不存在直接返回 null
+ // 1. 获取当前时间处在哪个秒杀阶段
+ SeckillConfigDO configList = configService.getSeckillConfigListByStatusOnCurrentTime(CommonStatusEnum.ENABLE.getStatus());
+ if (configList == null) { // 时段不存在直接返回 null
return success(null);
}
// 2. 获取活动
SeckillActivityDO seckillActivity = activityService.getSeckillActivity(id);
- if (seckillActivity == null) {
+ if (seckillActivity == null
+ || ObjectUtil.equal(seckillActivity.getStatus(), CommonStatusEnum.DISABLE.getStatus())) {
return success(null);
}
- // TODO 芋艿：如果禁用的时候，需要抛出异常；
- if (ObjectUtil.equal(seckillActivity.getStatus(), CommonStatusEnum.DISABLE.getStatus())) {
- throw exception(SECKILL_ACTIVITY_FAIL_STATUS_CLOSED);
- }
// 3. 拼接数据
- List<SeckillProductDO> products = activityService.getSeckillProductListByActivityId(seckillActivity.getId());
- return success(SeckillActivityConvert.INSTANCE.convert3(seckillActivity, products, filteredConfig));
+ List<SeckillProductDO> productList = activityService.getSeckillProductListByActivityId(seckillActivity.getId());
+ return success(SeckillActivityConvert.INSTANCE.convert3(seckillActivity, productList, configList));
}
}
diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/AppSeckillConfigController.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/AppSeckillConfigController.java
index fc30a2f24..ec60b2141 100644
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/AppSeckillConfigController.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/AppSeckillConfigController.java
@@ -1,11 +1,9 @@
package cn.iocoder.yudao.module.promotion.controller.app.seckill;
-import cn.hutool.core.collection.CollectionUtil;
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.module.promotion.controller.app.seckill.vo.config.AppSeckillConfigRespVO;
import cn.iocoder.yudao.module.promotion.convert.seckill.seckillconfig.SeckillConfigConvert;
-import cn.iocoder.yudao.module.promotion.dal.dataobject.seckill.seckillconfig.SeckillConfigDO;
import cn.iocoder.yudao.module.promotion.service.seckill.SeckillConfigService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -15,7 +13,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
-import java.util.Collections;
import java.util.List;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -31,13 +28,8 @@ public class AppSeckillConfigController {
@GetMapping("/list")
@Operation(summary = "获得秒杀时间段列表")
public CommonResult<List<AppSeckillConfigRespVO>> getSeckillConfigList() {
- List<SeckillConfigDO> list = configService.getSeckillConfigListByStatus(CommonStatusEnum.ENABLE.getStatus());
- // TODO @puhui999：如果这种，不用判空也问题不大；
- if (CollectionUtil.isEmpty(list)) {
- return success(Collections.emptyList());
- }
-
- return success(SeckillConfigConvert.INSTANCE.convertList2(list));
+ return success(SeckillConfigConvert.INSTANCE.convertList2(
+ configService.getSeckillConfigListByStatus(CommonStatusEnum.ENABLE.getStatus())));
}
}
diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/vo/activity/AppSeckillActivityRespVO.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/vo/activity/AppSeckillActivityRespVO.java
index 42f5a5ff4..278ee04a1 100644
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/vo/activity/AppSeckillActivityRespVO.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/vo/activity/AppSeckillActivityRespVO.java
@@ -25,6 +25,9 @@ public class AppSeckillActivityRespVO {
// 从 SPU 的 marketPrice 读取
private Integer marketPrice;
+ @Schema(description = "秒杀活动状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+ private Integer status;
+
@Schema(description = "秒杀库存（剩余）", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
private Integer stock;
@Schema(description = "秒杀库存（总共）", requiredMode = Schema.RequiredMode.REQUIRED, example = "200")
diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/bargain/BargainActivityConvert.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/bargain/BargainActivityConvert.java
index 24297990f..92791ed76 100644
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/bargain/BargainActivityConvert.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/bargain/BargainActivityConvert.java
@@ -46,9 +46,7 @@ public interface BargainActivityConvert {
Map<Long, ProductSpuRespDTO> spuMap = convertMap(spuList, ProductSpuRespDTO::getId);
List<BargainActivityRespVO> list = CollectionUtils.convertList(result.getList(), item -> {
findAndThen(spuMap, item.getSpuId(), spu -> {
- // TODO @puhui999：这里可以使用链式哈
- item.setPicUrl(spu.getPicUrl());
- item.setSpuName(spu.getName());
+ item.setPicUrl(spu.getPicUrl()).setSpuName(spu.getName());
});
return item;
});
@@ -75,11 +73,7 @@ public interface BargainActivityConvert {
// 拼接关联属性
Map<Long, ProductSpuRespDTO> spuMap = convertMap(spuList, ProductSpuRespDTO::getId);
List<AppBargainActivityRespVO> list = CollectionUtils.convertList(result.getList(), item -> {
- findAndThen(spuMap, item.getSpuId(), spu -> {
- // TODO @puhui999：这里可以使用链式哈
- item.setPicUrl(spu.getPicUrl());
- item.setMarketPrice(spu.getMarketPrice());
- });
+ findAndThen(spuMap, item.getSpuId(), spu -> item.setPicUrl(spu.getPicUrl()).setMarketPrice(spu.getMarketPrice()));
return item;
});
result.setList(list);
@@ -92,11 +86,7 @@ public interface BargainActivityConvert {
List<AppBargainActivityRespVO> activityList = convertAppList(list);
Map<Long, ProductSpuRespDTO> spuMap = convertMap(spuList, ProductSpuRespDTO::getId);
return CollectionUtils.convertList(activityList, item -> {
- findAndThen(spuMap, item.getSpuId(), spu -> {
- // TODO @puhui999：这里可以使用链式哈
- item.setPicUrl(spu.getPicUrl());
- item.setMarketPrice(spu.getMarketPrice());
- });
+ findAndThen(spuMap, item.getSpuId(), spu -> item.setPicUrl(spu.getPicUrl()).setMarketPrice(spu.getMarketPrice()));
return item;
});
}
diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/combination/CombinationActivityConvert.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/combination/CombinationActivityConvert.java
index d95428cd4..f92dbef59 100644
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/combination/CombinationActivityConvert.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/combination/CombinationActivityConvert.java
@@ -13,6 +13,8 @@ import cn.iocoder.yudao.module.promotion.controller.admin.combination.vo.activit
import cn.iocoder.yudao.module.promotion.controller.admin.combination.vo.activity.CombinationActivityUpdateReqVO;
import cn.iocoder.yudao.module.promotion.controller.admin.combination.vo.product.CombinationProductBaseVO;
import cn.iocoder.yudao.module.promotion.controller.admin.combination.vo.product.CombinationProductRespVO;
+import cn.iocoder.yudao.module.promotion.controller.app.combination.vo.activity.AppCombinationActivityDetailRespVO;
+import cn.iocoder.yudao.module.promotion.controller.app.combination.vo.activity.AppCombinationActivityRespVO;
import cn.iocoder.yudao.module.promotion.dal.dataobject.combination.CombinationActivityDO;
import cn.iocoder.yudao.module.promotion.dal.dataobject.combination.CombinationProductDO;
import cn.iocoder.yudao.module.promotion.dal.dataobject.combination.CombinationRecordDO;
@@ -25,6 +27,7 @@ import java.util.List;
import java.util.Map;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
+import static cn.iocoder.yudao.framework.common.util.collection.MapUtils.findAndThen;
/**
* 拼团活动 Convert
@@ -58,10 +61,7 @@ public interface CombinationActivityConvert {
Map<Long, ProductSpuRespDTO> spuMap = convertMap(spuList, ProductSpuRespDTO::getId);
PageResult<CombinationActivityRespVO> pageResult = convertPage(page);
pageResult.getList().forEach(item -> {
- MapUtils.findAndThen(spuMap, item.getSpuId(), spu -> {
- item.setSpuName(spu.getName());
- item.setPicUrl(spu.getPicUrl());
- });
+ MapUtils.findAndThen(spuMap, item.getSpuId(), spu -> item.setSpuName(spu.getName()).setPicUrl(spu.getPicUrl()));
item.setProducts(convertList2(productList));
});
return pageResult;
@@ -97,18 +97,51 @@ public interface CombinationActivityConvert {
default CombinationRecordDO convert(CombinationRecordCreateReqDTO reqDTO,
CombinationActivityDO activity, MemberUserRespDTO user,
ProductSpuRespDTO spu, ProductSkuRespDTO sku) {
- // TODO @puhui999：搞成链式的 set；这样会更规整一点；
- CombinationRecordDO record = convert(reqDTO);
- record.setVirtualGroup(false);
- record.setExpireTime(record.getStartTime().plusHours(activity.getLimitDuration()));
- record.setUserSize(activity.getUserSize());
- record.setNickname(user.getNickname());
- record.setAvatar(user.getAvatar());
- record.setSpuName(spu.getName());
- record.setPicUrl(sku.getPicUrl());
- return record;
+ // TODO @puhui999：订单付款后需要设置开始时间和结束时间；
+ return convert(reqDTO)
+ .setVirtualGroup(false)
+ .setExpireTime(activity.getStartTime().plusHours(activity.getLimitDuration()))
+ .setUserSize(activity.getUserSize())
+ .setNickname(user.getNickname())
+ .setAvatar(user.getAvatar())
+ .setSpuName(spu.getName())
+ .setPicUrl(sku.getPicUrl());
}
List<CombinationRecordRespDTO> convert(List<CombinationRecordDO> bean);
+ List<AppCombinationActivityRespVO> convertAppList(List<CombinationActivityDO> list);
+
+ default List<AppCombinationActivityRespVO> convertAppList(List<CombinationActivityDO> list, List<ProductSpuRespDTO> spuList) {
+ List<AppCombinationActivityRespVO> activityList = convertAppList(list);
+ Map<Long, ProductSpuRespDTO> spuMap = convertMap(spuList, ProductSpuRespDTO::getId);
+ return CollectionUtils.convertList(activityList, item -> {
+ findAndThen(spuMap, item.getSpuId(), spu -> item.setPicUrl(spu.getPicUrl()).setMarketPrice(spu.getMarketPrice()));
+ return item;
+ });
+ }
+
+ PageResult<AppCombinationActivityRespVO> convertAppPage(PageResult<CombinationActivityDO> result);
+
+ default PageResult<AppCombinationActivityRespVO> convertAppPage(PageResult<CombinationActivityDO> result, List<ProductSpuRespDTO> spuList) {
+ PageResult<AppCombinationActivityRespVO> appPage = convertAppPage(result);
+ Map<Long, ProductSpuRespDTO> spuMap = convertMap(spuList, ProductSpuRespDTO::getId);
+ List<AppCombinationActivityRespVO> list = CollectionUtils.convertList(appPage.getList(), item -> {
+ findAndThen(spuMap, item.getSpuId(), spu -> {
+ item.setPicUrl(spu.getPicUrl()).setMarketPrice(spu.getMarketPrice());
+ });
+ return item;
+ });
+ appPage.setList(list);
+ return appPage;
+ }
+
+ AppCombinationActivityDetailRespVO convert2(CombinationActivityDO combinationActivity);
+
+ List<AppCombinationActivityDetailRespVO.Product> convertList1(List<CombinationProductDO> products);
+
+ default AppCombinationActivityDetailRespVO convert3(CombinationActivityDO combinationActivity, List<CombinationProductDO> products) {
+ return convert2(combinationActivity).setProducts(convertList1(products));
+ }
+
}
diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/seckill/seckillactivity/SeckillActivityConvert.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/seckill/seckillactivity/SeckillActivityConvert.java
index e4c4d5e36..e1fcc35d8 100644
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/seckill/seckillactivity/SeckillActivityConvert.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/seckill/seckillactivity/SeckillActivityConvert.java
@@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.promotion.convert.seckill.seckillactivity;
+import cn.hutool.core.date.LocalDateTimeUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
@@ -29,7 +30,6 @@ import java.util.Map;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
import static cn.iocoder.yudao.framework.common.util.collection.MapUtils.findAndThen;
-import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
/**
* 秒杀活动 Convert
@@ -98,10 +98,9 @@ public interface SeckillActivityConvert {
Map<Long, ProductSpuRespDTO> spuMap = convertMap(spuList, ProductSpuRespDTO::getId);
respVO.setActivities(CollectionUtils.convertList(convertList3(activityList), item -> {
findAndThen(spuMap, item.getSpuId(), spu -> {
- // TODO @puhui999：可以尝试链式 set 哈；
- item.setPicUrl(spu.getPicUrl());
- item.setMarketPrice(spu.getMarketPrice());
- item.setUnitName(DictFrameworkUtils.getDictDataLabel(DictTypeConstants.PRODUCT_UNIT, spu.getUnit()));
+ item.setPicUrl(spu.getPicUrl())
+ .setMarketPrice(spu.getMarketPrice())
+ .setUnitName(DictFrameworkUtils.getDictDataLabel(DictTypeConstants.PRODUCT_UNIT, spu.getUnit()));
});
return item;
}));
@@ -114,12 +113,8 @@ public interface SeckillActivityConvert {
PageResult<AppSeckillActivityRespVO> result = convertPage1(pageResult);
Map<Long, ProductSpuRespDTO> spuMap = convertMap(spuList, ProductSpuRespDTO::getId);
List<AppSeckillActivityRespVO> list = CollectionUtils.convertList(result.getList(), item -> {
- findAndThen(spuMap, item.getSpuId(), spu -> {
- // TODO @puhui999：可以尝试链式 set 哈；
- item.setPicUrl(spu.getPicUrl());
- item.setMarketPrice(spu.getMarketPrice());
- item.setUnitName(DictFrameworkUtils.getDictDataLabel(DictTypeConstants.PRODUCT_UNIT, spu.getUnit()));
- });
+ findAndThen(spuMap, item.getSpuId(), spu -> item.setPicUrl(spu.getPicUrl()).setMarketPrice(spu.getMarketPrice())
+ .setUnitName(DictFrameworkUtils.getDictDataLabel(DictTypeConstants.PRODUCT_UNIT, spu.getUnit())));
return item;
});
result.setList(list);
@@ -131,12 +126,13 @@ public interface SeckillActivityConvert {
List<AppSeckillActivityDetailRespVO.Product> convertList1(List<SeckillProductDO> products);
default AppSeckillActivityDetailRespVO convert3(SeckillActivityDO seckillActivity, List<SeckillProductDO> products, SeckillConfigDO filteredConfig) {
- AppSeckillActivityDetailRespVO respVO = convert2(seckillActivity);
- respVO.setProducts(convertList1(products));
- // TODO @puhui999：可以尝试链式 set 哈；
- respVO.setStartTime(buildTime(filteredConfig.getStartTime()));
- respVO.setEndTime(buildTime(filteredConfig.getEndTime()));
- return respVO;
+ return convert2(seckillActivity)
+ .setProducts(convertList1(products))
+ // TODO @puhui999：要不要在里面 default 一个方法，处理这个事件；简洁一点；
+ .setStartTime(LocalDateTimeUtil.parse(LocalDateTimeUtil.format(seckillActivity.getStartTime(), "yyyy-MM-dd") + " " + filteredConfig.getStartTime(),
+ "yyyy-MM-dd HH:mm:ss")) // 活动开始日期和时段结合
+ .setEndTime(LocalDateTimeUtil.parse(LocalDateTimeUtil.format(seckillActivity.getEndTime(), "yyyy-MM-dd") + " " + filteredConfig.getEndTime(),
+ "yyyy-MM-dd HH:mm:ss")); // 活动结束日期和时段结合
}
}
diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/bargain/BargainActivityMapper.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/bargain/BargainActivityMapper.java
index f098895d2..de518f60c 100644
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/bargain/BargainActivityMapper.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/bargain/BargainActivityMapper.java
@@ -38,18 +38,41 @@ public interface BargainActivityMapper extends BaseMapperX<BargainActivityDO> {
* @param count 扣减的库存数量
* @return 影响的行数
*/
- default int updateActivityStock(Long id, int count) {
+ default int updateStock(Long id, int count) {
return update(null, new LambdaUpdateWrapper<BargainActivityDO>()
.eq(BargainActivityDO::getId, id)
.ge(BargainActivityDO::getStock, count)
.setSql("stock = stock - " + count));
}
- default PageResult<BargainActivityDO> selectAppPage(PageParam pageReqVO, Integer status, LocalDateTime now) {
+ /**
+ * 查询处在 now 日期时间且是 status 状态的活动分页
+ *
+ * @param pageReqVO 分页参数
+ * @param status 状态
+ * @param now 当前日期时间
+ * @return 活动分页
+ */
+ default PageResult<BargainActivityDO> selectPage(PageParam pageReqVO, Integer status, LocalDateTime now) {
return selectPage(pageReqVO, new LambdaQueryWrapperX<BargainActivityDO>()
.eq(BargainActivityDO::getStatus, status)
.le(BargainActivityDO::getStartTime, now)
.ge(BargainActivityDO::getEndTime, now));
}
+ /**
+ * 查询处在 now 日期时间且是 status 状态的活动分页
+ *
+ * @param status 状态
+ * @param now 当前日期时间
+ * @return 活动分页
+ */
+ default List<BargainActivityDO> selectList(Integer count, Integer status, LocalDateTime now) {
+ return selectList(new LambdaQueryWrapperX<BargainActivityDO>()
+ .eq(BargainActivityDO::getStatus, status)
+ .le(BargainActivityDO::getStartTime, now)
+ .ge(BargainActivityDO::getEndTime, now)
+ .last("LIMIT " + count));
+ }
+
}
diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationActivityMapper.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationActivityMapper.java
index c2868d191..5672c34dc 100644
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationActivityMapper.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationActivityMapper.java
@@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.promotion.dal.mysql.combination;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
@@ -28,4 +29,15 @@ public interface CombinationActivityMapper extends BaseMapperX<CombinationActivi
return selectList(CombinationActivityDO::getStatus, status);
}
+ default PageResult<CombinationActivityDO> selectPage(PageParam pageParam, Integer status) {
+ return selectPage(pageParam, new LambdaQueryWrapperX<CombinationActivityDO>()
+ .eq(CombinationActivityDO::getStatus, status));
+ }
+
+ default List<CombinationActivityDO> selectListByStatus(Integer status, Integer count) {
+ return selectList(new LambdaQueryWrapperX<CombinationActivityDO>()
+ .eq(CombinationActivityDO::getStatus, status)
+ .last("LIMIT " + count));
+ }
+
}
diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/seckill/seckillactivity/SeckillActivityMapper.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/seckill/seckillactivity/SeckillActivityMapper.java
index 8ce12092f..7e2afdc85 100644
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/seckill/seckillactivity/SeckillActivityMapper.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/seckill/seckillactivity/SeckillActivityMapper.java
@@ -41,7 +41,7 @@ public interface SeckillActivityMapper extends BaseMapperX<SeckillActivityDO> {
* @param count 扣减的库存数量
* @return 影响的行数
*/
- default int updateActivityStock(Long id, int count) {
+ default int updateStock(Long id, int count) {
return update(null, new LambdaUpdateWrapper<SeckillActivityDO>()
.eq(SeckillActivityDO::getId, id)
.gt(SeckillActivityDO::getTotalStock, 0)
diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/seckill/seckillactivity/SeckillProductMapper.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/seckill/seckillactivity/SeckillProductMapper.java
index 5ca2dae24..db34aa744 100644
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/seckill/seckillactivity/SeckillProductMapper.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/seckill/seckillactivity/SeckillProductMapper.java
@@ -16,8 +16,13 @@ import java.util.List;
@Mapper
public interface SeckillProductMapper extends BaseMapperX<SeckillProductDO> {
- default List<SeckillProductDO> selectListByActivityId(Long id) {
- return selectList(SeckillProductDO::getActivityId, id);
+ default List<SeckillProductDO> selectListByActivityId(Long activityId) {
+ return selectList(SeckillProductDO::getActivityId, activityId);
+ }
+
+ default SeckillProductDO selectByActivityIdAndSkuId(Long activityId, Long skuId) {
+ return selectOne(SeckillProductDO::getActivityId, activityId,
+ SeckillProductDO::getSkuId, skuId);
}
default List<SeckillProductDO> selectListByActivityId(Collection<Long> ids) {
@@ -31,7 +36,7 @@ public interface SeckillProductMapper extends BaseMapperX<SeckillProductDO> {
* @param count 扣减的库存数量
* @return 影响的行数
*/
- default int updateActivityStock(Long id, int count) {
+ default int updateStock(Long id, int count) {
return update(null, new LambdaUpdateWrapper<SeckillProductDO>()
.eq(SeckillProductDO::getId, id)
.gt(SeckillProductDO::getStock, count)
diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainActivityService.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainActivityService.java
index 1b3bd35dd..9a0c17af9 100644
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainActivityService.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainActivityService.java
@@ -63,22 +63,20 @@ public interface BargainActivityService {
*/
PageResult<BargainActivityDO> getBargainActivityPage(BargainActivityPageReqVO pageReqVO);
- // TODO @puhui999：这里可以改成进行中的活动；尽量避免专门为 app 定制，或者类似的名字哈；mapper 那也是
-
/**
- * 获取 APP 端活动分页数据
+ * 获取正在进行的活动分页数据
*
* @param pageReqVO 分页请求
* @return 砍价活动分页
*/
- PageResult<BargainActivityDO> getBargainActivityPageForApp(PageParam pageReqVO);
+ PageResult<BargainActivityDO> getBargainActivityPage(PageParam pageReqVO);
/**
- * 获取 APP 端活动展示数据
+ * 获取正在进行的活动分页数据
*
* @param count 需要的数量
* @return 砍价活动分页
*/
- List<BargainActivityDO> getBargainActivityListForApp(Integer count);
+ List<BargainActivityDO> getBargainActivityListByCount(Integer count);
}
diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainActivityServiceImpl.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainActivityServiceImpl.java
index 5aa075250..546b95041 100644
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainActivityServiceImpl.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainActivityServiceImpl.java
@@ -75,16 +75,18 @@ public class BargainActivityServiceImpl implements BargainActivityService {
}
@Override
- @Transactional(rollbackFor = Exception.class)
public void updateBargainActivityStock(Long id, Integer count) {
// 查询砍价活动
BargainActivityDO activity = getBargainActivity(id);
if (activity == null) {
throw exception(BARGAIN_ACTIVITY_NOT_EXISTS);
}
+ if (count > activity.getStock()) {
+ throw exception(BARGAIN_ACTIVITY_UPDATE_STOCK_FAIL);
+ }
// 更新砍价库存
- int updateCount = bargainActivityMapper.updateActivityStock(id, count);
+ int updateCount = bargainActivityMapper.updateStock(id, count);
if (updateCount == 0) {
throw exception(BARGAIN_ACTIVITY_UPDATE_STOCK_FAIL);
}
@@ -114,7 +116,7 @@ public class BargainActivityServiceImpl implements BargainActivityService {
public void deleteBargainActivity(Long id) {
// 校验存在
BargainActivityDO activityDO = validateBargainActivityExists(id);
- // 校验状态
+ // 校验状态 TODO puhui: 测试完成后需要恢复校验
//if (ObjectUtil.equal(activityDO.getStatus(), CommonStatusEnum.ENABLE.getStatus())) {
// throw exception(BARGAIN_ACTIVITY_DELETE_FAIL_STATUS_NOT_CLOSED_OR_END);
//}
@@ -142,21 +144,14 @@ public class BargainActivityServiceImpl implements BargainActivityService {
}
@Override
- public PageResult<BargainActivityDO> getBargainActivityPageForApp(PageParam pageReqVO) {
+ public PageResult<BargainActivityDO> getBargainActivityPage(PageParam pageReqVO) {
// 只查询进行中，且在时间范围内的
- return bargainActivityMapper.selectAppPage(pageReqVO, CommonStatusEnum.ENABLE.getStatus(), LocalDateTime.now());
+ return bargainActivityMapper.selectPage(pageReqVO, CommonStatusEnum.ENABLE.getStatus(), LocalDateTime.now());
}
@Override
- public List<BargainActivityDO> getBargainActivityListForApp(Integer count) {
- // TODO @puhui999：这种 default count 的逻辑，可以放到 controller 哈；然后可以使用 ObjectUtils.default 方法
- if (count == null) {
- count = 6;
- }
- // TODO @puhui999：这种不要用 page；会浪费一次 count；
- PageResult<BargainActivityDO> result = bargainActivityMapper.selectAppPage(new PageParam().setPageSize(count),
- CommonStatusEnum.ENABLE.getStatus(), LocalDateTime.now());
- return result.getList();
+ public List<BargainActivityDO> getBargainActivityListByCount(Integer count) {
+ return bargainActivityMapper.selectList(count, CommonStatusEnum.ENABLE.getStatus(), LocalDateTime.now());
}
}
diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityService.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityService.java
index 3529932a4..c5f72e6a6 100644
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityService.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityService.java
@@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.promotion.service.combination;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.promotion.controller.admin.combination.vo.activity.CombinationActivityCreateReqVO;
import cn.iocoder.yudao.module.promotion.controller.admin.combination.vo.activity.CombinationActivityPageReqVO;
@@ -9,6 +10,7 @@ import cn.iocoder.yudao.module.promotion.dal.dataobject.combination.CombinationP
import javax.validation.Valid;
import java.util.Collection;
+import java.util.Collections;
import java.util.List;
/**
@@ -64,6 +66,16 @@ public interface CombinationActivityService {
*/
PageResult<CombinationActivityDO> getCombinationActivityPage(CombinationActivityPageReqVO pageReqVO);
+ /**
+ * 获得拼团活动商品列表
+ *
+ * @param activityId 拼团活动 id
+ * @return 拼团活动的商品列表
+ */
+ default List<CombinationProductDO> getCombinationProductsByActivityId(Long activityId) {
+ return getCombinationProductsByActivityIds(Collections.singletonList(activityId));
+ }
+
/**
* 获得拼团活动商品列表
*
@@ -83,4 +95,20 @@ public interface CombinationActivityService {
*/
void validateCombination(Long activityId, Long userId, Long skuId, Integer count);
+ /**
+ * 获取正在进行的活动分页数据
+ *
+ * @param count 需要的数量
+ * @return 拼团活动分页
+ */
+ List<CombinationActivityDO> getCombinationActivityListByCount(Integer count);
+
+ /**
+ * 获取正在进行的活动分页数据
+ *
+ * @param pageParam 分页请求
+ * @return 拼团活动分页
+ */
+ PageResult<CombinationActivityDO> getCombinationActivityPage(PageParam pageParam);
+
}
diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityServiceImpl.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityServiceImpl.java
index 2224bf626..2dc715039 100644
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityServiceImpl.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityServiceImpl.java
@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.promotion.service.combination;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
import cn.iocoder.yudao.module.product.api.sku.ProductSkuApi;
@@ -223,8 +224,7 @@ public class CombinationActivityServiceImpl implements CombinationActivityServic
throw exception(COMBINATION_ACTIVITY_STATUS_DISABLE);
}
// 1.3 校验是否超出单次限购数量
- // TODO puhui999：count > activity.getSingleLimitCount() 会更好理解点；
- if (activity.getSingleLimitCount() < count) {
+ if (count > activity.getSingleLimitCount()) {
throw exception(COMBINATION_RECORD_FAILED_SINGLE_LIMIT_COUNT_EXCEED);
}
@@ -245,4 +245,14 @@ public class CombinationActivityServiceImpl implements CombinationActivityServic
}
}
+ @Override
+ public List<CombinationActivityDO> getCombinationActivityListByCount(Integer count) {
+ return combinationActivityMapper.selectListByStatus(CommonStatusEnum.ENABLE.getStatus(), count);
+ }
+
+ @Override
+ public PageResult<CombinationActivityDO> getCombinationActivityPage(PageParam pageParam) {
+ return combinationActivityMapper.selectPage(pageParam, CommonStatusEnum.ENABLE.getStatus());
+ }
+
}
diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImpl.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImpl.java
index bb62295b8..047e060a9 100644
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImpl.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImpl.java
@@ -96,12 +96,15 @@ public class CombinationRecordServiceImpl implements CombinationRecordService {
return recordDO;
}
+ // TODO @puhui999：有一个应该在创建那要做下；就是当前 activityId 已经有未支付的订单，不允许在发起新的；要么支付，要么去掉先；
+
@Override
@Transactional(rollbackFor = Exception.class)
public void createCombinationRecord(CombinationRecordCreateReqDTO reqDTO) {
// 1.1 校验拼团活动
CombinationActivityDO activity = combinationActivityService.validateCombinationActivityExists(reqDTO.getActivityId());
// 1.2 需要校验下，他当前是不是已经参加了该拼团；
+ // TODO @puhui999：拼团应该可以重复参加；应该去校验总共的上限哈，就是 activity.totalLimitCount
CombinationRecordDO recordDO = recordMapper.selectByUserIdAndOrderId(reqDTO.getUserId(), reqDTO.getOrderId());
if (recordDO != null) {
throw exception(COMBINATION_RECORD_EXISTS);
@@ -111,6 +114,7 @@ public class CombinationRecordServiceImpl implements CombinationRecordService {
if (CollUtil.isNotEmpty(recordDOList)) {
throw exception(COMBINATION_RECORD_FAILED_HAVE_JOINED);
}
+ // TODO @puhui999：有个开始时间未校验
// 1.4 校验当前活动是否过期
if (LocalDateTime.now().isAfter(activity.getEndTime())) {
throw exception(COMBINATION_RECORD_FAILED_TIME_END);
@@ -128,6 +132,8 @@ public class CombinationRecordServiceImpl implements CombinationRecordService {
}
}
+ // TODO @puhui999：单次限购
+
// 2. 创建拼团记录
MemberUserRespDTO user = memberUserApi.getUser(reqDTO.getUserId());
ProductSpuRespDTO spu = productSpuApi.getSpu(reqDTO.getSpuId());
diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/SeckillActivityService.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/SeckillActivityService.java
index 2be81ccb9..3cbee8126 100644
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/SeckillActivityService.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/SeckillActivityService.java
@@ -37,11 +37,11 @@ public interface SeckillActivityService {
/**
* 更新秒杀库存
*
- * @param activityId 活动编号
+ * @param id 活动编号
* @param skuId sku 编号
* @param count 数量
*/
- void updateSeckillStock(Long activityId, Long skuId, Integer count);
+ void updateSeckillStock(Long id, Long skuId, Integer count);
/**
* 关闭秒杀活动
@@ -97,6 +97,15 @@ public interface SeckillActivityService {
*/
List<SeckillActivityDO> getSeckillActivityListByConfigIds(Collection<Long> ids);
+ /**
+ * 通过活动时段编号获取指定 status 的秒杀活动
+ *
+ * @param configId 时段配置编号
+ * @param status 状态
+ * @return 秒杀活动列表
+ */
+ List<SeckillActivityDO> getSeckillActivityListByConfigIdAndStatus(Long configId, Integer status);
+
/**
* 通过活动时段获取秒杀活动
*
diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/SeckillActivityServiceImpl.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/SeckillActivityServiceImpl.java
index 10891e071..6e05191bf 100644
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/SeckillActivityServiceImpl.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/SeckillActivityServiceImpl.java
@@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.promotion.service.seckill;
import cn.hutool.core.util.ObjectUtil;
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
import cn.iocoder.yudao.module.product.api.sku.ProductSkuApi;
import cn.iocoder.yudao.module.product.api.sku.dto.ProductSkuRespDTO;
import cn.iocoder.yudao.module.product.api.spu.ProductSpuApi;
@@ -31,6 +30,7 @@ import java.util.Map;
import static cn.hutool.core.collection.CollUtil.isNotEmpty;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
+import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.isBetween;
import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.SKU_NOT_EXISTS;
import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.SPU_NOT_EXISTS;
import static cn.iocoder.yudao.module.promotion.enums.ErrorCodeConstants.*;
@@ -148,32 +148,26 @@ public class SeckillActivityServiceImpl implements SeckillActivityService {
@Override
@Transactional(rollbackFor = Exception.class)
- public void updateSeckillStock(Long activityId, Long skuId, Integer count) {
- // 1、校验秒杀活动是否存在
- SeckillActivityDO seckillActivity = getSeckillActivity(activityId);
- // 1.1、校验库存是否充足
- if (seckillActivity.getTotalStock() < count) {
+ public void updateSeckillStock(Long id, Long skuId, Integer count) {
+ // 1.1 校验活动库存是否充足
+ SeckillActivityDO seckillActivity = getSeckillActivity(id);
+ if (count > seckillActivity.getTotalStock()) {
+ throw exception(SECKILL_ACTIVITY_UPDATE_STOCK_FAIL);
+ }
+ // 1.2 校验商品库存是否充足
+ SeckillProductDO product = seckillProductMapper.selectByActivityIdAndSkuId(id, skuId);
+ if (product == null || count > product.getStock()) {
throw exception(SECKILL_ACTIVITY_UPDATE_STOCK_FAIL);
}
- // 2、获取活动商品
- List<SeckillProductDO> products = getSeckillProductListByActivityId(activityId);
- // 2.1、过滤出购买的商品
- SeckillProductDO product = findFirst(products, item -> ObjectUtil.equal(skuId, item.getSkuId()));
- // 2.2、检查活动商品库存是否充足
- boolean isSufficient = product == null || (product.getStock() == 0 || (product.getStock() < count) || (product.getStock() - count) < 0);
- if (isSufficient) {
- throw exception(SECKILL_ACTIVITY_UPDATE_STOCK_FAIL);
- }
-
- // 3、更新活动商品库存
- int updateCount = seckillProductMapper.updateActivityStock(product.getId(), count);
+ // 2.1 更新活动商品库存
+ int updateCount = seckillProductMapper.updateStock(product.getId(), count);
if (updateCount == 0) {
throw exception(SECKILL_ACTIVITY_UPDATE_STOCK_FAIL);
}
- // 4、更新活动库存
- updateCount = seckillActivityMapper.updateActivityStock(seckillActivity.getId(), count);
+ // 2.2 更新活动库存
+ updateCount = seckillActivityMapper.updateStock(seckillActivity.getId(), count);
if (updateCount == 0) {
throw exception(SECKILL_ACTIVITY_UPDATE_STOCK_FAIL);
}
@@ -268,8 +262,15 @@ public class SeckillActivityServiceImpl implements SeckillActivityService {
@Override
public List<SeckillActivityDO> getSeckillActivityListByConfigIds(Collection<Long> ids) {
- return CollectionUtils.filterList(seckillActivityMapper.selectList(),
- item -> CollectionUtils.anyMatch(item.getConfigIds(), ids::contains));
+ return filterList(seckillActivityMapper.selectList(),
+ item -> anyMatch(item.getConfigIds(), ids::contains));
+ }
+
+ @Override
+ public List<SeckillActivityDO> getSeckillActivityListByConfigIdAndStatus(Long configId, Integer status) {
+ return filterList(seckillActivityMapper.selectList(SeckillActivityDO::getStatus, status),
+ item -> anyMatch(item.getConfigIds(), id -> ObjectUtil.equal(id, configId)) // 校验时段
+ && isBetween(item.getStartTime(), item.getEndTime())); // 追加当前日期是否处在活动日期之间的校验条件
}
@Override
diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/SeckillConfigService.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/SeckillConfigService.java
index 5cbf4fd32..c8377e630 100644
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/SeckillConfigService.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/SeckillConfigService.java
@@ -54,6 +54,7 @@ public interface SeckillConfigService {
*/
List<SeckillConfigDO> getSeckillConfigList();
+
/**
* 校验秒杀时段是否存在
*
@@ -85,4 +86,12 @@ public interface SeckillConfigService {
*/
void updateSeckillConfigStatus(Long id, Integer status);
+ /**
+ * 获取当前日期时间处于的秒杀时段且状态为 status
+ *
+ * @param status 状态
+ * @return 时段
+ */
+ SeckillConfigDO getSeckillConfigListByStatusOnCurrentTime(Integer status);
+
}
diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/SeckillConfigServiceImpl.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/SeckillConfigServiceImpl.java
index ce2171079..a5d2309c8 100644
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/SeckillConfigServiceImpl.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/SeckillConfigServiceImpl.java
@@ -20,6 +20,8 @@ import java.util.Collection;
import java.util.List;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.findFirst;
+import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.isBetween;
import static cn.iocoder.yudao.module.promotion.enums.ErrorCodeConstants.*;
/**
@@ -67,6 +69,12 @@ public class SeckillConfigServiceImpl implements SeckillConfigService {
seckillConfigMapper.updateById(new SeckillConfigDO().setId(id).setStatus(status));
}
+ @Override
+ public SeckillConfigDO getSeckillConfigListByStatusOnCurrentTime(Integer status) {
+ return findFirst(seckillConfigMapper.selectList(SeckillConfigDO::getStatus, status),
+ config -> isBetween(config.getStartTime(), config.getEndTime()));
+ }
+
@Override
public void deleteSeckillConfig(Long id) {
// 校验存在
diff --git a/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/DictTypeConstants.java b/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/DictTypeConstants.java
new file mode 100644
index 000000000..ff09e59d8
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/DictTypeConstants.java
@@ -0,0 +1,12 @@
+package cn.iocoder.yudao.module.trade.enums;
+
+/**
+ * Trade 字典类型的枚举类
+ *
+ * @author owen
+ */
+public interface DictTypeConstants {
+
+ String BROKERAGE_WITHDRAW_STATUS = "brokerage_withdraw_status"; // 佣金提现状态
+
+}
diff --git a/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java b/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java
index 500601442..da0d8fa2b 100644
--- a/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java
+++ b/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java
@@ -12,12 +12,6 @@ import cn.iocoder.yudao.framework.common.exception.ErrorCode;
public interface ErrorCodeConstants {
// ========== Order 模块 1011000000 ==========
- ErrorCode ORDER_CREATE_SKU_NOT_FOUND = new ErrorCode(1011000001, "商品 SKU 不存在");
- ErrorCode ORDER_CREATE_SPU_NOT_SALE = new ErrorCode(1011000002, "商品 SPU 不可售卖");
- ErrorCode ORDER_CREATE_SKU_STOCK_NOT_ENOUGH = new ErrorCode(1011000004, "商品 SKU 库存不足");
- ErrorCode ORDER_CREATE_SPU_NOT_FOUND = new ErrorCode(1011000005, "商品 SPU 不可售卖");
- ErrorCode ORDER_CREATE_ADDRESS_NOT_FOUND = new ErrorCode(1011000006, "收货地址不存在");
-
ErrorCode ORDER_ITEM_NOT_FOUND = new ErrorCode(1011000010, "交易订单项不存在");
ErrorCode ORDER_NOT_FOUND = new ErrorCode(1011000011, "交易订单不存在");
ErrorCode ORDER_ITEM_UPDATE_AFTER_SALE_STATUS_FAIL = new ErrorCode(1011000012, "交易订单项更新售后状态失败，请重试");
@@ -37,6 +31,7 @@ public interface ErrorCodeConstants {
ErrorCode ORDER_UPDATE_PRICE_FAIL_PAID = new ErrorCode(1011000026, "支付订单调价失败，原因：支付订单已付款,不能调价");
ErrorCode ORDER_UPDATE_PRICE_FAIL_EQUAL = new ErrorCode(1011000027, "支付订单调价失败，原因：价格没有变化");
ErrorCode ORDER_UPDATE_PRICE_FAIL_NOT_ITEM = new ErrorCode(1011000028, "支付订单调价失败，原因：订单项不存在");
+ ErrorCode ORDER_DELETE_FAIL_STATUS_NOT_CANCEL = new ErrorCode(1011000029, "交易订单删除失败，订单不是【已取消】状态");
// ========== After Sale 模块 1011000100 ==========
ErrorCode AFTER_SALE_NOT_FOUND = new ErrorCode(1011000100, "售后单不存在");
@@ -58,9 +53,8 @@ public interface ErrorCodeConstants {
// ========== Price 相关 1011003000 ============
ErrorCode PRICE_CALCULATE_PAY_PRICE_ILLEGAL = new ErrorCode(1011003000, "支付价格计算异常，原因：价格小于等于 0");
- ErrorCode PRICE_CALCULATE_DELIVERY_PRICE_USER_ADDRESS_IS_EMPTY = new ErrorCode(1011003001, "计算快递运费异常，收件人地址编号为空");
ErrorCode PRICE_CALCULATE_DELIVERY_PRICE_TEMPLATE_NOT_FOUND = new ErrorCode(1011003002, "计算快递运费异常，找不到对应的运费模板");
- ErrorCode PRICE_CALCULATE_DELIVERY_PRICE_PICK_UP_STORE_IS_EMPTY = new ErrorCode(1011003003, "计算快递运费异常，自提点为空");
+ ErrorCode PRICE_CALCULATE_COUPON_NOT_MATCH_NORMAL_ORDER = new ErrorCode(1011003004, "参与秒杀、拼团、砍价的营销商品，无法使用优惠劵");
// ========== 物流 Express 模块 1011004000 ==========
ErrorCode EXPRESS_NOT_EXISTS = new ErrorCode(1011004000, "快递公司不存在");
@@ -93,5 +87,7 @@ public interface ErrorCodeConstants {
// ========== 分销提现 模块 1011008000 ==========
ErrorCode BROKERAGE_WITHDRAW_NOT_EXISTS = new ErrorCode(1011008000, "佣金提现记录不存在");
ErrorCode BROKERAGE_WITHDRAW_STATUS_NOT_AUDITING = new ErrorCode(1011008001, "佣金提现记录状态不是审核中");
+ ErrorCode BROKERAGE_WITHDRAW_MIN_PRICE = new ErrorCode(1011008002, "提现金额不能低于 {} 元");
+ ErrorCode BROKERAGE_WITHDRAW_USER_BALANCE_NOT_ENOUGH = new ErrorCode(1011008003, "您当前最多可提现 {} 元");
}
diff --git a/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/brokerage/BrokerageRecordBizTypeEnum.java b/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/brokerage/BrokerageRecordBizTypeEnum.java
index ae798a6ac..73fbb4c91 100644
--- a/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/brokerage/BrokerageRecordBizTypeEnum.java
+++ b/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/brokerage/BrokerageRecordBizTypeEnum.java
@@ -17,6 +17,7 @@ public enum BrokerageRecordBizTypeEnum implements IntArrayValuable {
ORDER(1, "获得推广佣金", "获得推广佣金 {}", true),
WITHDRAW(2, "提现申请", "提现申请扣除佣金 {}", false),
+ WITHDRAW_REJECT(3, "提现申请驳回", "提现申请驳回返还佣金 {}", true),
;
public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(BrokerageRecordBizTypeEnum::getType).toArray();
diff --git a/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/delivery/DeliveryExpressChargeModeEnum.java b/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/delivery/DeliveryExpressChargeModeEnum.java
index a4b5252ee..7503dd322 100644
--- a/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/delivery/DeliveryExpressChargeModeEnum.java
+++ b/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/delivery/DeliveryExpressChargeModeEnum.java
@@ -16,7 +16,7 @@ import java.util.Arrays;
@Getter
public enum DeliveryExpressChargeModeEnum implements IntArrayValuable {
- PIECE(1, "按件"),
+ COUNT(1, "按件"),
WEIGHT(2,"按重量"),
VOLUME(3, "按体积");
diff --git a/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderOperateTypeEnum.java b/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderOperateTypeEnum.java
index f16e35601..517928551 100644
--- a/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderOperateTypeEnum.java
+++ b/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderOperateTypeEnum.java
@@ -14,7 +14,10 @@ import lombok.RequiredArgsConstructor;
public enum TradeOrderOperateTypeEnum {
MEMBER_CREATE(1, "用户下单"),
- TEST(2, "用户({nickname})做了({thing})"),
+ MEMBER_RECEIVE(30, "用户已收货"),
+ MEMBER_COMMENT(31, "用户评价"),
+ MEMBER_CANCEL(40, "取消订单"),
+ MEMBER_DELETE(41, "删除订单"),
;
/**
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/aftersale/TradeAfterSaleController.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/aftersale/TradeAfterSaleController.java
index 0bf5a9cd9..3b438568b 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/aftersale/TradeAfterSaleController.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/aftersale/TradeAfterSaleController.java
@@ -8,11 +8,11 @@ import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
import cn.iocoder.yudao.module.pay.api.notify.dto.PayRefundNotifyReqDTO;
import cn.iocoder.yudao.module.trade.controller.admin.aftersale.vo.*;
+import cn.iocoder.yudao.module.trade.controller.admin.aftersale.vo.log.TradeAfterSaleLogRespVO;
import cn.iocoder.yudao.module.trade.convert.aftersale.TradeAfterSaleConvert;
import cn.iocoder.yudao.module.trade.dal.dataobject.aftersale.TradeAfterSaleDO;
import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderDO;
import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderItemDO;
-import cn.iocoder.yudao.module.trade.framework.aftersalelog.core.dto.TradeAfterSaleLogRespDTO;
import cn.iocoder.yudao.module.trade.framework.aftersalelog.core.service.AfterSaleLogService;
import cn.iocoder.yudao.module.trade.service.aftersale.TradeAfterSaleService;
import cn.iocoder.yudao.module.trade.service.order.TradeOrderQueryService;
@@ -87,13 +87,13 @@ public class TradeAfterSaleController {
// 拼接数据
MemberUserRespDTO user = memberUserApi.getUser(afterSale.getUserId());
// 获取售后日志
- List<TradeAfterSaleLogRespDTO> logs = afterSaleLogService.getLog(afterSale.getId());
+ List<TradeAfterSaleLogRespVO> logs = afterSaleLogService.getLog(afterSale.getId());
// TODO 方便测试看效果，review 后移除
if (logs == null) {
logs = new ArrayList<>();
}
for (int i = 1; i <= 6; i++) {
- TradeAfterSaleLogRespDTO respVO = new TradeAfterSaleLogRespDTO();
+ TradeAfterSaleLogRespVO respVO = new TradeAfterSaleLogRespVO();
respVO.setId((long) i);
respVO.setUserId((long) i);
respVO.setUserType(i % 2 == 0 ? 2 : 1);
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/record/BrokerageRecordController.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/BrokerageRecordController.java
similarity index 89%
rename from yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/record/BrokerageRecordController.java
rename to yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/BrokerageRecordController.java
index 9bb135670..ff9bd5285 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/record/BrokerageRecordController.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/BrokerageRecordController.java
@@ -1,14 +1,14 @@
-package cn.iocoder.yudao.module.trade.controller.admin.brokerage.record;
+package cn.iocoder.yudao.module.trade.controller.admin.brokerage;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
-import cn.iocoder.yudao.module.trade.controller.admin.brokerage.record.vo.BrokerageRecordPageReqVO;
-import cn.iocoder.yudao.module.trade.controller.admin.brokerage.record.vo.BrokerageRecordRespVO;
-import cn.iocoder.yudao.module.trade.convert.brokerage.record.BrokerageRecordConvert;
-import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.record.BrokerageRecordDO;
-import cn.iocoder.yudao.module.trade.service.brokerage.record.BrokerageRecordService;
+import cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.record.BrokerageRecordPageReqVO;
+import cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.record.BrokerageRecordRespVO;
+import cn.iocoder.yudao.module.trade.convert.brokerage.BrokerageRecordConvert;
+import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.BrokerageRecordDO;
+import cn.iocoder.yudao.module.trade.service.brokerage.BrokerageRecordService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/user/BrokerageUserController.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/BrokerageUserController.java
similarity index 79%
rename from yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/user/BrokerageUserController.java
rename to yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/BrokerageUserController.java
index d90900061..8d27dd3b4 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/user/BrokerageUserController.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/BrokerageUserController.java
@@ -1,17 +1,20 @@
-package cn.iocoder.yudao.module.trade.controller.admin.brokerage.user;
+package cn.iocoder.yudao.module.trade.controller.admin.brokerage;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
-import cn.iocoder.yudao.module.trade.controller.admin.brokerage.user.vo.*;
-import cn.iocoder.yudao.module.trade.convert.brokerage.user.BrokerageUserConvert;
-import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.user.BrokerageUserDO;
+import cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.user.*;
+import cn.iocoder.yudao.module.trade.convert.brokerage.BrokerageUserConvert;
+import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.BrokerageUserDO;
import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageRecordBizTypeEnum;
import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageRecordStatusEnum;
+import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageWithdrawStatusEnum;
+import cn.iocoder.yudao.module.trade.service.brokerage.BrokerageWithdrawService;
import cn.iocoder.yudao.module.trade.service.brokerage.bo.UserBrokerageSummaryBO;
-import cn.iocoder.yudao.module.trade.service.brokerage.record.BrokerageRecordService;
-import cn.iocoder.yudao.module.trade.service.brokerage.user.BrokerageUserService;
+import cn.iocoder.yudao.module.trade.service.brokerage.BrokerageRecordService;
+import cn.iocoder.yudao.module.trade.service.brokerage.BrokerageUserService;
+import cn.iocoder.yudao.module.trade.service.brokerage.bo.UserWithdrawSummaryBO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -38,6 +41,8 @@ public class BrokerageUserController {
private BrokerageUserService brokerageUserService;
@Resource
private BrokerageRecordService brokerageRecordService;
+ @Resource
+ private BrokerageWithdrawService brokerageWithdrawService;
@Resource
private MemberUserApi memberUserApi;
@@ -87,6 +92,7 @@ public class BrokerageUserController {
Set<Long> userIds = convertSet(pageResult.getList(), BrokerageUserDO::getId);
// 查询用户信息
Map<Long, MemberUserRespDTO> userMap = memberUserApi.getUserMap(userIds);
+ // TODO @疯狂：看看下面两个 getBrokerageUserCountByBindUserId、getWithdrawSummaryByUserId 有没可能一次性出结果，不然 n 次有点太花性能了；
// 合计分佣订单
Map<Long, UserBrokerageSummaryBO> userOrderSummaryMap = convertMap(userIds,
userId -> userId,
@@ -96,10 +102,13 @@ public class BrokerageUserController {
Map<Long, Long> brokerageUserCountMap = convertMap(userIds,
userId -> userId,
userId -> brokerageUserService.getBrokerageUserCountByBindUserId(userId, null));
-
- // todo 合计提现
-
- return success(BrokerageUserConvert.INSTANCE.convertPage(pageResult, userMap, brokerageUserCountMap, userOrderSummaryMap));
+ // 合计提现
+ Map<Long, UserWithdrawSummaryBO> withdrawMap = convertMap(userIds,
+ userId -> userId,
+ userId -> brokerageWithdrawService.getWithdrawSummaryByUserId(userId, BrokerageWithdrawStatusEnum.AUDIT_SUCCESS));
+ // 拼接返回
+ return success(BrokerageUserConvert.INSTANCE.convertPage(pageResult, userMap, brokerageUserCountMap,
+ userOrderSummaryMap, withdrawMap));
}
}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/withdraw/BrokerageWithdrawController.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/BrokerageWithdrawController.java
similarity index 89%
rename from yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/withdraw/BrokerageWithdrawController.java
rename to yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/BrokerageWithdrawController.java
index 1ba6130a2..609cfa433 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/withdraw/BrokerageWithdrawController.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/BrokerageWithdrawController.java
@@ -1,16 +1,16 @@
-package cn.iocoder.yudao.module.trade.controller.admin.brokerage.withdraw;
+package cn.iocoder.yudao.module.trade.controller.admin.brokerage;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
-import cn.iocoder.yudao.module.trade.controller.admin.brokerage.withdraw.vo.BrokerageWithdrawRejectReqVO;
-import cn.iocoder.yudao.module.trade.controller.admin.brokerage.withdraw.vo.BrokerageWithdrawPageReqVO;
-import cn.iocoder.yudao.module.trade.controller.admin.brokerage.withdraw.vo.BrokerageWithdrawRespVO;
-import cn.iocoder.yudao.module.trade.convert.brokerage.withdraw.BrokerageWithdrawConvert;
-import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.withdraw.BrokerageWithdrawDO;
+import cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.withdraw.BrokerageWithdrawRejectReqVO;
+import cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.withdraw.BrokerageWithdrawPageReqVO;
+import cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.withdraw.BrokerageWithdrawRespVO;
+import cn.iocoder.yudao.module.trade.convert.brokerage.BrokerageWithdrawConvert;
+import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.BrokerageWithdrawDO;
import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageWithdrawStatusEnum;
-import cn.iocoder.yudao.module.trade.service.brokerage.withdraw.BrokerageWithdrawService;
+import cn.iocoder.yudao.module.trade.service.brokerage.BrokerageWithdrawService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/record/vo/BrokerageRecordBaseVO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/record/BrokerageRecordBaseVO.java
similarity index 99%
rename from yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/record/vo/BrokerageRecordBaseVO.java
rename to yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/record/BrokerageRecordBaseVO.java
index 425758631..0c53f99fb 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/record/vo/BrokerageRecordBaseVO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/record/BrokerageRecordBaseVO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.trade.controller.admin.brokerage.record.vo;
+package cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.record;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/record/vo/BrokerageRecordPageReqVO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/record/BrokerageRecordPageReqVO.java
similarity index 98%
rename from yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/record/vo/BrokerageRecordPageReqVO.java
rename to yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/record/BrokerageRecordPageReqVO.java
index 8d0eeff3f..36c4744e8 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/record/vo/BrokerageRecordPageReqVO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/record/BrokerageRecordPageReqVO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.trade.controller.admin.brokerage.record.vo;
+package cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.record;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/record/vo/BrokerageRecordRespVO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/record/BrokerageRecordRespVO.java
similarity index 99%
rename from yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/record/vo/BrokerageRecordRespVO.java
rename to yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/record/BrokerageRecordRespVO.java
index 1f58b53ee..224ecf1e5 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/record/vo/BrokerageRecordRespVO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/record/BrokerageRecordRespVO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.trade.controller.admin.brokerage.record.vo;
+package cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.record;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/user/vo/BrokerageUserBaseVO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/user/BrokerageUserBaseVO.java
similarity index 99%
rename from yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/user/vo/BrokerageUserBaseVO.java
rename to yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/user/BrokerageUserBaseVO.java
index 34f792b72..05e5935b0 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/user/vo/BrokerageUserBaseVO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/user/BrokerageUserBaseVO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.trade.controller.admin.brokerage.user.vo;
+package cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.user;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/user/vo/BrokerageUserClearBrokerageUserReqVO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/user/BrokerageUserClearBrokerageUserReqVO.java
similarity index 98%
rename from yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/user/vo/BrokerageUserClearBrokerageUserReqVO.java
rename to yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/user/BrokerageUserClearBrokerageUserReqVO.java
index edb0102a0..5a05c56ce 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/user/vo/BrokerageUserClearBrokerageUserReqVO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/user/BrokerageUserClearBrokerageUserReqVO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.trade.controller.admin.brokerage.user.vo;
+package cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.user;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/user/vo/BrokerageUserPageReqVO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/user/BrokerageUserPageReqVO.java
similarity index 99%
rename from yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/user/vo/BrokerageUserPageReqVO.java
rename to yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/user/BrokerageUserPageReqVO.java
index 1f7816355..cb0ce8954 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/user/vo/BrokerageUserPageReqVO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/user/BrokerageUserPageReqVO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.trade.controller.admin.brokerage.user.vo;
+package cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.user;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/user/vo/BrokerageUserRespVO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/user/BrokerageUserRespVO.java
similarity index 99%
rename from yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/user/vo/BrokerageUserRespVO.java
rename to yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/user/BrokerageUserRespVO.java
index 4aa3e5732..4713d8e13 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/user/vo/BrokerageUserRespVO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/user/BrokerageUserRespVO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.trade.controller.admin.brokerage.user.vo;
+package cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.user;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/user/vo/BrokerageUserUpdateBrokerageEnabledReqVO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/user/BrokerageUserUpdateBrokerageEnabledReqVO.java
similarity index 98%
rename from yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/user/vo/BrokerageUserUpdateBrokerageEnabledReqVO.java
rename to yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/user/BrokerageUserUpdateBrokerageEnabledReqVO.java
index 92001e698..d097855a2 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/user/vo/BrokerageUserUpdateBrokerageEnabledReqVO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/user/BrokerageUserUpdateBrokerageEnabledReqVO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.trade.controller.admin.brokerage.user.vo;
+package cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.user;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/user/vo/BrokerageUserUpdateBrokerageUserReqVO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/user/BrokerageUserUpdateBrokerageUserReqVO.java
similarity index 98%
rename from yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/user/vo/BrokerageUserUpdateBrokerageUserReqVO.java
rename to yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/user/BrokerageUserUpdateBrokerageUserReqVO.java
index d62c7fd1e..56391c4d5 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/user/vo/BrokerageUserUpdateBrokerageUserReqVO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/user/BrokerageUserUpdateBrokerageUserReqVO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.trade.controller.admin.brokerage.user.vo;
+package cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.user;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/withdraw/vo/BrokerageWithdrawBaseVO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/withdraw/BrokerageWithdrawBaseVO.java
similarity index 99%
rename from yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/withdraw/vo/BrokerageWithdrawBaseVO.java
rename to yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/withdraw/BrokerageWithdrawBaseVO.java
index 58f0ee8ef..8aca8a2bb 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/withdraw/vo/BrokerageWithdrawBaseVO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/withdraw/BrokerageWithdrawBaseVO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.trade.controller.admin.brokerage.withdraw.vo;
+package cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.withdraw;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/withdraw/vo/BrokerageWithdrawPageReqVO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/withdraw/BrokerageWithdrawPageReqVO.java
similarity index 99%
rename from yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/withdraw/vo/BrokerageWithdrawPageReqVO.java
rename to yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/withdraw/BrokerageWithdrawPageReqVO.java
index c6f56878a..b18ff74af 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/withdraw/vo/BrokerageWithdrawPageReqVO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/withdraw/BrokerageWithdrawPageReqVO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.trade.controller.admin.brokerage.withdraw.vo;
+package cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.withdraw;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.validation.InEnum;
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/withdraw/vo/BrokerageWithdrawRejectReqVO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/withdraw/BrokerageWithdrawRejectReqVO.java
similarity index 98%
rename from yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/withdraw/vo/BrokerageWithdrawRejectReqVO.java
rename to yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/withdraw/BrokerageWithdrawRejectReqVO.java
index 72e26c547..23e6c28e5 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/withdraw/vo/BrokerageWithdrawRejectReqVO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/withdraw/BrokerageWithdrawRejectReqVO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.trade.controller.admin.brokerage.withdraw.vo;
+package cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.withdraw;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/withdraw/vo/BrokerageWithdrawRespVO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/withdraw/BrokerageWithdrawRespVO.java
similarity index 98%
rename from yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/withdraw/vo/BrokerageWithdrawRespVO.java
rename to yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/withdraw/BrokerageWithdrawRespVO.java
index c21d5b539..de74bb4f6 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/withdraw/vo/BrokerageWithdrawRespVO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/withdraw/BrokerageWithdrawRespVO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.trade.controller.admin.brokerage.withdraw.vo;
+package cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.withdraw;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/config/vo/TradeConfigBaseVO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/config/vo/TradeConfigBaseVO.java
index ee20156f1..dfad27e03 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/config/vo/TradeConfigBaseVO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/config/vo/TradeConfigBaseVO.java
@@ -19,6 +19,17 @@ import java.util.List;
*/
@Data
public class TradeConfigBaseVO {
+ /**
+ * 是否启用全场包邮
+ */
+ @Schema(description = "是否启用全场包邮", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
+ @NotNull(message = "是否启用全场包邮不能为空")
+ private Boolean deliveryExpressFreeEnabled;
+
+ @Schema(description = "全场包邮的最小金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1000")
+ @NotNull(message = "全场包邮的最小金额不能为空")
+ @PositiveOrZero(message = "全场包邮的最小金额不能是负数")
+ private Integer deliveryExpressFreePrice;
// ========== 分销相关 ==========
@@ -37,7 +48,7 @@ public class TradeConfigBaseVO {
private Integer brokerageBindMode;
@Schema(description = "分销海报图地址数组", requiredMode = Schema.RequiredMode.REQUIRED, example = "[https://www.iocoder.cn/yudao.jpg]")
- private List<String> brokeragePostUrls;
+ private List<String> brokeragePosterUrls;
@Schema(description = "一级返佣比例", requiredMode = Schema.RequiredMode.REQUIRED, example = "5")
@NotNull(message = "一级返佣比例不能为空")
@@ -54,6 +65,11 @@ public class TradeConfigBaseVO {
@PositiveOrZero(message = "用户提现最低金额不能是负数")
private Integer brokerageWithdrawMinPrice;
+ @Schema(description = "用户提现手续费百分比", requiredMode = Schema.RequiredMode.REQUIRED, example = "1000")
+ @NotNull(message = "用户提现手续费百分比不能为空")
+ @PositiveOrZero(message = "用户提现手续费百分比不能是负数")
+ private Integer brokerageWithdrawFeePercent;
+
@Schema(description = "提现银行", requiredMode = Schema.RequiredMode.REQUIRED, example = "[0, 1]")
@NotEmpty(message = "提现银行不能为空")
private List<Integer> brokerageBankNames;
@@ -66,6 +82,6 @@ public class TradeConfigBaseVO {
@Schema(description = "提现方式", requiredMode = Schema.RequiredMode.REQUIRED, example = "[0, 1]")
@NotNull(message = "提现方式不能为空")
@InEnum(value = BrokerageWithdrawTypeEnum.class, message = "提现方式必须是 {value}")
- private List<Integer> brokerageWithdrawType;
+ private List<Integer> brokerageWithdrawTypes;
}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/AppBrokerageRecordController.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/AppBrokerageRecordController.java
index 66fb2994a..7cbd6e551 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/AppBrokerageRecordController.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/AppBrokerageRecordController.java
@@ -6,7 +6,9 @@ import cn.iocoder.yudao.framework.security.core.annotations.PreAuthenticated;
import cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.record.AppBrokerageProductPriceRespVO;
import cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.record.AppBrokerageRecordPageReqVO;
import cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.record.AppBrokerageRecordRespVO;
-import cn.iocoder.yudao.module.trade.service.brokerage.user.BrokerageUserService;
+import cn.iocoder.yudao.module.trade.convert.brokerage.BrokerageRecordConvert;
+import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.BrokerageRecordDO;
+import cn.iocoder.yudao.module.trade.service.brokerage.BrokerageRecordService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
@@ -18,11 +20,9 @@ import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.validation.Valid;
-import java.time.LocalDateTime;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils.getLoginUserId;
-import static java.util.Arrays.asList;
@Tag(name = "用户 APP - 分销用户")
@RestController
@@ -31,30 +31,21 @@ import static java.util.Arrays.asList;
@Slf4j
public class AppBrokerageRecordController {
@Resource
- private BrokerageUserService brokerageUserService;
+ private BrokerageRecordService brokerageRecordService;
- // TODO 芋艿：临时 mock =>
@GetMapping("/page")
@Operation(summary = "获得分销记录分页")
@PreAuthenticated
public CommonResult<PageResult<AppBrokerageRecordRespVO>> getBrokerageRecordPage(@Valid AppBrokerageRecordPageReqVO pageReqVO) {
- AppBrokerageRecordRespVO vo1 = new AppBrokerageRecordRespVO()
- .setId(1L).setPrice(10).setTitle("收到钱").setCreateTime(LocalDateTime.now())
- .setFinishTime(LocalDateTime.now());
- AppBrokerageRecordRespVO vo2 = new AppBrokerageRecordRespVO()
- .setId(2L).setPrice(-20).setTitle("提现钱").setCreateTime(LocalDateTime.now())
- .setFinishTime(LocalDateTime.now());
- return success(new PageResult<>(asList(vo1, vo2), 10L));
+ PageResult<BrokerageRecordDO> pageResult = brokerageRecordService.getBrokerageRecordPage(
+ BrokerageRecordConvert.INSTANCE.convert(pageReqVO, getLoginUserId()));
+ return success(BrokerageRecordConvert.INSTANCE.convertPage02(pageResult));
}
@GetMapping("/get-product-brokerage-price")
@Operation(summary = "获得商品的分销金额")
public CommonResult<AppBrokerageProductPriceRespVO> getProductBrokeragePrice(@RequestParam("spuId") Long spuId) {
- AppBrokerageProductPriceRespVO respVO = new AppBrokerageProductPriceRespVO();
- respVO.setEnabled(brokerageUserService.getUserBrokerageEnabled(getLoginUserId()));
- respVO.setBrokerageMinPrice(1);
- respVO.setBrokerageMaxPrice(2);
- return success(respVO);
+ return success(brokerageRecordService.calculateProductBrokeragePrice(spuId, getLoginUserId()));
}
}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/AppBrokerageUserController.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/AppBrokerageUserController.java
index 208ecee2e..da78f9dff 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/AppBrokerageUserController.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/AppBrokerageUserController.java
@@ -1,10 +1,21 @@
package cn.iocoder.yudao.module.trade.controller.app.brokerage;
+import cn.hutool.core.date.LocalDateTimeUtil;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.security.core.annotations.PreAuthenticated;
+import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
+import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
import cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.user.*;
-import cn.iocoder.yudao.module.trade.service.brokerage.user.BrokerageUserService;
+import cn.iocoder.yudao.module.trade.convert.brokerage.BrokerageRecordConvert;
+import cn.iocoder.yudao.module.trade.convert.brokerage.BrokerageUserConvert;
+import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.BrokerageUserDO;
+import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageRecordBizTypeEnum;
+import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageWithdrawStatusEnum;
+import cn.iocoder.yudao.module.trade.service.brokerage.BrokerageRecordService;
+import cn.iocoder.yudao.module.trade.service.brokerage.BrokerageUserService;
+import cn.iocoder.yudao.module.trade.service.brokerage.BrokerageWithdrawService;
+import cn.iocoder.yudao.module.trade.service.brokerage.bo.UserWithdrawSummaryBO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -16,11 +27,13 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.Valid;
import java.time.LocalDateTime;
+import java.util.Map;
+import java.util.Optional;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-import static java.util.Arrays.asList;
@Tag(name = "用户 APP - 分销用户")
@RestController
@@ -30,16 +43,24 @@ import static java.util.Arrays.asList;
public class AppBrokerageUserController {
@Resource
private BrokerageUserService brokerageUserService;
+ @Resource
+ private BrokerageRecordService brokerageRecordService;
+ @Resource
+ private BrokerageWithdrawService brokerageWithdrawService;
+
+ @Resource
+ private MemberUserApi memberUserApi;
- // TODO 芋艿：临时 mock =>
@GetMapping("/get")
@Operation(summary = "获得个人分销信息")
@PreAuthenticated
public CommonResult<AppBrokerageUserRespVO> getBrokerageUser() {
+ Optional<BrokerageUserDO> user = Optional.ofNullable(brokerageUserService.getBrokerageUser(getLoginUserId()));
+ // 返回数据
AppBrokerageUserRespVO respVO = new AppBrokerageUserRespVO()
- .setBrokerageEnabled(true)
- .setPrice(2000)
- .setFrozenPrice(3000);
+ .setBrokerageEnabled(user.map(BrokerageUserDO::getBrokerageEnabled).orElse(false))
+ .setBrokeragePrice(user.map(BrokerageUserDO::getBrokeragePrice).orElse(0))
+ .setFrozenPrice(user.map(BrokerageUserDO::getFrozenPrice).orElse(0));
return success(respVO);
}
@@ -47,88 +68,70 @@ public class AppBrokerageUserController {
@Operation(summary = "绑定推广员")
@PreAuthenticated
public CommonResult<Boolean> bindBrokerageUser(@Valid @RequestBody AppBrokerageUserBindReqVO reqVO) {
- return success(brokerageUserService.bindBrokerageUser(getLoginUserId(), reqVO.getBindUserId(), false));
+ MemberUserRespDTO user = memberUserApi.getUser(getLoginUserId());
+ return success(brokerageUserService.bindBrokerageUser(user.getId(), reqVO.getBindUserId(), user.getCreateTime()));
}
- // TODO 芋艿：临时 mock =>
@GetMapping("/get-summary")
@Operation(summary = "获得个人分销统计")
@PreAuthenticated
public CommonResult<AppBrokerageUserMySummaryRespVO> getBrokerageUserSummary() {
+ Long userId = getLoginUserId();
+ // TODO @疯狂：后面这种，要不也改成 convert；感觉 controller 这样更容易看到整体；核心其实是 86、8/87、9/90、9/91 这阶段
+ // 统计 yesterdayPrice、withdrawPrice、firstBrokerageUserCount、secondBrokerageUserCount 字段
+ LocalDateTime yesterday = LocalDateTime.now().minusDays(1);
+ LocalDateTime beginTime = LocalDateTimeUtil.beginOfDay(yesterday);
+ LocalDateTime endTime = LocalDateTimeUtil.endOfDay(yesterday);
AppBrokerageUserMySummaryRespVO respVO = new AppBrokerageUserMySummaryRespVO()
- .setYesterdayPrice(1)
- .setBrokeragePrice(2)
- .setFrozenPrice(3)
- .setWithdrawPrice(4)
- .setFirstBrokerageUserCount(166)
- .setSecondBrokerageUserCount(233);
+ .setYesterdayPrice(brokerageRecordService.getSummaryPriceByUserId(userId, BrokerageRecordBizTypeEnum.ORDER.getType(), beginTime, endTime))
+ .setWithdrawPrice(Optional.ofNullable(brokerageWithdrawService.getWithdrawSummaryByUserId(userId, BrokerageWithdrawStatusEnum.AUDIT_SUCCESS))
+ .map(UserWithdrawSummaryBO::getPrice).orElse(0))
+ .setBrokeragePrice(0).setFrozenPrice(0)
+ .setFirstBrokerageUserCount(brokerageUserService.getBrokerageUserCountByBindUserId(userId, 1))
+ .setSecondBrokerageUserCount(brokerageUserService.getBrokerageUserCountByBindUserId(userId, 2));
+ // 设置 brokeragePrice、frozenPrice 字段
+ Optional.ofNullable(brokerageUserService.getBrokerageUser(userId))
+ .ifPresent(user -> respVO.setBrokeragePrice(user.getBrokeragePrice()).setFrozenPrice(user.getFrozenPrice()));
return success(respVO);
}
- // TODO 芋艿：临时 mock =>
@GetMapping("/rank-page-by-user-count")
@Operation(summary = "获得分销用户排行分页（基于用户量）")
@PreAuthenticated
public CommonResult<PageResult<AppBrokerageUserRankByUserCountRespVO>> getBrokerageUserRankPageByUserCount(AppBrokerageUserRankPageReqVO pageReqVO) {
- AppBrokerageUserRankByUserCountRespVO vo1 = new AppBrokerageUserRankByUserCountRespVO()
- .setId(1L).setNickname("芋1**艿").setAvatar("http://www.iocoder.cn/images/common/wechat_mp_2017_07_31_bak.jpg")
- .setBrokerageUserCount(10);
- AppBrokerageUserRankByUserCountRespVO vo2 = new AppBrokerageUserRankByUserCountRespVO()
- .setId(2L).setNickname("芋2**艿").setAvatar("http://www.iocoder.cn/images/common/wechat_mp_2017_07_31_bak.jpg")
- .setBrokerageUserCount(6);
- AppBrokerageUserRankByUserCountRespVO vo3 = new AppBrokerageUserRankByUserCountRespVO()
- .setId(3L).setNickname("芋3**艿").setAvatar("http://www.iocoder.cn/images/common/wechat_mp_2017_07_31_bak.jpg")
- .setBrokerageUserCount(4);
- AppBrokerageUserRankByUserCountRespVO vo4 = new AppBrokerageUserRankByUserCountRespVO()
- .setId(3L).setNickname("芋3**艿").setAvatar("http://www.iocoder.cn/images/common/wechat_mp_2017_07_31_bak.jpg")
- .setBrokerageUserCount(4);
- return success(new PageResult<>(asList(vo1, vo2, vo3, vo4), 10L));
+ // 分页查询
+ PageResult<AppBrokerageUserRankByUserCountRespVO> pageResult = brokerageUserService.getBrokerageUserRankPageByUserCount(pageReqVO);
+ // 拼接数据
+ Map<Long, MemberUserRespDTO> userMap = memberUserApi.getUserMap(convertSet(pageResult.getList(), AppBrokerageUserRankByUserCountRespVO::getId));
+ return success(BrokerageUserConvert.INSTANCE.convertPage03(pageResult, userMap));
}
- // TODO 芋艿：临时 mock =>
@GetMapping("/rank-page-by-price")
@Operation(summary = "获得分销用户排行分页（基于佣金）")
@PreAuthenticated
public CommonResult<PageResult<AppBrokerageUserRankByPriceRespVO>> getBrokerageUserChildSummaryPageByPrice(AppBrokerageUserRankPageReqVO pageReqVO) {
- AppBrokerageUserRankByPriceRespVO vo1 = new AppBrokerageUserRankByPriceRespVO()
- .setId(1L).setNickname("芋1**艿").setAvatar("http://www.iocoder.cn/images/common/wechat_mp_2017_07_31_bak.jpg")
- .setBrokeragePrice(10);
- AppBrokerageUserRankByPriceRespVO vo2 = new AppBrokerageUserRankByPriceRespVO()
- .setId(2L).setNickname("芋2**艿").setAvatar("http://www.iocoder.cn/images/common/wechat_mp_2017_07_31_bak.jpg")
- .setBrokeragePrice(6);
- AppBrokerageUserRankByPriceRespVO vo3 = new AppBrokerageUserRankByPriceRespVO()
- .setId(3L).setNickname("芋3**艿").setAvatar("http://www.iocoder.cn/images/common/wechat_mp_2017_07_31_bak.jpg")
- .setBrokeragePrice(4);
- AppBrokerageUserRankByPriceRespVO vo4 = new AppBrokerageUserRankByPriceRespVO()
- .setId(3L).setNickname("芋3**艿").setAvatar("http://www.iocoder.cn/images/common/wechat_mp_2017_07_31_bak.jpg")
- .setBrokeragePrice(4);
- return success(new PageResult<>(asList(vo1, vo2, vo3, vo4), 10L));
+ // 分页查询
+ PageResult<AppBrokerageUserRankByPriceRespVO> pageResult = brokerageRecordService.getBrokerageUserChildSummaryPageByPrice(pageReqVO);
+ // 拼接数据
+ Map<Long, MemberUserRespDTO> userMap = memberUserApi.getUserMap(convertSet(pageResult.getList(), AppBrokerageUserRankByPriceRespVO::getId));
+ return success(BrokerageRecordConvert.INSTANCE.convertPage03(pageResult, userMap));
}
- // TODO 芋艿：临时 mock =>
@GetMapping("/child-summary-page")
@Operation(summary = "获得下级分销统计分页")
@PreAuthenticated
public CommonResult<PageResult<AppBrokerageUserChildSummaryRespVO>> getBrokerageUserChildSummaryPage(
AppBrokerageUserChildSummaryPageReqVO pageReqVO) {
- AppBrokerageUserChildSummaryRespVO vo1 = new AppBrokerageUserChildSummaryRespVO()
- .setId(1L).setNickname("芋1**艿").setAvatar("http://www.iocoder.cn/images/common/wechat_mp_2017_07_31_bak.jpg")
- .setBrokeragePrice(10).setBrokeragePrice(20).setBrokerageOrderCount(30)
- .setBrokerageTime(LocalDateTime.now());
- AppBrokerageUserChildSummaryRespVO vo2 = new AppBrokerageUserChildSummaryRespVO()
- .setId(1L).setNickname("芋2**艿").setAvatar("http://www.iocoder.cn/images/common/wechat_mp_2017_07_31_bak.jpg")
- .setBrokeragePrice(20).setBrokeragePrice(30).setBrokerageOrderCount(40)
- .setBrokerageTime(LocalDateTime.now());
- return success(new PageResult<>(asList(vo1, vo2), 10L));
+ PageResult<AppBrokerageUserChildSummaryRespVO> pageResult = brokerageUserService.getBrokerageUserChildSummaryPage(pageReqVO, getLoginUserId());
+ return success(pageResult);
}
- // TODO 芋艿：临时 mock =>
@GetMapping("/get-rank-by-price")
@Operation(summary = "获得分销用户排行（基于佣金）")
@Parameter(name = "times", description = "时间段", required = true)
- public CommonResult<Integer> bindBrokerageUser(
+ public CommonResult<Integer> getRankByPrice(
@RequestParam("times") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) LocalDateTime[] times) {
- return success(1);
+ return success(brokerageRecordService.getUserRankByPrice(getLoginUserId(), times));
}
}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/AppBrokerageWithdrawController.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/AppBrokerageWithdrawController.java
index 1f6d383ea..8ca12b79b 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/AppBrokerageWithdrawController.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/AppBrokerageWithdrawController.java
@@ -3,19 +3,24 @@ package cn.iocoder.yudao.module.trade.controller.app.brokerage;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.security.core.annotations.PreAuthenticated;
+import cn.iocoder.yudao.module.system.api.dict.DictDataApi;
import cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.withdraw.AppBrokerageWithdrawCreateReqVO;
+import cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.withdraw.AppBrokerageWithdrawPageReqVO;
import cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.withdraw.AppBrokerageWithdrawRespVO;
+import cn.iocoder.yudao.module.trade.convert.brokerage.BrokerageWithdrawConvert;
+import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.BrokerageWithdrawDO;
+import cn.iocoder.yudao.module.trade.service.brokerage.BrokerageWithdrawService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import javax.validation.Valid;
-import java.time.LocalDateTime;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static java.util.Arrays.asList;
+import static cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils.getLoginUserId;
@Tag(name = "用户 APP - 分销提现")
@RestController
@@ -24,24 +29,27 @@ import static java.util.Arrays.asList;
@Slf4j
public class AppBrokerageWithdrawController {
- // TODO 芋艿：临时 mock =>
+ @Resource
+ private BrokerageWithdrawService brokerageWithdrawService;
+
+ @Resource
+ private DictDataApi dictDataApi;
+
@GetMapping("/page")
@Operation(summary = "获得分销提现分页")
@PreAuthenticated
- public CommonResult<PageResult<AppBrokerageWithdrawRespVO>> getBrokerageWithdrawPage() {
- AppBrokerageWithdrawRespVO vo1 = new AppBrokerageWithdrawRespVO()
- .setId(1L).setStatus(10).setPrice(10).setStatusName("审批通过").setCreateTime(LocalDateTime.now());
- AppBrokerageWithdrawRespVO vo2 = new AppBrokerageWithdrawRespVO()
- .setId(2L).setStatus(0).setPrice(20).setStatusName("审批中").setCreateTime(LocalDateTime.now());
- return success(new PageResult<>(asList(vo1, vo2), 10L));
+ public CommonResult<PageResult<AppBrokerageWithdrawRespVO>> getBrokerageWithdrawPage(AppBrokerageWithdrawPageReqVO pageReqVO) {
+ // 分页查询
+ PageResult<BrokerageWithdrawDO> pageResult = brokerageWithdrawService.getBrokerageWithdrawPage(
+ BrokerageWithdrawConvert.INSTANCE.convert(pageReqVO, getLoginUserId()));
+ return success(BrokerageWithdrawConvert.INSTANCE.convertPage03(pageResult));
}
- // TODO 芋艿：临时 mock =>
@PostMapping("/create")
@Operation(summary = "创建分销提现")
@PreAuthenticated
public CommonResult<Long> createBrokerageWithdraw(@RequestBody @Valid AppBrokerageWithdrawCreateReqVO createReqVO) {
- return success(1L);
+ return success(brokerageWithdrawService.createBrokerageWithdraw(createReqVO, getLoginUserId()));
}
}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/vo/user/AppBrokerageUserChildSummaryRespVO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/vo/user/AppBrokerageUserChildSummaryRespVO.java
index 1beb1b5e2..6bc4184e8 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/vo/user/AppBrokerageUserChildSummaryRespVO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/vo/user/AppBrokerageUserChildSummaryRespVO.java
@@ -27,7 +27,7 @@ public class AppBrokerageUserChildSummaryRespVO {
@Schema(description = "分销用户数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "30")
private Integer brokerageUserCount;
- @Schema(description = "成为分销员时间", requiredMode = Schema.RequiredMode.REQUIRED)
+ @Schema(description = "绑定推广员的时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime brokerageTime;
}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/vo/user/AppBrokerageUserMySummaryRespVO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/vo/user/AppBrokerageUserMySummaryRespVO.java
index cc9a03ebc..8a0c387c6 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/vo/user/AppBrokerageUserMySummaryRespVO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/vo/user/AppBrokerageUserMySummaryRespVO.java
@@ -20,9 +20,9 @@ public class AppBrokerageUserMySummaryRespVO {
private Integer frozenPrice;
@Schema(description = "分销用户数量（一级）", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
- private Integer firstBrokerageUserCount;
+ private Long firstBrokerageUserCount;
@Schema(description = "分销用户数量（二级）", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
- private Integer secondBrokerageUserCount;
+ private Long secondBrokerageUserCount;
}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/vo/user/AppBrokerageUserRespVO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/vo/user/AppBrokerageUserRespVO.java
index 40b70bed2..f98da7eb6 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/vo/user/AppBrokerageUserRespVO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/vo/user/AppBrokerageUserRespVO.java
@@ -11,7 +11,7 @@ public class AppBrokerageUserRespVO {
private Boolean brokerageEnabled;
@Schema(description = "可用的佣金，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "2408")
- private Integer price;
+ private Integer brokeragePrice;
@Schema(description = "冻结的佣金，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "234")
private Integer frozenPrice;
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/vo/withdraw/AppBrokerageWithdrawCreateReqVO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/vo/withdraw/AppBrokerageWithdrawCreateReqVO.java
index a8b1523b2..d49957d25 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/vo/withdraw/AppBrokerageWithdrawCreateReqVO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/vo/withdraw/AppBrokerageWithdrawCreateReqVO.java
@@ -8,8 +8,9 @@ import lombok.Data;
import org.hibernate.validator.constraints.URL;
import javax.validation.Validator;
-import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.PositiveOrZero;
@Schema(description = "用户 App - 分销提现创建 Request VO")
@Data
@@ -20,7 +21,8 @@ public class AppBrokerageWithdrawCreateReqVO {
private Integer type;
@Schema(description = "提现金额，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "1000")
- @Min(value = 1, message = "提现金额不能小于 1")
+ @PositiveOrZero(message = "提现金额不能小于 0")
+ @NotNull(message = "提现金额不能为空")
private Integer price;
// ========== 银行卡、微信、支付宝 提现相关字段 ==========
@@ -41,7 +43,7 @@ public class AppBrokerageWithdrawCreateReqVO {
@NotBlank(message = "持卡人姓名不能为空", groups = {Bank.class})
private String name;
@Schema(description = "提现银行", example = "1")
- @NotBlank(message = "提现银行不能为空", groups = {Bank.class})
+ @NotNull(message = "提现银行不能为空", groups = {Bank.class})
private Integer bankName;
@Schema(description = "开户地址", example = "海淀支行")
private String bankAddress;
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/vo/withdraw/AppBrokerageWithdrawPageReqVO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/vo/withdraw/AppBrokerageWithdrawPageReqVO.java
new file mode 100644
index 000000000..b1757d43e
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/vo/withdraw/AppBrokerageWithdrawPageReqVO.java
@@ -0,0 +1,22 @@
+package cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.withdraw;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.validation.InEnum;
+import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageWithdrawStatusEnum;
+import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageWithdrawTypeEnum;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "应用 App - 分销提现分页 Request VO")
+@Data
+public class AppBrokerageWithdrawPageReqVO extends PageParam {
+
+ @Schema(description = "类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+ @InEnum(value = BrokerageWithdrawTypeEnum.class, message = "类型必须是 {value}")
+ private Integer type;
+
+ @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+ @InEnum(value = BrokerageWithdrawStatusEnum.class, message = "状态必须是 {value}")
+ private Integer status;
+
+}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/config/AppTradeConfigController.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/config/AppTradeConfigController.java
index 65c879a02..6b7660a1c 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/config/AppTradeConfigController.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/config/AppTradeConfigController.java
@@ -1,7 +1,12 @@
package cn.iocoder.yudao.module.trade.controller.app.config;
+import cn.hutool.core.util.ObjUtil;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.module.trade.controller.app.config.vo.AppTradeConfigRespVO;
+import cn.iocoder.yudao.module.trade.convert.config.TradeConfigConvert;
+import cn.iocoder.yudao.module.trade.dal.dataobject.config.TradeConfigDO;
+import cn.iocoder.yudao.module.trade.service.config.TradeConfigService;
+import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -10,8 +15,9 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static java.util.Arrays.asList;
@Tag(name = "用户 App - 交易配置")
@RestController
@@ -21,17 +27,14 @@ import static java.util.Arrays.asList;
@Slf4j
public class AppTradeConfigController {
+ @Resource
+ private TradeConfigService tradeConfigService;
+
@GetMapping("/get")
+ @Operation(summary = "获得交易配置")
public CommonResult<AppTradeConfigRespVO> getTradeConfig() {
- AppTradeConfigRespVO respVO = new AppTradeConfigRespVO();
- respVO.setBrokeragePosterUrls(asList(
- "https://api.java.crmeb.net/crmebimage/product/2020/08/03/755bf516b1ca4b6db3bfeaa4dd5901cdh71kob20re.jpg",
- "https://api.java.crmeb.net/crmebimage/maintain/2021/03/01/406d729b84ed4ec9a2171bfcf6fd0634ughzbz9kfi.jpg",
- "https://api.java.crmeb.net/crmebimage/maintain/2021/03/01/efb1e4e7fe604fe1988b4213ce08cb11tdsyijtd2r.jpg"
- ));
- respVO.setBrokerageFrozenDays(10);
- respVO.setBrokerageWithdrawMinPrice(100);
- return success(respVO);
+ TradeConfigDO tradeConfig = ObjUtil.defaultIfNull(tradeConfigService.getTradeConfig(), new TradeConfigDO());
+ return success(TradeConfigConvert.INSTANCE.convert02(tradeConfig));
}
}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/config/vo/AppTradeConfigRespVO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/config/vo/AppTradeConfigRespVO.java
index 73abf7ab4..0d590f834 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/config/vo/AppTradeConfigRespVO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/config/vo/AppTradeConfigRespVO.java
@@ -18,4 +18,7 @@ public class AppTradeConfigRespVO {
@Schema(description = "佣金提现最小金额，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
private Integer brokerageWithdrawMinPrice;
+ @Schema(description = "提现方式", requiredMode = Schema.RequiredMode.REQUIRED, example = "[1, 2]")
+ private List<Integer> brokerageWithdrawTypes;
+
}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/delivery/AppDeliverConfigController.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/delivery/AppDeliverConfigController.java
index d5b86fcb0..1d4e36f90 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/delivery/AppDeliverConfigController.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/delivery/AppDeliverConfigController.java
@@ -17,6 +17,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@Validated
public class AppDeliverConfigController {
+ // TODO @芋艿：这里后面干掉，合并到 AppTradeConfigController 中
@GetMapping("/get")
@Operation(summary = "获得配送配置")
public CommonResult<AppDeliveryConfigRespVO> getDeliveryConfig() {
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
index 4bbd98a27..f1d361d91 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
@@ -156,7 +156,7 @@ public class AppTradeOrderController {
@Operation(summary = "删除交易订单")
@Parameter(name = "id", description = "交易订单编号")
public CommonResult<Boolean> deleteOrder(@RequestParam("id") Long id) {
- // TODO @芋艿：未实现，mock 用
+ tradeOrderUpdateService.deleteOrder(getLoginUserId(), id);
return success(true);
}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementRespVO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementRespVO.java
index bd0312753..4b5d98a37 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementRespVO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementRespVO.java
@@ -82,6 +82,9 @@ public class AppTradeOrderSettlementRespVO {
@Schema(description = "积分抵扣的金额，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "50")
private Integer pointPrice;
+ @Schema(description = "VIP 减免金额，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "30")
+ private Integer vipPrice;
+
@Schema(description = "实际支付金额（总），单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "450")
private Integer payPrice;
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/aftersale/TradeAfterSaleConvert.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/aftersale/TradeAfterSaleConvert.java
index 0c84c6967..9faaefb5d 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/aftersale/TradeAfterSaleConvert.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/aftersale/TradeAfterSaleConvert.java
@@ -16,7 +16,6 @@ import cn.iocoder.yudao.module.trade.dal.dataobject.aftersale.TradeAfterSaleDO;
import cn.iocoder.yudao.module.trade.dal.dataobject.aftersale.TradeAfterSaleLogDO;
import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderDO;
import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderItemDO;
-import cn.iocoder.yudao.module.trade.framework.aftersalelog.core.dto.TradeAfterSaleLogRespDTO;
import cn.iocoder.yudao.module.trade.framework.order.config.TradeOrderProperties;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
@@ -68,10 +67,10 @@ public interface TradeAfterSaleConvert {
PageResult<AppTradeAfterSaleRespVO> convertPage02(PageResult<TradeAfterSaleDO> page);
- List<TradeAfterSaleLogRespDTO> convertList(List<TradeAfterSaleLogDO> list);
-
+ List<TradeAfterSaleLogRespVO> convertList(List<TradeAfterSaleLogDO> list);
+
default TradeAfterSaleDetailRespVO convert(TradeAfterSaleDO afterSale, TradeOrderDO order, List<TradeOrderItemDO> orderItems,
- MemberUserRespDTO user, List<TradeAfterSaleLogRespDTO> logs) {
+ MemberUserRespDTO user, List<TradeAfterSaleLogRespVO> logs) {
TradeAfterSaleDetailRespVO respVO = convert(afterSale, orderItems);
// 处理用户信息
respVO.setUser(convert(user));
@@ -81,7 +80,8 @@ public interface TradeAfterSaleConvert {
respVO.setLogs(convertList1(logs));
return respVO;
}
- List<TradeAfterSaleLogRespVO> convertList1(List<TradeAfterSaleLogRespDTO> list);
+
+ List<TradeAfterSaleLogRespVO> convertList1(List<TradeAfterSaleLogRespVO> list);
@Mapping(target = "id", source = "afterSale.id")
TradeAfterSaleDetailRespVO convert(TradeAfterSaleDO afterSale, List<TradeOrderItemDO> orderItems);
TradeOrderBaseVO convert(TradeOrderDO order);
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/record/BrokerageRecordConvert.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/BrokerageRecordConvert.java
similarity index 65%
rename from yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/record/BrokerageRecordConvert.java
rename to yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/BrokerageRecordConvert.java
index 5d620a898..e6c0e4f8c 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/record/BrokerageRecordConvert.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/BrokerageRecordConvert.java
@@ -1,15 +1,22 @@
-package cn.iocoder.yudao.module.trade.convert.brokerage.record;
+package cn.iocoder.yudao.module.trade.convert.brokerage;
+import cn.hutool.core.math.Money;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.number.MoneyUtils;
import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
-import cn.iocoder.yudao.module.trade.controller.admin.brokerage.record.vo.BrokerageRecordRespVO;
-import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.record.BrokerageRecordDO;
-import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.user.BrokerageUserDO;
+import cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.record.BrokerageRecordPageReqVO;
+import cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.record.BrokerageRecordRespVO;
+import cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.record.AppBrokerageRecordPageReqVO;
+import cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.record.AppBrokerageRecordRespVO;
+import cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.user.AppBrokerageUserRankByPriceRespVO;
+import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.BrokerageRecordDO;
+import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.BrokerageUserDO;
import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageRecordBizTypeEnum;
import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageRecordStatusEnum;
import org.mapstruct.Mapper;
+import org.mapstruct.MappingTarget;
import org.mapstruct.factory.Mappers;
import java.time.LocalDateTime;
@@ -45,7 +52,7 @@ public interface BrokerageRecordConvert {
.setBizType(bizType.getType()).setBizId(bizId)
.setPrice(brokeragePrice).setTotalPrice(user.getBrokeragePrice())
.setTitle(title)
- .setDescription(StrUtil.format(bizType.getDescription(), String.format("￥%.2f", brokeragePrice / 100d)))
+ .setDescription(StrUtil.format(bizType.getDescription(), MoneyUtils.fenToYuanStr(Math.abs(brokeragePrice))))
.setStatus(status).setFrozenDays(brokerageFrozenDays).setUnfreezeTime(unfreezeTime)
.setSourceUserLevel(sourceUserLevel).setSourceUserId(sourceUserId);
}
@@ -60,4 +67,17 @@ public interface BrokerageRecordConvert {
}
return result;
}
+
+ BrokerageRecordPageReqVO convert(AppBrokerageRecordPageReqVO pageReqVO, Long userId);
+
+ PageResult<AppBrokerageRecordRespVO> convertPage02(PageResult<BrokerageRecordDO> pageResult);
+
+ default PageResult<AppBrokerageUserRankByPriceRespVO> convertPage03(PageResult<AppBrokerageUserRankByPriceRespVO> pageResult, Map<Long, MemberUserRespDTO> userMap) {
+ for (AppBrokerageUserRankByPriceRespVO vo : pageResult.getList()) {
+ copyTo(userMap.get(vo.getId()), vo);
+ }
+ return pageResult;
+ }
+
+ void copyTo(MemberUserRespDTO from, @MappingTarget AppBrokerageUserRankByPriceRespVO to);
}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/user/BrokerageUserConvert.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/BrokerageUserConvert.java
similarity index 58%
rename from yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/user/BrokerageUserConvert.java
rename to yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/BrokerageUserConvert.java
index 83101a1de..6a578032d 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/user/BrokerageUserConvert.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/BrokerageUserConvert.java
@@ -1,12 +1,15 @@
-package cn.iocoder.yudao.module.trade.convert.brokerage.user;
+package cn.iocoder.yudao.module.trade.convert.brokerage;
import cn.hutool.core.map.MapUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
-import cn.iocoder.yudao.module.trade.controller.admin.brokerage.user.vo.BrokerageUserRespVO;
-import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.user.BrokerageUserDO;
+import cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.user.BrokerageUserRespVO;
+import cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.user.AppBrokerageUserRankByUserCountRespVO;
+import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.BrokerageUserDO;
import cn.iocoder.yudao.module.trade.service.brokerage.bo.UserBrokerageSummaryBO;
+import cn.iocoder.yudao.module.trade.service.brokerage.bo.UserWithdrawSummaryBO;
import org.mapstruct.Mapper;
+import org.mapstruct.MappingTarget;
import org.mapstruct.factory.Mappers;
import java.util.List;
@@ -27,13 +30,14 @@ public interface BrokerageUserConvert {
List<BrokerageUserRespVO> convertList(List<BrokerageUserDO> list);
- PageResult<BrokerageUserRespVO> convertPage(PageResult<BrokerageUserDO> page);
+ PageResult<BrokerageUserRespVO> convertPage(PageResult<BrokerageUserDO> page, Map<Long, MemberUserRespDTO> userMap, Map<Long, Long> brokerageUserCountMap, Map<Long, UserBrokerageSummaryBO> userOrderSummaryMap);
default PageResult<BrokerageUserRespVO> convertPage(PageResult<BrokerageUserDO> pageResult,
Map<Long, MemberUserRespDTO> userMap,
Map<Long, Long> brokerageUserCountMap,
- Map<Long, UserBrokerageSummaryBO> userOrderSummaryMap) {
- PageResult<BrokerageUserRespVO> result = convertPage(pageResult);
+ Map<Long, UserBrokerageSummaryBO> userOrderSummaryMap,
+ Map<Long, UserWithdrawSummaryBO> withdrawMap) {
+ PageResult<BrokerageUserRespVO> result = convertPage(pageResult, userMap, brokerageUserCountMap, userOrderSummaryMap);
for (BrokerageUserRespVO userVO : result.getList()) {
// 用户信息
copyTo(userMap.get(userVO.getId()), userVO);
@@ -44,7 +48,10 @@ public interface BrokerageUserConvert {
Optional<UserBrokerageSummaryBO> orderSummaryOptional = Optional.ofNullable(userOrderSummaryMap.get(userVO.getId()));
userVO.setBrokerageOrderCount(orderSummaryOptional.map(UserBrokerageSummaryBO::getCount).orElse(0))
.setBrokerageOrderPrice(orderSummaryOptional.map(UserBrokerageSummaryBO::getPrice).orElse(0));
- // todo 已提现次数、已提现金额
+ // 已提现次数、已提现金额
+ Optional<UserWithdrawSummaryBO> withdrawSummaryOptional = Optional.ofNullable(withdrawMap.get(userVO.getId()));
+ userVO.setWithdrawCount(withdrawSummaryOptional.map(UserWithdrawSummaryBO::getCount).orElse(0))
+ .setWithdrawPrice(withdrawSummaryOptional.map(UserWithdrawSummaryBO::getPrice).orElse(0));
userVO.setWithdrawCount(0).setWithdrawPrice(0);
}
return result;
@@ -55,4 +62,13 @@ public interface BrokerageUserConvert {
user -> target.setNickname(user.getNickname()).setAvatar(user.getAvatar()));
return target;
}
+
+ default PageResult<AppBrokerageUserRankByUserCountRespVO> convertPage03(PageResult<AppBrokerageUserRankByUserCountRespVO> pageResult,
+ Map<Long, MemberUserRespDTO> userMap) {
+ pageResult.getList().forEach(vo -> copyTo(userMap.get(vo.getId()), vo));
+ return pageResult;
+ }
+
+ void copyTo(MemberUserRespDTO from, @MappingTarget AppBrokerageUserRankByUserCountRespVO to);
+
}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/BrokerageWithdrawConvert.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/BrokerageWithdrawConvert.java
new file mode 100644
index 000000000..69441ab07
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/BrokerageWithdrawConvert.java
@@ -0,0 +1,57 @@
+package cn.iocoder.yudao.module.trade.convert.brokerage;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.dict.core.util.DictFrameworkUtils;
+import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
+import cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.withdraw.BrokerageWithdrawPageReqVO;
+import cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.withdraw.BrokerageWithdrawRespVO;
+import cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.withdraw.AppBrokerageWithdrawCreateReqVO;
+import cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.withdraw.AppBrokerageWithdrawPageReqVO;
+import cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.withdraw.AppBrokerageWithdrawRespVO;
+import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.BrokerageWithdrawDO;
+import cn.iocoder.yudao.module.trade.enums.DictTypeConstants;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+/**
+ * 佣金提现 Convert
+ *
+ * @author 芋道源码
+ */
+@Mapper
+public interface BrokerageWithdrawConvert {
+
+ BrokerageWithdrawConvert INSTANCE = Mappers.getMapper(BrokerageWithdrawConvert.class);
+
+ BrokerageWithdrawDO convert(AppBrokerageWithdrawCreateReqVO createReqVO, Long userId, Integer feePrice);
+
+ BrokerageWithdrawRespVO convert(BrokerageWithdrawDO bean);
+
+ List<BrokerageWithdrawRespVO> convertList(List<BrokerageWithdrawDO> list);
+
+ PageResult<BrokerageWithdrawRespVO> convertPage(PageResult<BrokerageWithdrawDO> page);
+
+ default PageResult<BrokerageWithdrawRespVO> convertPage(PageResult<BrokerageWithdrawDO> pageResult, Map<Long, MemberUserRespDTO> userMap) {
+ PageResult<BrokerageWithdrawRespVO> result = convertPage(pageResult);
+ for (BrokerageWithdrawRespVO vo : result.getList()) {
+ vo.setUserNickname(Optional.ofNullable(userMap.get(vo.getUserId())).map(MemberUserRespDTO::getNickname).orElse(null));
+ }
+ return result;
+ }
+
+ PageResult<AppBrokerageWithdrawRespVO> convertPage02(PageResult<BrokerageWithdrawDO> pageResult);
+
+ default PageResult<AppBrokerageWithdrawRespVO> convertPage03(PageResult<BrokerageWithdrawDO> pageResult) {
+ PageResult<AppBrokerageWithdrawRespVO> result = convertPage02(pageResult);
+ for (AppBrokerageWithdrawRespVO vo : result.getList()) {
+ vo.setStatusName(DictFrameworkUtils.getDictDataLabel(DictTypeConstants.BROKERAGE_WITHDRAW_STATUS, vo.getStatus()));
+ }
+ return result;
+ }
+
+ BrokerageWithdrawPageReqVO convert(AppBrokerageWithdrawPageReqVO pageReqVO, Long userId);
+}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/withdraw/BrokerageWithdrawConvert.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/withdraw/BrokerageWithdrawConvert.java
deleted file mode 100644
index 3aa28db5e..000000000
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/withdraw/BrokerageWithdrawConvert.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package cn.iocoder.yudao.module.trade.convert.brokerage.withdraw;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
-import cn.iocoder.yudao.module.trade.controller.admin.brokerage.withdraw.vo.BrokerageWithdrawRejectReqVO;
-import cn.iocoder.yudao.module.trade.controller.admin.brokerage.withdraw.vo.BrokerageWithdrawRespVO;
-import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.withdraw.BrokerageWithdrawDO;
-import org.mapstruct.Mapper;
-import org.mapstruct.factory.Mappers;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-/**
- * 佣金提现 Convert
- *
- * @author 芋道源码
- */
-@Mapper
-public interface BrokerageWithdrawConvert {
-
- BrokerageWithdrawConvert INSTANCE = Mappers.getMapper(BrokerageWithdrawConvert.class);
-
- BrokerageWithdrawDO convert(BrokerageWithdrawRejectReqVO bean);
-
- BrokerageWithdrawRespVO convert(BrokerageWithdrawDO bean);
-
- List<BrokerageWithdrawRespVO> convertList(List<BrokerageWithdrawDO> list);
-
- PageResult<BrokerageWithdrawRespVO> convertPage(PageResult<BrokerageWithdrawDO> page);
-
- default PageResult<BrokerageWithdrawRespVO> convertPage(PageResult<BrokerageWithdrawDO> pageResult, Map<Long, MemberUserRespDTO> userMap) {
- PageResult<BrokerageWithdrawRespVO> result = convertPage(pageResult);
- for (BrokerageWithdrawRespVO vo : result.getList()) {
- vo.setUserNickname(Optional.ofNullable(userMap.get(vo.getUserId())).map(MemberUserRespDTO::getNickname).orElse(null));
- }
- return result;
- }
-
-}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/config/TradeConfigConvert.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/config/TradeConfigConvert.java
index 031f1198a..57da020c2 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/config/TradeConfigConvert.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/config/TradeConfigConvert.java
@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.trade.convert.config;
import cn.iocoder.yudao.module.trade.controller.admin.config.vo.TradeConfigRespVO;
import cn.iocoder.yudao.module.trade.controller.admin.config.vo.TradeConfigSaveReqVO;
+import cn.iocoder.yudao.module.trade.controller.app.config.vo.AppTradeConfigRespVO;
import cn.iocoder.yudao.module.trade.dal.dataobject.config.TradeConfigDO;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
@@ -20,4 +21,5 @@ public interface TradeConfigConvert {
TradeConfigRespVO convert(TradeConfigDO bean);
+ AppTradeConfigRespVO convert02(TradeConfigDO tradeConfig);
}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
index aa78cd170..1dcbda7e0 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
@@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.trade.convert.order;
+import cn.hutool.core.util.BooleanUtil;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
@@ -14,6 +15,7 @@ import cn.iocoder.yudao.module.product.api.comment.dto.ProductCommentCreateReqDT
import cn.iocoder.yudao.module.product.api.property.dto.ProductPropertyValueDetailRespDTO;
import cn.iocoder.yudao.module.product.api.sku.dto.ProductSkuRespDTO;
import cn.iocoder.yudao.module.product.api.sku.dto.ProductSkuUpdateStockReqDTO;
+import cn.iocoder.yudao.module.product.api.spu.dto.ProductSpuRespDTO;
import cn.iocoder.yudao.module.promotion.api.combination.dto.CombinationRecordCreateReqDTO;
import cn.iocoder.yudao.module.trade.api.order.dto.TradeOrderRespDTO;
import cn.iocoder.yudao.module.trade.controller.admin.base.member.user.MemberUserRespVO;
@@ -65,6 +67,7 @@ public interface TradeOrderConvert {
@Mapping(source = "calculateRespBO.price.deliveryPrice", target = "deliveryPrice"),
@Mapping(source = "calculateRespBO.price.couponPrice", target = "couponPrice"),
@Mapping(source = "calculateRespBO.price.pointPrice", target = "pointPrice"),
+ @Mapping(source = "calculateRespBO.price.vipPrice", target = "vipPrice"),
@Mapping(source = "calculateRespBO.price.payPrice", target = "payPrice")
})
TradeOrderDO convert(Long userId, String userIp, AppTradeOrderCreateReqVO createReqVO,
@@ -265,11 +268,16 @@ public interface TradeOrderConvert {
TradeOrderDO convert(TradeOrderRemarkReqVO reqVO);
- default BrokerageAddReqBO convert(MemberUserRespDTO user, TradeOrderItemDO item, ProductSkuRespDTO sku) {
- return new BrokerageAddReqBO().setBizId(String.valueOf(item.getId())).setSourceUserId(item.getUserId())
+ default BrokerageAddReqBO convert(MemberUserRespDTO user, TradeOrderItemDO item,
+ ProductSpuRespDTO spu, ProductSkuRespDTO sku) {
+ BrokerageAddReqBO bo = new BrokerageAddReqBO().setBizId(String.valueOf(item.getId())).setSourceUserId(item.getUserId())
.setBasePrice(item.getPayPrice() * item.getCount())
.setTitle(StrUtil.format("{}成功购买{}", user.getNickname(), item.getSpuName()))
- .setFirstFixedPrice(sku.getFirstBrokeragePrice()).setSecondFixedPrice(sku.getSecondBrokeragePrice());
+ .setFirstFixedPrice(0).setSecondFixedPrice(0);
+ if (BooleanUtil.isTrue(spu.getSubCommissionType())) {
+ bo.setFirstFixedPrice(sku.getFirstBrokeragePrice()).setSecondFixedPrice(sku.getSecondBrokeragePrice());
+ }
+ return bo;
}
TradeBeforeOrderCreateReqBO convert(AppTradeOrderCreateReqVO createReqVO);
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/brokerage/record/BrokerageRecordDO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/brokerage/BrokerageRecordDO.java
similarity index 96%
rename from yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/brokerage/record/BrokerageRecordDO.java
rename to yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/brokerage/BrokerageRecordDO.java
index 0f59eada5..c819d723b 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/brokerage/record/BrokerageRecordDO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/brokerage/BrokerageRecordDO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.record;
+package cn.iocoder.yudao.module.trade.dal.dataobject.brokerage;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageRecordBizTypeEnum;
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/brokerage/user/BrokerageUserDO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/brokerage/BrokerageUserDO.java
similarity index 87%
rename from yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/brokerage/user/BrokerageUserDO.java
rename to yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/brokerage/BrokerageUserDO.java
index 3493cac97..8d73858ec 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/brokerage/user/BrokerageUserDO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/brokerage/BrokerageUserDO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.user;
+package cn.iocoder.yudao.module.trade.dal.dataobject.brokerage;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
import com.baomidou.mybatisplus.annotation.KeySequence;
@@ -59,13 +59,4 @@ public class BrokerageUserDO extends BaseDO {
* 冻结佣金
*/
private Integer frozenPrice;
-
- /**
- * 等级
- */
- private Integer level;
- /**
- * 路径
- */
- private String path;
}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/brokerage/withdraw/BrokerageWithdrawDO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/brokerage/BrokerageWithdrawDO.java
similarity index 95%
rename from yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/brokerage/withdraw/BrokerageWithdrawDO.java
rename to yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/brokerage/BrokerageWithdrawDO.java
index be5b41285..f31c23800 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/brokerage/withdraw/BrokerageWithdrawDO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/brokerage/BrokerageWithdrawDO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.withdraw;
+package cn.iocoder.yudao.module.trade.dal.dataobject.brokerage;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageWithdrawStatusEnum;
@@ -29,7 +29,7 @@ public class BrokerageWithdrawDO extends BaseDO {
* 编号
*/
@TableId
- private Integer id;
+ private Long id;
/**
* 用户编号
*
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/config/TradeConfigDO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/config/TradeConfigDO.java
index a6704db4f..01de52b5b 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/config/TradeConfigDO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/config/TradeConfigDO.java
@@ -36,7 +36,7 @@ public class TradeConfigDO extends BaseDO {
private Long id;
// ========== 配送相关 ==========
- // TODO 芋艿：未配置
+
/**
* 是否启用全场包邮
*/
@@ -68,7 +68,7 @@ public class TradeConfigDO extends BaseDO {
* 分销海报图地址数组
*/
@TableField(typeHandler = JacksonTypeHandler.class)
- private List<String> brokeragePostUrls;
+ private List<String> brokeragePosterUrls;
/**
* 一级返佣比例
*/
@@ -81,6 +81,10 @@ public class TradeConfigDO extends BaseDO {
* 用户提现最低金额
*/
private Integer brokerageWithdrawMinPrice;
+ /**
+ * 用户提现手续费百分比
+ */
+ private Integer brokerageWithdrawFeePercent;
/**
* 提现银行
*/
@@ -96,6 +100,6 @@ public class TradeConfigDO extends BaseDO {
* 枚举 {@link BrokerageWithdrawTypeEnum 对应的类}
*/
@TableField(typeHandler = IntegerListTypeHandler.class)
- private List<Integer> brokerageWithdrawType;
+ private List<Integer> brokerageWithdrawTypes;
}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java
index bb68fc1ac..8a3b5b23f 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java
@@ -168,6 +168,7 @@ public class TradeOrderDO extends BaseDO {
* - {@link #discountPrice}
* + {@link #deliveryPrice}
* + {@link #adjustPrice}
+ * - {@link #vipPrice}
*/
private Integer payPrice;
@@ -265,9 +266,17 @@ public class TradeOrderDO extends BaseDO {
* 对应 taobao 的 trade.point_fee 字段
*/
private Integer pointPrice;
-// /**
-// * 奖励的积分 TODO 疯狂：可以使用这个字段哈；
-// */
-// private Integer rewardPoint;
+ /**
+ * 赠送的积分
+ */
+ private Integer givePoint;
+ /**
+ * 退还的使用的积分
+ */
+ private Integer refundPoint;
+ /**
+ * VIP 减免金额，单位：分
+ */
+ private Integer vipPrice;
}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderItemDO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderItemDO.java
index 27dd13f67..4849aad0b 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderItemDO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderItemDO.java
@@ -126,6 +126,7 @@ public class TradeOrderItemDO extends BaseDO {
* - {@link #discountPrice}
* + {@link #deliveryPrice}
* + {@link #adjustPrice}
+ * - {@link #vipPrice}
*/
private Integer payPrice;
@@ -143,6 +144,18 @@ public class TradeOrderItemDO extends BaseDO {
* 对应 taobao 的 trade.point_fee 字段
*/
private Integer pointPrice;
+ /**
+ * 使用的积分
+ */
+ private Integer usePoint;
+ /**
+ * 赠送的积分
+ */
+ private Integer givePoint;
+ /**
+ * VIP 减免金额，单位：分
+ */
+ private Integer vipPrice;
// TODO @芋艿：如果商品 vip 折扣时，到底是新增一个 vipPrice 记录优惠记录，还是 vipDiscountPrice，记录 vip 的优惠；还是直接使用 vipPrice；
// 目前 crmeb 的选择，单独一个 vipPrice 记录优惠价格；感觉不一定合理，可以在看看有赞的；
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/brokerage/record/BrokerageRecordMapper.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/brokerage/BrokerageRecordMapper.java
similarity index 58%
rename from yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/brokerage/record/BrokerageRecordMapper.java
rename to yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/brokerage/BrokerageRecordMapper.java
index dcc627b78..eb55a8c4c 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/brokerage/record/BrokerageRecordMapper.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/brokerage/BrokerageRecordMapper.java
@@ -1,12 +1,14 @@
-package cn.iocoder.yudao.module.trade.dal.mysql.brokerage.record;
+package cn.iocoder.yudao.module.trade.dal.mysql.brokerage;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.module.trade.controller.admin.brokerage.record.vo.BrokerageRecordPageReqVO;
-import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.record.BrokerageRecordDO;
+import cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.record.BrokerageRecordPageReqVO;
+import cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.user.AppBrokerageUserRankByPriceRespVO;
+import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.BrokerageRecordDO;
import cn.iocoder.yudao.module.trade.service.brokerage.bo.UserBrokerageSummaryBO;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -23,7 +25,6 @@ import java.util.List;
public interface BrokerageRecordMapper extends BaseMapperX<BrokerageRecordDO> {
default PageResult<BrokerageRecordDO> selectPage(BrokerageRecordPageReqVO reqVO) {
- // 分页查询
return selectPage(reqVO, new LambdaQueryWrapperX<BrokerageRecordDO>()
.eqIfPresent(BrokerageRecordDO::getUserId, reqVO.getUserId())
.eqIfPresent(BrokerageRecordDO::getBizType, reqVO.getBizType())
@@ -52,9 +53,28 @@ public interface BrokerageRecordMapper extends BaseMapperX<BrokerageRecordDO> {
}
@Select("SELECT COUNT(1), SUM(price) FROM trade_brokerage_record " +
- "WHERE user_id = #{userId} AND biz_type = #{bizType} AND status = #{status}")
+ "WHERE user_id = #{userId} AND biz_type = #{bizType} AND status = #{status} AND deleted = FALSE")
UserBrokerageSummaryBO selectCountAndSumPriceByUserIdAndBizTypeAndStatus(@Param("userId") Long userId,
@Param("bizType") Integer bizType,
@Param("status") Integer status);
+ @Select("SELECT SUM(price) FROM trade_brokerage_record " +
+ "WHERE user_id = #{userId} AND biz_type = #{bizType} " +
+ "AND create_time BETWEEN #{beginTime} AND #{endTime} AND deleted = FALSE")
+ Integer selectSummaryPriceByUserIdAndBizTypeAndCreateTimeBetween(@Param("userId") Long userId,
+ @Param("bizType") Integer bizType,
+ @Param("beginTime") LocalDateTime beginTime,
+ @Param("endTime") LocalDateTime endTime);
+
+ @Select("SELECT user_id AS id, SUM(price) AS brokeragePrice FROM trade_brokerage_record " +
+ "WHERE biz_type = #{bizType} AND status = #{status} AND deleted = FALSE " +
+ "AND unfreeze_time BETWEEN #{beginTime} AND #{endTime} " +
+ "GROUP BY user_id " +
+ "ORDER BY brokeragePrice DESC")
+ IPage<AppBrokerageUserRankByPriceRespVO> selectSummaryPricePageGroupByUserId(IPage<?> page,
+ @Param("bizType") Integer bizType,
+ @Param("status") Integer status,
+ @Param("beginTime") LocalDateTime beginTime,
+ @Param("endTime") LocalDateTime endTime);
+
}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/brokerage/user/BrokerageUserMapper.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/brokerage/BrokerageUserMapper.java
similarity index 63%
rename from yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/brokerage/user/BrokerageUserMapper.java
rename to yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/brokerage/BrokerageUserMapper.java
index 239625b17..fc53ce942 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/brokerage/user/BrokerageUserMapper.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/brokerage/BrokerageUserMapper.java
@@ -1,14 +1,22 @@
-package cn.iocoder.yudao.module.trade.dal.mysql.brokerage.user;
+package cn.iocoder.yudao.module.trade.dal.mysql.brokerage;
import cn.hutool.core.lang.Assert;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.module.trade.controller.admin.brokerage.user.vo.BrokerageUserPageReqVO;
-import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.user.BrokerageUserDO;
+import cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.user.BrokerageUserPageReqVO;
+import cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.user.AppBrokerageUserChildSummaryPageReqVO;
+import cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.user.AppBrokerageUserChildSummaryRespVO;
+import cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.user.AppBrokerageUserRankByUserCountRespVO;
+import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.BrokerageUserDO;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import java.time.LocalDateTime;
import java.util.List;
/**
@@ -19,13 +27,12 @@ import java.util.List;
@Mapper
public interface BrokerageUserMapper extends BaseMapperX<BrokerageUserDO> {
- default PageResult<BrokerageUserDO> selectPage(BrokerageUserPageReqVO reqVO, List<Integer> levels) {
+ default PageResult<BrokerageUserDO> selectPage(BrokerageUserPageReqVO reqVO, List<Long> bindUserIds) {
return selectPage(reqVO, new LambdaQueryWrapperX<BrokerageUserDO>()
.eqIfPresent(BrokerageUserDO::getBrokerageEnabled, reqVO.getBrokerageEnabled())
.betweenIfPresent(BrokerageUserDO::getCreateTime, reqVO.getCreateTime())
.betweenIfPresent(BrokerageUserDO::getBindUserTime, reqVO.getBindUserTime())
- .findInSetIfPresent(BrokerageUserDO::getPath, reqVO.getBindUserId())
- .inIfPresent(BrokerageUserDO::getLevel, levels)
+ .inIfPresent(BrokerageUserDO::getBindUserId, bindUserIds)
.orderByDesc(BrokerageUserDO::getId));
}
@@ -38,7 +45,7 @@ public interface BrokerageUserMapper extends BaseMapperX<BrokerageUserDO> {
default void updatePriceIncr(Long id, Integer incrCount) {
Assert.isTrue(incrCount > 0);
LambdaUpdateWrapper<BrokerageUserDO> lambdaUpdateWrapper = new LambdaUpdateWrapper<BrokerageUserDO>()
- .setSql(" price = price + " + incrCount)
+ .setSql(" brokerage_price = brokerage_price + " + incrCount)
.eq(BrokerageUserDO::getId, id);
update(null, lambdaUpdateWrapper);
}
@@ -49,13 +56,14 @@ public interface BrokerageUserMapper extends BaseMapperX<BrokerageUserDO> {
*
* @param id 用户编号
* @param incrCount 增加佣金（负数）
+ * @return 更新行数
*/
- default void updatePriceDecr(Long id, Integer incrCount) {
+ default int updatePriceDecr(Long id, Integer incrCount) {
Assert.isTrue(incrCount < 0);
LambdaUpdateWrapper<BrokerageUserDO> lambdaUpdateWrapper = new LambdaUpdateWrapper<BrokerageUserDO>()
- .setSql(" price = price + " + incrCount) // 负数，所以使用 + 号
+ .setSql(" brokerage_price = brokerage_price + " + incrCount) // 负数，所以使用 + 号
.eq(BrokerageUserDO::getId, id);
- update(null, lambdaUpdateWrapper);
+ return update(null, lambdaUpdateWrapper);
}
/**
@@ -98,7 +106,7 @@ public interface BrokerageUserMapper extends BaseMapperX<BrokerageUserDO> {
Assert.isTrue(incrCount < 0);
LambdaUpdateWrapper<BrokerageUserDO> lambdaUpdateWrapper = new LambdaUpdateWrapper<BrokerageUserDO>()
.setSql(" frozen_price = frozen_price + " + incrCount + // 负数，所以使用 + 号
- ", price = price + " + -incrCount) // 负数，所以使用 - 号
+ ", brokerage_price = brokerage_price + " + -incrCount) // 负数，所以使用 - 号
.eq(BrokerageUserDO::getId, id)
.ge(BrokerageUserDO::getFrozenPrice, -incrCount); // cas 逻辑
return update(null, lambdaUpdateWrapper);
@@ -107,8 +115,7 @@ public interface BrokerageUserMapper extends BaseMapperX<BrokerageUserDO> {
default void updateBindUserIdAndBindUserTimeToNull(Long id) {
update(null, new LambdaUpdateWrapper<BrokerageUserDO>()
.eq(BrokerageUserDO::getId, id)
- .set(BrokerageUserDO::getBindUserId, null).set(BrokerageUserDO::getBindUserTime, null)
- .set(BrokerageUserDO::getLevel, 1).set(BrokerageUserDO::getPath, ""));
+ .set(BrokerageUserDO::getBindUserId, null).set(BrokerageUserDO::getBindUserTime, null));
}
default void updateEnabledFalseAndBrokerageTimeToNull(Long id) {
@@ -117,10 +124,26 @@ public interface BrokerageUserMapper extends BaseMapperX<BrokerageUserDO> {
.set(BrokerageUserDO::getBrokerageEnabled, false).set(BrokerageUserDO::getBrokerageTime, null));
}
- default Long selectCountByBindUserIdAndLevelIn(Long bindUserId, List<Integer> levels) {
+ default Long selectCountByBindUserIdIn(List<Long> bindUserIds) {
return selectCount(new LambdaQueryWrapperX<BrokerageUserDO>()
- .findInSetIfPresent(BrokerageUserDO::getPath, bindUserId)
- .inIfPresent(BrokerageUserDO::getLevel, levels));
+ .inIfPresent(BrokerageUserDO::getBindUserId, bindUserIds));
+ }
+
+ @Select("SELECT bind_user_id AS id, COUNT(1) AS brokerageUserCount FROM trade_brokerage_user " +
+ "WHERE bind_user_id IS NOT NULL AND deleted = FALSE " +
+ "AND bind_user_time BETWEEN #{beginTime} AND #{endTime} " +
+ "GROUP BY bind_user_id " +
+ "ORDER BY brokerageUserCount DESC")
+ IPage<AppBrokerageUserRankByUserCountRespVO> selectCountPageGroupByBindUserId(Page<?> page,
+ @Param("beginTime") LocalDateTime beginTime,
+ @Param("endTime") LocalDateTime endTime);
+
+ IPage<AppBrokerageUserChildSummaryRespVO> selectSummaryPageByUserId(Page<?> page,
+ @Param("param") AppBrokerageUserChildSummaryPageReqVO param,
+ @Param("userId") Long userId);
+
+ default List<BrokerageUserDO> selectListByBindUserId(Long bindUserId) {
+ return selectList(BrokerageUserDO::getBindUserId, bindUserId);
}
}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/brokerage/withdraw/BrokerageWithdrawMapper.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/brokerage/BrokerageWithdrawMapper.java
similarity index 70%
rename from yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/brokerage/withdraw/BrokerageWithdrawMapper.java
rename to yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/brokerage/BrokerageWithdrawMapper.java
index d5269fd55..f8ca4c5b7 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/brokerage/withdraw/BrokerageWithdrawMapper.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/brokerage/BrokerageWithdrawMapper.java
@@ -1,12 +1,15 @@
-package cn.iocoder.yudao.module.trade.dal.mysql.brokerage.withdraw;
+package cn.iocoder.yudao.module.trade.dal.mysql.brokerage;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.module.trade.controller.admin.brokerage.withdraw.vo.BrokerageWithdrawPageReqVO;
-import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.withdraw.BrokerageWithdrawDO;
+import cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.withdraw.BrokerageWithdrawPageReqVO;
+import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.BrokerageWithdrawDO;
+import cn.iocoder.yudao.module.trade.service.brokerage.bo.UserWithdrawSummaryBO;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
/**
* 佣金提现 Mapper
@@ -34,4 +37,9 @@ public interface BrokerageWithdrawMapper extends BaseMapperX<BrokerageWithdrawDO
.eq(BrokerageWithdrawDO::getStatus, status));
}
+ @Select("SELECT COUNT(1) AS count, SUM(price) AS price FROM trade_brokerage_withdraw " +
+ "WHERE user_id = #{userId} AND status = #{status} AND deleted = FALSE")
+ UserWithdrawSummaryBO selectCountAndSumPriceByUserIdAndStatus(@Param("userId") Long userId,
+ @Param("status") Integer status);
+
}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/aftersalelog/core/dto/TradeAfterSaleLogRespDTO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/aftersalelog/core/dto/TradeAfterSaleLogRespDTO.java
deleted file mode 100644
index 69c6bd939..000000000
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/aftersalelog/core/dto/TradeAfterSaleLogRespDTO.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package cn.iocoder.yudao.module.trade.framework.aftersalelog.core.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import javax.validation.constraints.NotNull;
-import java.time.LocalDateTime;
-
-// TODO @puhui999：这个是不是应该搞成 vo 啊？
-/**
- * 贸易售后日志详情 DTO
- *
- * @author HUIHUI
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class TradeAfterSaleLogRespDTO {
-
- @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "20669")
- private Long id;
-
- @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "22634")
- @NotNull(message = "用户编号不能为空")
- private Long userId;
-
- @Schema(description = "用户类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
- @NotNull(message = "用户类型不能为空")
- private Integer userType;
-
- @Schema(description = "售后编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "3023")
- @NotNull(message = "售后编号不能为空")
- private Long afterSaleId;
-
- @Schema(description = "订单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "25870")
- @NotNull(message = "订单编号不能为空")
- private Long orderId;
-
- @Schema(description = "订单项编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "23154")
- @NotNull(message = "订单项编号不能为空")
- private Long orderItemId;
-
- @Schema(description = "售后状态（之前）", example = "2")
- private Integer beforeStatus;
-
- @Schema(description = "售后状态（之后）", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "售后状态（之后）不能为空")
- private Integer afterStatus;
-
- @Schema(description = "操作明细", requiredMode = Schema.RequiredMode.REQUIRED, example = "维权完成，退款金额：¥37776.00")
- @NotNull(message = "操作明细不能为空")
- private String content;
-
- @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
- private LocalDateTime createTime;
-
-}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/aftersalelog/core/service/AfterSaleLogService.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/aftersalelog/core/service/AfterSaleLogService.java
index b068afd56..53019a30b 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/aftersalelog/core/service/AfterSaleLogService.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/aftersalelog/core/service/AfterSaleLogService.java
@@ -1,8 +1,8 @@
package cn.iocoder.yudao.module.trade.framework.aftersalelog.core.service;
+import cn.iocoder.yudao.module.trade.controller.admin.aftersale.vo.log.TradeAfterSaleLogRespVO;
import cn.iocoder.yudao.module.trade.framework.aftersalelog.core.dto.TradeAfterSaleLogCreateReqDTO;
-import cn.iocoder.yudao.module.trade.framework.aftersalelog.core.dto.TradeAfterSaleLogRespDTO;
import java.util.List;
@@ -29,6 +29,6 @@ public interface AfterSaleLogService {
* @param afterSaleId 售后编号
* @return 售后日志
*/
- List<TradeAfterSaleLogRespDTO> getLog(Long afterSaleId);
+ List<TradeAfterSaleLogRespVO> getLog(Long afterSaleId);
}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/order/core/aop/TradeOrderLogAspect.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/order/core/aop/TradeOrderLogAspect.java
index e8349220f..127291b1c 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/order/core/aop/TradeOrderLogAspect.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/order/core/aop/TradeOrderLogAspect.java
@@ -63,6 +63,9 @@ public class TradeOrderLogAspect {
Long userId = getUserId();
// 1.2 订单信息
Long orderId = ORDER_ID.get();
+ if (orderId == null) { // 如果未设置，只有注解，说明不需要记录订单日志
+ return;
+ }
Integer beforeStatus = BEFORE_STATUS.get();
Integer afterStatus = AFTER_STATUS.get();
Map<String, Object> exts = ObjectUtil.defaultIfNull(EXTS.get(), emptyMap());
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/job/brokerage/BrokerageRecordUnfreezeJob.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/job/brokerage/BrokerageRecordUnfreezeJob.java
index c221408e5..cd81e44ec 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/job/brokerage/BrokerageRecordUnfreezeJob.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/job/brokerage/BrokerageRecordUnfreezeJob.java
@@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.trade.job.brokerage;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.quartz.core.handler.JobHandler;
import cn.iocoder.yudao.framework.tenant.core.job.TenantJob;
-import cn.iocoder.yudao.module.trade.service.brokerage.record.BrokerageRecordService;
+import cn.iocoder.yudao.module.trade.service.brokerage.BrokerageRecordService;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/aftersale/TradeAfterSaleServiceImpl.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/aftersale/TradeAfterSaleServiceImpl.java
index f54563d42..80acf9b99 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/aftersale/TradeAfterSaleServiceImpl.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/aftersale/TradeAfterSaleServiceImpl.java
@@ -11,6 +11,7 @@ import cn.iocoder.yudao.module.pay.api.refund.dto.PayRefundCreateReqDTO;
import cn.iocoder.yudao.module.trade.controller.admin.aftersale.vo.TradeAfterSaleDisagreeReqVO;
import cn.iocoder.yudao.module.trade.controller.admin.aftersale.vo.TradeAfterSalePageReqVO;
import cn.iocoder.yudao.module.trade.controller.admin.aftersale.vo.TradeAfterSaleRefuseReqVO;
+import cn.iocoder.yudao.module.trade.controller.admin.aftersale.vo.log.TradeAfterSaleLogRespVO;
import cn.iocoder.yudao.module.trade.controller.app.aftersale.vo.AppTradeAfterSaleCreateReqVO;
import cn.iocoder.yudao.module.trade.controller.app.aftersale.vo.AppTradeAfterSaleDeliveryReqVO;
import cn.iocoder.yudao.module.trade.convert.aftersale.TradeAfterSaleConvert;
@@ -26,7 +27,6 @@ import cn.iocoder.yudao.module.trade.enums.aftersale.TradeAfterSaleWayEnum;
import cn.iocoder.yudao.module.trade.enums.order.TradeOrderItemAfterSaleStatusEnum;
import cn.iocoder.yudao.module.trade.enums.order.TradeOrderStatusEnum;
import cn.iocoder.yudao.module.trade.framework.aftersalelog.core.dto.TradeAfterSaleLogCreateReqDTO;
-import cn.iocoder.yudao.module.trade.framework.aftersalelog.core.dto.TradeAfterSaleLogRespDTO;
import cn.iocoder.yudao.module.trade.framework.aftersalelog.core.service.AfterSaleLogService;
import cn.iocoder.yudao.module.trade.framework.order.config.TradeOrderProperties;
import cn.iocoder.yudao.module.trade.service.order.TradeOrderQueryService;
@@ -449,8 +449,9 @@ public class TradeAfterSaleServiceImpl implements TradeAfterSaleService, AfterSa
}
}
+ // TODO @puhui999：应该返回 do 哈。
@Override
- public List<TradeAfterSaleLogRespDTO> getLog(Long afterSaleId) {
+ public List<TradeAfterSaleLogRespVO> getLog(Long afterSaleId) {
// TODO 不熟悉流程先这么滴
List<TradeAfterSaleLogDO> saleLogDOs = tradeAfterSaleLogMapper.selectList(TradeAfterSaleLogDO::getAfterSaleId, afterSaleId);
return TradeAfterSaleConvert.INSTANCE.convertList(saleLogDOs);
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageRecordService.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageRecordService.java
new file mode 100644
index 000000000..875c29cfd
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageRecordService.java
@@ -0,0 +1,122 @@
+package cn.iocoder.yudao.module.trade.service.brokerage;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.record.BrokerageRecordPageReqVO;
+import cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.record.AppBrokerageProductPriceRespVO;
+import cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.user.AppBrokerageUserRankByPriceRespVO;
+import cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.user.AppBrokerageUserRankPageReqVO;
+import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.BrokerageRecordDO;
+import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageRecordBizTypeEnum;
+import cn.iocoder.yudao.module.trade.service.brokerage.bo.BrokerageAddReqBO;
+import cn.iocoder.yudao.module.trade.service.brokerage.bo.UserBrokerageSummaryBO;
+
+import javax.validation.Valid;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 佣金记录 Service 接口
+ *
+ * @author owen
+ */
+public interface BrokerageRecordService {
+
+ /**
+ * 获得佣金记录
+ *
+ * @param id 编号
+ * @return 佣金记录
+ */
+ BrokerageRecordDO getBrokerageRecord(Integer id);
+
+ /**
+ * 获得佣金记录分页
+ *
+ * @param pageReqVO 分页查询
+ * @return 佣金记录分页
+ */
+ PageResult<BrokerageRecordDO> getBrokerageRecordPage(BrokerageRecordPageReqVO pageReqVO);
+
+ /**
+ * 增加佣金【多级分佣】
+ *
+ * @param userId 会员编号
+ * @param bizType 业务类型
+ * @param list 请求参数列表
+ */
+ void addBrokerage(Long userId, BrokerageRecordBizTypeEnum bizType, @Valid List<BrokerageAddReqBO> list);
+
+ /**
+ * 增加佣金【只针对自己】
+ *
+ * @param userId 会员编号
+ * @param bizType 业务类型
+ * @param bizId 业务编号
+ * @param brokeragePrice 佣金
+ * @param title 标题
+ */
+ void addBrokerage(Long userId, BrokerageRecordBizTypeEnum bizType, String bizId, Integer brokeragePrice, String title);
+
+ /**
+ * 取消佣金：将佣金记录，状态修改为已失效
+ *
+ * @param userId 会员编号
+ * @param bizType 业务类型
+ * @param bizId 业务编号
+ */
+ void cancelBrokerage(Long userId, BrokerageRecordBizTypeEnum bizType, String bizId);
+
+ /**
+ * 解冻佣金：将待结算的佣金记录，状态修改为已结算
+ *
+ * @return 解冻佣金的数量
+ */
+ int unfreezeRecord();
+
+ /**
+ * 汇总用户佣金
+ *
+ * @param userId 用户编号
+ * @param bizType 业务类型
+ * @param status 佣金状态
+ * @return 用户佣金汇总
+ */
+ UserBrokerageSummaryBO getUserBrokerageSummaryByUserId(Long userId, Integer bizType, Integer status);
+
+ /**
+ * 获得用户佣金合计
+ *
+ * @param userId 用户编号
+ * @param bizType 业务类型
+ * @param beginTime 开始时间
+ * @param endTime 截止时间
+ * @return 用户佣金合计
+ */
+ Integer getSummaryPriceByUserId(Long userId, Integer bizType, LocalDateTime beginTime, LocalDateTime endTime);
+
+ /**
+ * 获得用户佣金排行分页列表（基于佣金总数）
+ *
+ * @param pageReqVO 分页查询
+ * @return 排行榜分页
+ */
+ PageResult<AppBrokerageUserRankByPriceRespVO> getBrokerageUserChildSummaryPageByPrice(AppBrokerageUserRankPageReqVO pageReqVO);
+
+ /**
+ * 获取用户的排名（基于佣金总数）
+ *
+ * @param userId 用户编号
+ * @param times 时间范围
+ * @return 用户的排名
+ */
+ Integer getUserRankByPrice(Long userId, LocalDateTime[] times);
+
+ /**
+ * 计算商品被购买后，推广员可以得到的佣金
+ *
+ * @param spuId 商品编号
+ * @param userId 用户编号
+ * @return 用户佣金
+ */
+ AppBrokerageProductPriceRespVO calculateProductBrokeragePrice(Long spuId, Long userId);
+}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/record/BrokerageRecordServiceImpl.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageRecordServiceImpl.java
similarity index 60%
rename from yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/record/BrokerageRecordServiceImpl.java
rename to yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageRecordServiceImpl.java
index 5752f0615..7630ce4c5 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/record/BrokerageRecordServiceImpl.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageRecordServiceImpl.java
@@ -1,24 +1,34 @@
-package cn.iocoder.yudao.module.trade.service.brokerage.record;
+package cn.iocoder.yudao.module.trade.service.brokerage;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.ListUtil;
+import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.BooleanUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.spring.SpringUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.number.MoneyUtils;
-import cn.iocoder.yudao.module.trade.controller.admin.brokerage.record.vo.BrokerageRecordPageReqVO;
-import cn.iocoder.yudao.module.trade.convert.brokerage.record.BrokerageRecordConvert;
-import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.record.BrokerageRecordDO;
-import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.user.BrokerageUserDO;
+import cn.iocoder.yudao.framework.mybatis.core.util.MyBatisUtils;
+import cn.iocoder.yudao.module.product.api.sku.ProductSkuApi;
+import cn.iocoder.yudao.module.product.api.sku.dto.ProductSkuRespDTO;
+import cn.iocoder.yudao.module.product.api.spu.ProductSpuApi;
+import cn.iocoder.yudao.module.product.api.spu.dto.ProductSpuRespDTO;
+import cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.record.BrokerageRecordPageReqVO;
+import cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.record.AppBrokerageProductPriceRespVO;
+import cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.user.AppBrokerageUserRankByPriceRespVO;
+import cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.user.AppBrokerageUserRankPageReqVO;
+import cn.iocoder.yudao.module.trade.convert.brokerage.BrokerageRecordConvert;
+import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.BrokerageRecordDO;
+import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.BrokerageUserDO;
import cn.iocoder.yudao.module.trade.dal.dataobject.config.TradeConfigDO;
-import cn.iocoder.yudao.module.trade.dal.mysql.brokerage.record.BrokerageRecordMapper;
+import cn.iocoder.yudao.module.trade.dal.mysql.brokerage.BrokerageRecordMapper;
import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageRecordBizTypeEnum;
import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageRecordStatusEnum;
import cn.iocoder.yudao.module.trade.service.brokerage.bo.BrokerageAddReqBO;
import cn.iocoder.yudao.module.trade.service.brokerage.bo.UserBrokerageSummaryBO;
-import cn.iocoder.yudao.module.trade.service.brokerage.user.BrokerageUserService;
import cn.iocoder.yudao.module.trade.service.config.TradeConfigService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -29,6 +39,13 @@ import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
+import java.util.Optional;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.getMaxValue;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.getMinValue;
+import static cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils.getLoginUserId;
+import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.BROKERAGE_WITHDRAW_USER_BALANCE_NOT_ENOUGH;
/**
* 佣金记录 Service 实现类
@@ -47,6 +64,11 @@ public class BrokerageRecordServiceImpl implements BrokerageRecordService {
@Resource
private BrokerageUserService brokerageUserService;
+ @Resource
+ private ProductSpuApi productSpuApi;
+ @Resource
+ private ProductSkuApi productSkuApi;
+
@Override
public BrokerageRecordDO getBrokerageRecord(Integer id) {
return brokerageRecordMapper.selectById(id);
@@ -218,6 +240,55 @@ public class BrokerageRecordServiceImpl implements BrokerageRecordService {
return summaryBO != null ? summaryBO : new UserBrokerageSummaryBO(0, 0);
}
+ @Override
+ public Integer getSummaryPriceByUserId(Long userId, Integer bizType, LocalDateTime beginTime, LocalDateTime endTime) {
+ return brokerageRecordMapper.selectSummaryPriceByUserIdAndBizTypeAndCreateTimeBetween(userId, bizType, beginTime, endTime);
+ }
+
+ @Override
+ public PageResult<AppBrokerageUserRankByPriceRespVO> getBrokerageUserChildSummaryPageByPrice(AppBrokerageUserRankPageReqVO pageReqVO) {
+ IPage<AppBrokerageUserRankByPriceRespVO> pageResult = brokerageRecordMapper.selectSummaryPricePageGroupByUserId(MyBatisUtils.buildPage(pageReqVO),
+ BrokerageRecordBizTypeEnum.ORDER.getType(), BrokerageRecordStatusEnum.SETTLEMENT.getStatus(),
+ ArrayUtil.get(pageReqVO.getTimes(), 0), ArrayUtil.get(pageReqVO.getTimes(), 1));
+ return new PageResult<>(pageResult.getRecords(), pageResult.getTotal());
+ }
+
+ @Override
+ public Integer getUserRankByPrice(Long userId, LocalDateTime[] times) {
+ AppBrokerageUserRankPageReqVO pageParam = new AppBrokerageUserRankPageReqVO().setTimes(times);
+ // 取前 100 名
+ pageParam.setPageSize(100);
+ PageResult<AppBrokerageUserRankByPriceRespVO> pageResult = getBrokerageUserChildSummaryPageByPrice(pageParam);
+ // 获得索引
+ int index = CollUtil.indexOf(pageResult.getList(), user -> Objects.equals(userId, user.getId()));
+ // 获得排名
+ return index + 1;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void addBrokerage(Long userId, BrokerageRecordBizTypeEnum bizType, String bizId, Integer brokeragePrice, String title) {
+ // 1. 校验佣金余额
+ BrokerageUserDO user = brokerageUserService.getBrokerageUser(userId);
+ int balance = Optional.of(user)
+ .map(BrokerageUserDO::getBrokeragePrice).orElse(0);
+ if (balance + brokeragePrice < 0) {
+ throw exception(BROKERAGE_WITHDRAW_USER_BALANCE_NOT_ENOUGH, MoneyUtils.fenToYuanStr(balance));
+ }
+
+ // 2. 更新佣金余额
+ boolean success = brokerageUserService.updateUserPrice(userId, brokeragePrice);
+ if (!success) {
+ // 失败时，则抛出异常。只会出现扣减佣金时，余额不足的情况
+ throw exception(BROKERAGE_WITHDRAW_USER_BALANCE_NOT_ENOUGH, MoneyUtils.fenToYuanStr(balance));
+ }
+
+ // 3. 新增记录
+ BrokerageRecordDO record = BrokerageRecordConvert.INSTANCE.convert(user, bizType, bizId, 0, brokeragePrice,
+ null, title, null, null);
+ brokerageRecordMapper.insert(record);
+ }
+
@Transactional(rollbackFor = Exception.class)
public boolean unfreezeRecord(BrokerageRecordDO record) {
// 更新记录状态
@@ -236,6 +307,47 @@ public class BrokerageRecordServiceImpl implements BrokerageRecordService {
return true;
}
+ @Override
+ public AppBrokerageProductPriceRespVO calculateProductBrokeragePrice(Long spuId, Long userId) {
+ // 1. 构建默认的返回值
+ AppBrokerageProductPriceRespVO respVO = new AppBrokerageProductPriceRespVO().setEnabled(false)
+ .setBrokerageMinPrice(0).setBrokerageMaxPrice(0);
+
+ // 2.1 校验分销功能是否开启
+ TradeConfigDO tradeConfig = tradeConfigService.getTradeConfig();
+ if (tradeConfig == null || BooleanUtil.isFalse(tradeConfig.getBrokerageEnabled())) {
+ return respVO;
+ }
+ // 2.2 校验用户是否有分销资格
+ respVO.setEnabled(brokerageUserService.getUserBrokerageEnabled(getLoginUserId()));
+ if (BooleanUtil.isFalse(respVO.getEnabled())) {
+ return respVO;
+ }
+ // 2.3 校验商品是否存在
+ ProductSpuRespDTO spu = productSpuApi.getSpu(spuId);
+ if (spu == null) {
+ return respVO;
+ }
+
+ // 3.1 商品单独分佣模式
+ Integer fixedMinPrice = 0;
+ Integer fixedMaxPrice = 0;
+ Integer spuMinPrice = 0;
+ Integer spuMaxPrice = 0;
+ List<ProductSkuRespDTO> skuList = productSkuApi.getSkuListBySpuId(ListUtil.of(spuId));
+ if (BooleanUtil.isTrue(spu.getSubCommissionType())) {
+ fixedMinPrice = getMinValue(skuList, ProductSkuRespDTO::getFirstBrokeragePrice);
+ fixedMaxPrice = getMaxValue(skuList, ProductSkuRespDTO::getFirstBrokeragePrice);
+ // 3.2 全局分佣模式（根据商品价格比例计算）
+ } else {
+ spuMinPrice = getMinValue(skuList, ProductSkuRespDTO::getPrice);
+ spuMaxPrice = getMaxValue(skuList, ProductSkuRespDTO::getPrice);
+ }
+ respVO.setBrokerageMinPrice(calculatePrice(spuMinPrice, tradeConfig.getBrokerageFirstPercent(), fixedMinPrice));
+ respVO.setBrokerageMaxPrice(calculatePrice(spuMaxPrice, tradeConfig.getBrokerageFirstPercent(), fixedMaxPrice));
+ return respVO;
+ }
+
/**
* 获得自身的代理对象，解决 AOP 生效问题
*
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/user/BrokerageUserService.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserService.java
similarity index 73%
rename from yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/user/BrokerageUserService.java
rename to yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserService.java
index 88b84d9f4..8fc8c1960 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/user/BrokerageUserService.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserService.java
@@ -1,9 +1,13 @@
-package cn.iocoder.yudao.module.trade.service.brokerage.user;
+package cn.iocoder.yudao.module.trade.service.brokerage;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils;
-import cn.iocoder.yudao.module.trade.controller.admin.brokerage.user.vo.BrokerageUserPageReqVO;
-import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.user.BrokerageUserDO;
+import cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.user.BrokerageUserPageReqVO;
+import cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.user.AppBrokerageUserChildSummaryPageReqVO;
+import cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.user.AppBrokerageUserChildSummaryRespVO;
+import cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.user.AppBrokerageUserRankByUserCountRespVO;
+import cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.user.AppBrokerageUserRankPageReqVO;
+import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.BrokerageUserDO;
import javax.validation.constraints.NotNull;
import java.time.LocalDateTime;
@@ -70,8 +74,9 @@ public interface BrokerageUserService {
*
* @param id 用户编号
* @param price 用户可用佣金
+ * @return 更新结果
*/
- void updateUserPrice(Long id, Integer price);
+ boolean updateUserPrice(Long id, Integer price);
/**
* 更新用户冻结佣金
@@ -129,4 +134,21 @@ public interface BrokerageUserService {
* @return 是否有分销资格
*/
Boolean getUserBrokerageEnabled(Long userId);
+
+ /**
+ * 获得推广人排行
+ *
+ * @param pageReqVO 分页查询
+ * @return 推广人排行
+ */
+ PageResult<AppBrokerageUserRankByUserCountRespVO> getBrokerageUserRankPageByUserCount(AppBrokerageUserRankPageReqVO pageReqVO);
+
+ /**
+ * 获得下级分销统计分页
+ *
+ * @param pageReqVO 分页查询
+ * @param userId 用户编号
+ * @return 下级分销统计分页
+ */
+ PageResult<AppBrokerageUserChildSummaryRespVO> getBrokerageUserChildSummaryPage(AppBrokerageUserChildSummaryPageReqVO pageReqVO, Long userId);
}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/user/BrokerageUserServiceImpl.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserServiceImpl.java
similarity index 68%
rename from yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/user/BrokerageUserServiceImpl.java
rename to yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserServiceImpl.java
index 614393be2..8672f3069 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/user/BrokerageUserServiceImpl.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserServiceImpl.java
@@ -1,26 +1,35 @@
-package cn.iocoder.yudao.module.trade.service.brokerage.user;
+package cn.iocoder.yudao.module.trade.service.brokerage;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.BooleanUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.trade.controller.admin.brokerage.user.vo.BrokerageUserPageReqVO;
-import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.user.BrokerageUserDO;
+import cn.iocoder.yudao.framework.mybatis.core.util.MyBatisUtils;
+import cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.user.BrokerageUserPageReqVO;
+import cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.user.AppBrokerageUserChildSummaryPageReqVO;
+import cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.user.AppBrokerageUserChildSummaryRespVO;
+import cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.user.AppBrokerageUserRankByUserCountRespVO;
+import cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.user.AppBrokerageUserRankPageReqVO;
+import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.BrokerageUserDO;
import cn.iocoder.yudao.module.trade.dal.dataobject.config.TradeConfigDO;
-import cn.iocoder.yudao.module.trade.dal.mysql.brokerage.user.BrokerageUserMapper;
+import cn.iocoder.yudao.module.trade.dal.mysql.brokerage.BrokerageUserMapper;
import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageBindModeEnum;
import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageEnabledConditionEnum;
import cn.iocoder.yudao.module.trade.service.config.TradeConfigService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import java.time.LocalDateTime;
-import java.util.*;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.*;
/**
@@ -50,14 +59,18 @@ public class BrokerageUserServiceImpl implements BrokerageUserService {
@Override
public PageResult<BrokerageUserDO> getBrokerageUserPage(BrokerageUserPageReqVO pageReqVO) {
- List<Integer> levels = buildUserQueryLevels(pageReqVO.getBindUserId(), pageReqVO.getLevel());
- return brokerageUserMapper.selectPage(pageReqVO, levels);
+ List<Long> bindUserIds = buildBindUserIdsByLevel(pageReqVO.getBindUserId(), pageReqVO.getLevel());
+ return brokerageUserMapper.selectPage(pageReqVO, bindUserIds);
}
@Override
public void updateBrokerageUserId(Long id, Long bindUserId) {
// 校验存在
BrokerageUserDO brokerageUser = validateBrokerageUserExists(id);
+ // 绑定关系未发生变化
+ if (Objects.equals(brokerageUser.getBindUserId(), bindUserId)) {
+ return;
+ }
// 情况一：清除推广员
if (bindUserId == null) {
@@ -66,12 +79,6 @@ public class BrokerageUserServiceImpl implements BrokerageUserService {
return;
}
- // 绑定关系未发生变化
- // TODO @疯狂：这个放到“情况一”之前，貌似也没关系？
- if (Objects.equals(brokerageUser.getBindUserId(), bindUserId)) {
- return;
- }
-
// 情况二：修改推广员
validateCanBindUser(brokerageUser, bindUserId);
brokerageUserMapper.updateById(fillBindUserData(bindUserId, new BrokerageUserDO().setId(id)));
@@ -110,12 +117,13 @@ public class BrokerageUserServiceImpl implements BrokerageUserService {
}
@Override
- public void updateUserPrice(Long id, Integer price) {
+ public boolean updateUserPrice(Long id, Integer price) {
if (price > 0) {
brokerageUserMapper.updatePriceIncr(id, price);
} else if (price < 0) {
- brokerageUserMapper.updatePriceDecr(id, price);
+ return brokerageUserMapper.updatePriceDecr(id, price) > 0;
}
+ return true;
}
@Override
@@ -138,11 +146,11 @@ public class BrokerageUserServiceImpl implements BrokerageUserService {
@Override
public Long getBrokerageUserCountByBindUserId(Long bindUserId, Integer level) {
- List<Integer> levels = buildUserQueryLevels(bindUserId, level);
- if (CollUtil.isEmpty(levels)) {
+ List<Long> bindUserIds = buildBindUserIdsByLevel(bindUserId, level);
+ if (CollUtil.isEmpty(bindUserIds)) {
return 0L;
}
- return brokerageUserMapper.selectCountByBindUserIdAndLevelIn(bindUserId, levels);
+ return brokerageUserMapper.selectCountByBindUserIdIn(bindUserIds);
}
@Override
@@ -176,21 +184,15 @@ public class BrokerageUserServiceImpl implements BrokerageUserService {
return true;
}
+ /**
+ * 补全绑定用户的字段
+ *
+ * @param bindUserId 绑定的用户编号
+ * @param brokerageUser update 对象
+ * @return 补全后的 update 对象
+ */
private BrokerageUserDO fillBindUserData(Long bindUserId, BrokerageUserDO brokerageUser) {
- BrokerageUserDO bindUser = getBrokerageUser(bindUserId);
-
- Integer bindUserLevel = 0;
- String bindUserPath = "";
- if (bindUser != null) {
- bindUserLevel = ObjectUtil.defaultIfNull(bindUser.getLevel(), 0);
- bindUserPath = bindUser.getPath();
- }
-
- String path = StrUtil.isEmpty(bindUserPath)
- ? String.valueOf(bindUserId)
- : String.format("%s,%s", bindUserPath, bindUserId);
- return brokerageUser.setBindUserId(bindUserId).setBindUserTime(LocalDateTime.now())
- .setLevel(bindUserLevel + 1).setPath(path);
+ return brokerageUser.setBindUserId(bindUserId).setBindUserTime(LocalDateTime.now());
}
@Override
@@ -207,6 +209,19 @@ public class BrokerageUserServiceImpl implements BrokerageUserService {
.orElse(false);
}
+ @Override
+ public PageResult<AppBrokerageUserRankByUserCountRespVO> getBrokerageUserRankPageByUserCount(AppBrokerageUserRankPageReqVO pageReqVO) {
+ IPage<AppBrokerageUserRankByUserCountRespVO> pageResult = brokerageUserMapper.selectCountPageGroupByBindUserId(MyBatisUtils.buildPage(pageReqVO),
+ ArrayUtil.get(pageReqVO.getTimes(), 0), ArrayUtil.get(pageReqVO.getTimes(), 1));
+ return new PageResult<>(pageResult.getRecords(), pageResult.getTotal());
+ }
+
+ @Override
+ public PageResult<AppBrokerageUserChildSummaryRespVO> getBrokerageUserChildSummaryPage(AppBrokerageUserChildSummaryPageReqVO pageReqVO, Long userId) {
+ IPage<AppBrokerageUserChildSummaryRespVO> pageResult = brokerageUserMapper.selectSummaryPageByUserId(MyBatisUtils.buildPage(pageReqVO), pageReqVO, userId);
+ return new PageResult<>(pageResult.getRecords(), pageResult.getTotal());
+ }
+
private boolean isUserCanBind(BrokerageUserDO user, Boolean isNewUser) {
// 校验分销功能是否启用
TradeConfigDO tradeConfig = tradeConfigService.getTradeConfig();
@@ -221,6 +236,7 @@ public class BrokerageUserServiceImpl implements BrokerageUserService {
// 校验分销关系绑定模式
if (BrokerageBindModeEnum.REGISTER.getMode().equals(tradeConfig.getBrokerageBindMode())) {
+ // TODO @疯狂：是不是把 isNewUser 挪到这里好点呀？
if (!BooleanUtil.isTrue(isNewUser)) {
throw exception(BROKERAGE_BIND_MODE_REGISTER); // 只有在注册时可以绑定
}
@@ -246,29 +262,36 @@ public class BrokerageUserServiceImpl implements BrokerageUserService {
}
// 下级不能绑定自己的上级
- if (StrUtil.split(bindUser.getPath(), ",").contains(String.valueOf(user.getId()))) {
- throw exception(BROKERAGE_BIND_LOOP);
+ for (int i = 0; i <= Short.MAX_VALUE; i++) {
+ if (Objects.equals(bindUser.getBindUserId(), user.getId())) {
+ throw exception(BROKERAGE_BIND_LOOP);
+ }
+ bindUser = getBrokerageUser(bindUser.getBindUserId());
+ // 找到根节点，结束循环
+ if (bindUser == null || bindUser.getBindUserId() == null) {
+ break;
+ }
}
}
- // TODO @芋艿：这个层级，要微信讨论下；
- private List<Integer> buildUserQueryLevels(Long bindUserId, Integer level) {
- List<Integer> levels = new ArrayList<>(2);
-
- BrokerageUserDO bindUser = getBrokerageUser(bindUserId);
- if (bindUser == null) {
- return levels;
+ /**
+ * 根据绑定用户编号，获得绑定用户编号列表
+ *
+ * @param bindUserId 绑定用户编号
+ * @param level 绑定用户的层级。
+ * 如果 level 为空，则查询 1+2 两个层级
+ * @return 绑定用户编号列表
+ */
+ private List<Long> buildBindUserIdsByLevel(Long bindUserId, Integer level) {
+ Assert.isTrue(level == null || level <= 2, "目前只支持 level 小于等于 2");
+ List<Long> bindUserIds = CollUtil.newArrayList();
+ if (level == null || level == 1) {
+ bindUserIds.add(bindUserId);
}
-
- if (level == null) {
- // 默认查两层
- levels.add(bindUser.getLevel() + 1);
- levels.add(bindUser.getLevel() + 2);
- } else {
- levels.add(bindUser.getLevel() + level);
+ if (level == null || level == 2) {
+ bindUserIds.addAll(convertList(brokerageUserMapper.selectListByBindUserId(bindUserId), BrokerageUserDO::getId));
}
- return levels;
-
+ return bindUserIds;
}
}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/withdraw/BrokerageWithdrawService.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawService.java
similarity index 50%
rename from yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/withdraw/BrokerageWithdrawService.java
rename to yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawService.java
index 26c1d4a8e..2d7ba622b 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/withdraw/BrokerageWithdrawService.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawService.java
@@ -1,9 +1,11 @@
-package cn.iocoder.yudao.module.trade.service.brokerage.withdraw;
+package cn.iocoder.yudao.module.trade.service.brokerage;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.trade.controller.admin.brokerage.withdraw.vo.BrokerageWithdrawPageReqVO;
-import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.withdraw.BrokerageWithdrawDO;
+import cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.withdraw.BrokerageWithdrawPageReqVO;
+import cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.withdraw.AppBrokerageWithdrawCreateReqVO;
+import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.BrokerageWithdrawDO;
import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageWithdrawStatusEnum;
+import cn.iocoder.yudao.module.trade.service.brokerage.bo.UserWithdrawSummaryBO;
/**
* 佣金提现 Service 接口
@@ -13,13 +15,12 @@ import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageWithdrawStatusEnum
public interface BrokerageWithdrawService {
/**
- * 审核佣金提现
+ * 【管理员】审核佣金提现
*
* @param id 佣金编号
* @param status 审核状态
* @param auditReason 驳回原因
*/
-
void auditBrokerageWithdraw(Integer id, BrokerageWithdrawStatusEnum status, String auditReason);
/**
@@ -37,4 +38,23 @@ public interface BrokerageWithdrawService {
* @return 佣金提现分页
*/
PageResult<BrokerageWithdrawDO> getBrokerageWithdrawPage(BrokerageWithdrawPageReqVO pageReqVO);
+
+ /**
+ * 【会员】创建佣金提现
+ *
+ * @param createReqVO 创建信息
+ * @param userId 会员用户编号
+ * @return 佣金提现编号
+ */
+ Long createBrokerageWithdraw(AppBrokerageWithdrawCreateReqVO createReqVO, Long userId);
+
+ /**
+ * 汇总用户提现
+ *
+ * @param userId 用户编号
+ * @param status 提现状态
+ * @return 用户提现汇总
+ */
+ UserWithdrawSummaryBO getWithdrawSummaryByUserId(Long userId, BrokerageWithdrawStatusEnum status);
+
}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawServiceImpl.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawServiceImpl.java
new file mode 100644
index 000000000..102e65529
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawServiceImpl.java
@@ -0,0 +1,178 @@
+package cn.iocoder.yudao.module.trade.service.brokerage;
+
+import cn.hutool.core.date.LocalDateTimeUtil;
+import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.number.MoneyUtils;
+import cn.iocoder.yudao.module.system.api.notify.NotifyMessageSendApi;
+import cn.iocoder.yudao.module.system.api.notify.dto.NotifySendSingleToUserReqDTO;
+import cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.withdraw.BrokerageWithdrawPageReqVO;
+import cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.withdraw.AppBrokerageWithdrawCreateReqVO;
+import cn.iocoder.yudao.module.trade.convert.brokerage.BrokerageWithdrawConvert;
+import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.BrokerageWithdrawDO;
+import cn.iocoder.yudao.module.trade.dal.dataobject.config.TradeConfigDO;
+import cn.iocoder.yudao.module.trade.dal.mysql.brokerage.BrokerageWithdrawMapper;
+import cn.iocoder.yudao.module.trade.enums.MessageTemplateConstants;
+import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageRecordBizTypeEnum;
+import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageWithdrawStatusEnum;
+import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageWithdrawTypeEnum;
+import cn.iocoder.yudao.module.trade.service.brokerage.bo.UserWithdrawSummaryBO;
+import cn.iocoder.yudao.module.trade.service.config.TradeConfigService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+import javax.validation.Validator;
+import java.time.LocalDateTime;
+import java.util.Map;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.*;
+
+/**
+ * 佣金提现 Service 实现类
+ *
+ * @author 芋道源码
+ */
+@Service
+@Validated
+public class BrokerageWithdrawServiceImpl implements BrokerageWithdrawService {
+
+ @Resource
+ private BrokerageWithdrawMapper brokerageWithdrawMapper;
+
+ @Resource
+ private BrokerageRecordService brokerageRecordService;
+ @Resource
+ private TradeConfigService tradeConfigService;
+
+ @Resource
+ private NotifyMessageSendApi notifyMessageSendApi;
+
+ @Resource
+ private Validator validator;
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void auditBrokerageWithdraw(Integer id, BrokerageWithdrawStatusEnum status, String auditReason) {
+ // 1.1 校验存在
+ BrokerageWithdrawDO withdraw = validateBrokerageWithdrawExists(id);
+ // 1.2 校验状态为审核中
+ if (ObjectUtil.notEqual(BrokerageWithdrawStatusEnum.AUDITING.getStatus(), withdraw.getStatus())) {
+ throw exception(BROKERAGE_WITHDRAW_STATUS_NOT_AUDITING);
+ }
+
+ // 2. 更新
+ BrokerageWithdrawDO updateObj = new BrokerageWithdrawDO()
+ .setStatus(status.getStatus())
+ .setAuditReason(auditReason)
+ .setAuditTime(LocalDateTime.now());
+ int rows = brokerageWithdrawMapper.updateByIdAndStatus(id, BrokerageWithdrawStatusEnum.AUDITING.getStatus(), updateObj);
+ if (rows == 0) {
+ throw exception(BROKERAGE_WITHDRAW_STATUS_NOT_AUDITING);
+ }
+
+ String templateCode = MessageTemplateConstants.BROKERAGE_WITHDRAW_AUDIT_APPROVE;
+ if (BrokerageWithdrawStatusEnum.AUDIT_SUCCESS.equals(status)) {
+ // 3.1 通过时佣金转余额
+ if (BrokerageWithdrawTypeEnum.WALLET.getType().equals(withdraw.getType())) {
+ // todo
+ }
+ } else if (BrokerageWithdrawStatusEnum.AUDIT_FAIL.equals(status)) {
+ templateCode = MessageTemplateConstants.BROKERAGE_WITHDRAW_AUDIT_REJECT;
+
+ // 3.2 驳回时需要退还用户佣金
+ brokerageRecordService.addBrokerage(withdraw.getUserId(), BrokerageRecordBizTypeEnum.WITHDRAW_REJECT,
+ String.valueOf(withdraw.getId()), withdraw.getPrice(), BrokerageRecordBizTypeEnum.WITHDRAW_REJECT.getTitle());
+ } else {
+ throw new IllegalArgumentException("不支持的提现状态");
+ }
+
+ // 4. 通知用户
+ Map<String, Object> templateParams = MapUtil.<String, Object>builder()
+ .put("createTime", LocalDateTimeUtil.formatNormal(withdraw.getCreateTime()))
+ .put("price", MoneyUtils.fenToYuanStr(withdraw.getPrice()))
+ .put("reason", withdraw.getAuditReason())
+ .build();
+ NotifySendSingleToUserReqDTO reqDTO = new NotifySendSingleToUserReqDTO()
+ .setUserId(withdraw.getUserId())
+ .setTemplateCode(templateCode).setTemplateParams(templateParams);
+ notifyMessageSendApi.sendSingleMessageToMember(reqDTO);
+ }
+
+ private BrokerageWithdrawDO validateBrokerageWithdrawExists(Integer id) {
+ BrokerageWithdrawDO withdraw = brokerageWithdrawMapper.selectById(id);
+ if (withdraw == null) {
+ throw exception(BROKERAGE_WITHDRAW_NOT_EXISTS);
+ }
+ return withdraw;
+ }
+
+ @Override
+ public BrokerageWithdrawDO getBrokerageWithdraw(Integer id) {
+ return brokerageWithdrawMapper.selectById(id);
+ }
+
+ @Override
+ public PageResult<BrokerageWithdrawDO> getBrokerageWithdrawPage(BrokerageWithdrawPageReqVO pageReqVO) {
+ return brokerageWithdrawMapper.selectPage(pageReqVO);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Long createBrokerageWithdraw(AppBrokerageWithdrawCreateReqVO createReqVO, Long userId) {
+ // 校验提现金额
+ TradeConfigDO tradeConfig = validateWithdrawPrice(createReqVO.getPrice());
+ // 校验提现参数
+ createReqVO.validate(validator);
+
+ // 计算手续费
+ Integer feePrice = calculateFeePrice(createReqVO.getPrice(), tradeConfig.getBrokerageWithdrawFeePercent());
+ // 创建佣金提现记录
+ BrokerageWithdrawDO withdraw = BrokerageWithdrawConvert.INSTANCE.convert(createReqVO, userId, feePrice);
+ brokerageWithdrawMapper.insert(withdraw);
+
+ // 创建用户佣金记录
+ brokerageRecordService.addBrokerage(userId, BrokerageRecordBizTypeEnum.WITHDRAW, String.valueOf(withdraw.getId()),
+ -createReqVO.getPrice(), BrokerageRecordBizTypeEnum.WITHDRAW.getTitle());
+
+ return withdraw.getId();
+ }
+
+ @Override
+ public UserWithdrawSummaryBO getWithdrawSummaryByUserId(Long userId, BrokerageWithdrawStatusEnum status) {
+ UserWithdrawSummaryBO summaryBO = brokerageWithdrawMapper.selectCountAndSumPriceByUserIdAndStatus(userId, status.getStatus());
+ return summaryBO != null ? summaryBO : new UserWithdrawSummaryBO(0, 0);
+ }
+
+ /**
+ * 计算提现手续费
+ *
+ * @param withdrawPrice 提现金额
+ * @param percent 手续费百分比
+ * @return 提现手续费
+ */
+ Integer calculateFeePrice(Integer withdrawPrice, Integer percent) {
+ Integer feePrice = 0;
+ if (percent != null && percent > 0) {
+ feePrice = MoneyUtils.calculateRatePrice(withdrawPrice, Double.valueOf(percent));
+ }
+ return feePrice;
+ }
+
+ /**
+ * 校验提现金额要求
+ *
+ * @param withdrawPrice 提现金额
+ * @return 分销配置
+ */
+ TradeConfigDO validateWithdrawPrice(Integer withdrawPrice) {
+ TradeConfigDO tradeConfig = tradeConfigService.getTradeConfig();
+ if (tradeConfig.getBrokerageWithdrawMinPrice() != null && withdrawPrice < tradeConfig.getBrokerageWithdrawMinPrice()) {
+ throw exception(BROKERAGE_WITHDRAW_MIN_PRICE, MoneyUtils.fenToYuanStr(tradeConfig.getBrokerageWithdrawMinPrice()));
+ }
+ return tradeConfig;
+ }
+}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/bo/UserWithdrawSummaryBO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/bo/UserWithdrawSummaryBO.java
new file mode 100644
index 000000000..cbfc79302
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/bo/UserWithdrawSummaryBO.java
@@ -0,0 +1,26 @@
+package cn.iocoder.yudao.module.trade.service.brokerage.bo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 用户佣金提现合计 BO
+ *
+ * @author owen
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class UserWithdrawSummaryBO {
+
+ /**
+ * 提现次数
+ */
+ private Integer count;
+ /**
+ * 提现金额
+ */
+ private Integer price;
+
+}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/record/BrokerageRecordService.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/record/BrokerageRecordService.java
deleted file mode 100644
index a6ef0b659..000000000
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/record/BrokerageRecordService.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package cn.iocoder.yudao.module.trade.service.brokerage.record;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.trade.controller.admin.brokerage.record.vo.BrokerageRecordPageReqVO;
-import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.record.BrokerageRecordDO;
-import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageRecordBizTypeEnum;
-import cn.iocoder.yudao.module.trade.service.brokerage.bo.BrokerageAddReqBO;
-import cn.iocoder.yudao.module.trade.service.brokerage.bo.UserBrokerageSummaryBO;
-
-import javax.validation.Valid;
-import java.util.List;
-
-/**
- * 佣金记录 Service 接口
- *
- * @author owen
- */
-public interface BrokerageRecordService {
-
- /**
- * 获得佣金记录
- *
- * @param id 编号
- * @return 佣金记录
- */
- BrokerageRecordDO getBrokerageRecord(Integer id);
-
- /**
- * 获得佣金记录分页
- *
- * @param pageReqVO 分页查询
- * @return 佣金记录分页
- */
- PageResult<BrokerageRecordDO> getBrokerageRecordPage(BrokerageRecordPageReqVO pageReqVO);
-
- /**
- * 增加佣金
- *
- * @param userId 会员编号
- * @param bizType 业务类型
- * @param list 请求参数列表
- */
- void addBrokerage(Long userId, BrokerageRecordBizTypeEnum bizType, @Valid List<BrokerageAddReqBO> list);
-
- /**
- * 取消佣金：将佣金记录，状态修改为已失效
- *
- * @param userId 会员编号
- * @param bizType 业务类型
- * @param bizId 业务编号
- */
- void cancelBrokerage(Long userId, BrokerageRecordBizTypeEnum bizType, String bizId);
-
- /**
- * 解冻佣金：将待结算的佣金记录，状态修改为已结算
- *
- * @return 解冻佣金的数量
- */
- int unfreezeRecord();
-
- /**
- * 汇总用户佣金
- *
- * @param userId 用户编号
- * @param bizType 业务类型
- * @param status 佣金状态
- * @return 用户佣金汇总
- */
- UserBrokerageSummaryBO getUserBrokerageSummaryByUserId(Long userId, Integer bizType, Integer status);
-}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/withdraw/BrokerageWithdrawServiceImpl.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/withdraw/BrokerageWithdrawServiceImpl.java
deleted file mode 100644
index 9369de782..000000000
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/withdraw/BrokerageWithdrawServiceImpl.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package cn.iocoder.yudao.module.trade.service.brokerage.withdraw;
-
-import cn.hutool.core.date.LocalDateTimeUtil;
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.system.api.notify.NotifyMessageSendApi;
-import cn.iocoder.yudao.module.system.api.notify.dto.NotifySendSingleToUserReqDTO;
-import cn.iocoder.yudao.module.trade.controller.admin.brokerage.withdraw.vo.BrokerageWithdrawPageReqVO;
-import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.withdraw.BrokerageWithdrawDO;
-import cn.iocoder.yudao.module.trade.dal.mysql.brokerage.withdraw.BrokerageWithdrawMapper;
-import cn.iocoder.yudao.module.trade.enums.MessageTemplateConstants;
-import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageWithdrawStatusEnum;
-import cn.iocoder.yudao.module.trade.service.brokerage.record.BrokerageRecordService;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.validation.annotation.Validated;
-
-import javax.annotation.Resource;
-import java.time.LocalDateTime;
-import java.util.Map;
-
-import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.BROKERAGE_WITHDRAW_NOT_EXISTS;
-import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.BROKERAGE_WITHDRAW_STATUS_NOT_AUDITING;
-
-/**
- * 佣金提现 Service 实现类
- *
- * @author 芋道源码
- */
-@Service
-@Validated
-public class BrokerageWithdrawServiceImpl implements BrokerageWithdrawService {
-
- @Resource
- private BrokerageWithdrawMapper brokerageWithdrawMapper;
-
- @Resource
- private BrokerageRecordService brokerageRecordService;
-
- @Resource
- private NotifyMessageSendApi notifyMessageSendApi;
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void auditBrokerageWithdraw(Integer id, BrokerageWithdrawStatusEnum status, String auditReason) {
- // 1.1 校验存在
- BrokerageWithdrawDO withdraw = validateBrokerageWithdrawExists(id);
- // 1.2 校验状态为审核中
- if (ObjectUtil.notEqual(BrokerageWithdrawStatusEnum.AUDITING.getStatus(), withdraw.getStatus())) {
- throw exception(BROKERAGE_WITHDRAW_STATUS_NOT_AUDITING);
- }
-
- // 2. 更新
- BrokerageWithdrawDO updateObj = new BrokerageWithdrawDO()
- .setStatus(status.getStatus())
- .setAuditReason(auditReason)
- .setAuditTime(LocalDateTime.now());
- int rows = brokerageWithdrawMapper.updateByIdAndStatus(id, BrokerageWithdrawStatusEnum.AUDITING.getStatus(), updateObj);
- if (rows == 0) {
- throw exception(BROKERAGE_WITHDRAW_STATUS_NOT_AUDITING);
- }
-
- // 3. 驳回时需要退还用户佣金
- String templateCode = MessageTemplateConstants.BROKERAGE_WITHDRAW_AUDIT_APPROVE;
- if (BrokerageWithdrawStatusEnum.AUDIT_FAIL.equals(status)) {
- templateCode = MessageTemplateConstants.BROKERAGE_WITHDRAW_AUDIT_REJECT;
-
- // todo @owen
-// brokerageRecordService.addBrokerage(withdraw.getUserId(), BrokerageRecordBizTypeEnum.WITHDRAW, withdraw.getPrice(), "");
- }
-
- // 4. 通知用户
- Map<String, Object> templateParams = MapUtil.<String, Object>builder()
- .put("createTime", LocalDateTimeUtil.formatNormal(withdraw.getCreateTime()))
- .put("price", String.format("%.2f", withdraw.getPrice() / 100d))
- .put("reason", withdraw.getAuditReason())
- .build();
- NotifySendSingleToUserReqDTO reqDTO = new NotifySendSingleToUserReqDTO()
- .setUserId(withdraw.getUserId())
- .setTemplateCode(templateCode).setTemplateParams(templateParams);
- notifyMessageSendApi.sendSingleMessageToMember(reqDTO);
- }
-
- private BrokerageWithdrawDO validateBrokerageWithdrawExists(Integer id) {
- BrokerageWithdrawDO withdraw = brokerageWithdrawMapper.selectById(id);
- if (withdraw == null) {
- throw exception(BROKERAGE_WITHDRAW_NOT_EXISTS);
- }
- return withdraw;
- }
-
- @Override
- public BrokerageWithdrawDO getBrokerageWithdraw(Integer id) {
- return brokerageWithdrawMapper.selectById(id);
- }
-
- @Override
- public PageResult<BrokerageWithdrawDO> getBrokerageWithdrawPage(BrokerageWithdrawPageReqVO pageReqVO) {
- return brokerageWithdrawMapper.selectPage(pageReqVO);
- }
-
-}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderQueryServiceImpl.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderQueryServiceImpl.java
index 733ec9780..910e8c911 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderQueryServiceImpl.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderQueryServiceImpl.java
@@ -106,7 +106,7 @@ public class TradeOrderQueryServiceImpl implements TradeOrderQueryService {
if (order == null) {
throw exception(ORDER_NOT_FOUND);
}
-
+ // 查询物流
return getExpressTrackList(order);
}
@@ -117,7 +117,7 @@ public class TradeOrderQueryServiceImpl implements TradeOrderQueryService {
if (order == null) {
throw exception(ORDER_NOT_FOUND);
}
-
+ // 查询物流
return getExpressTrackList(order);
}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateService.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateService.java
index ee9128b6c..3de830df9 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateService.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateService.java
@@ -62,6 +62,22 @@ public interface TradeOrderUpdateService {
*/
void receiveOrder(Long userId, Long id);
+ /**
+ * 【会员】取消订单
+ *
+ * @param userId 用户编号
+ * @param id 订单编号
+ */
+ void cancelOrder(Long userId, Long id);
+
+ /**
+ * 【会员】删除订单
+ *
+ * @param userId 用户编号
+ * @param id 订单编号
+ */
+ void deleteOrder(Long userId, Long id);
+
/**
* 【管理员】交易订单备注
*
@@ -117,11 +133,4 @@ public interface TradeOrderUpdateService {
*/
Long createOrderItemComment(Long userId, AppTradeOrderItemCommentCreateReqVO createReqVO);
- /**
- * 【会员】取消订单
- *
- * @param userId 用户ID
- * @param id 订单编号
- */
- void cancelOrder(Long userId, Long id);
}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
index 3cdb364b5..42e77fc4b 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
@@ -24,6 +24,7 @@ import cn.iocoder.yudao.module.pay.enums.order.PayOrderStatusEnum;
import cn.iocoder.yudao.module.product.api.comment.ProductCommentApi;
import cn.iocoder.yudao.module.product.api.comment.dto.ProductCommentCreateReqDTO;
import cn.iocoder.yudao.module.product.api.sku.ProductSkuApi;
+import cn.iocoder.yudao.module.product.api.spu.ProductSpuApi;
import cn.iocoder.yudao.module.promotion.api.bargain.BargainRecordApi;
import cn.iocoder.yudao.module.promotion.api.combination.CombinationRecordApi;
import cn.iocoder.yudao.module.promotion.api.coupon.CouponApi;
@@ -48,8 +49,9 @@ import cn.iocoder.yudao.module.trade.enums.delivery.DeliveryTypeEnum;
import cn.iocoder.yudao.module.trade.enums.order.*;
import cn.iocoder.yudao.module.trade.framework.order.config.TradeOrderProperties;
import cn.iocoder.yudao.module.trade.framework.order.core.annotations.TradeOrderLog;
+import cn.iocoder.yudao.module.trade.framework.order.core.utils.TradeOrderLogUtils;
+import cn.iocoder.yudao.module.trade.service.brokerage.BrokerageRecordService;
import cn.iocoder.yudao.module.trade.service.brokerage.bo.BrokerageAddReqBO;
-import cn.iocoder.yudao.module.trade.service.brokerage.record.BrokerageRecordService;
import cn.iocoder.yudao.module.trade.service.cart.CartService;
import cn.iocoder.yudao.module.trade.service.delivery.DeliveryExpressService;
import cn.iocoder.yudao.module.trade.service.message.TradeMessageService;
@@ -105,6 +107,8 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
@Resource
private TradeMessageService tradeMessageService;
+ @Resource
+ private ProductSpuApi productSpuApi;
@Resource
private ProductSkuApi productSkuApi;
@Resource
@@ -240,8 +244,8 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
/**
* 订单创建前，执行前置逻辑
*
- * @param userId 用户编号
- * @param createReqVO 创建订单请求
+ * @param userId 用户编号
+ * @param createReqVO 创建订单请求
* @param calculateRespBO 订单价格计算结果
*/
private void beforeCreateTradeOrder(Long userId, AppTradeOrderCreateReqVO createReqVO,
@@ -260,12 +264,12 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
/**
* 订单创建后，执行后置逻辑
- *
+ * <p>
* 例如说：优惠劵的扣减、积分的扣减、支付单的创建等等
*
* @param userId 用户编号
* @param createReqVO 创建订单请求
- * @param order 交易订单
+ * @param order 交易订单
* @param calculateRespBO 订单价格计算结果
*/
private void afterCreateTradeOrder(Long userId, AppTradeOrderCreateReqVO createReqVO,
@@ -283,12 +287,9 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
.setOrderId(order.getId()));
}
- // 3. 扣减积分
+ // 3. 扣减积分（抵扣）
// 不在前置扣减的原因，是因为积分扣减时，需要记录关联业务
- if (order.getUsePoint() != null && order.getUsePoint() > 0) {
- memberPointApi.reducePoint(userId, calculateRespBO.getUsePoint(),
- MemberPointBizTypeEnum.ORDER_USE.getType(), String.valueOf(order.getId()));
- }
+ reduceUserPoint(order.getUserId(), order.getUsePoint(), MemberPointBizTypeEnum.ORDER_USE, order.getId());
// 4. 删除购物车商品
Set<Long> cartIds = convertSet(createReqVO.getItems(), AppTradeOrderSettlementReqVO.Item::getCartId);
@@ -299,6 +300,9 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
// 5. 生成预支付
createPayOrder(order, orderItems, calculateRespBO);
+ // 6. 插入订单日志
+ TradeOrderLogUtils.setOrderInfo(order.getId(), null, order.getStatus());
+
// TODO @LeeYan9: 是可以思考下, 订单的营销优惠记录, 应该记录在哪里, 微信讨论起来!
}
@@ -342,8 +346,8 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
// TODO 芋艿：OrderLog
- // 增加用户积分
- getSelf().addUserPointAsync(order.getUserId(), order.getPayPrice(), order.getId());
+ // 增加用户积分（赠送）
+ addUserPoint(order.getUserId(), order.getGivePoint(), MemberPointBizTypeEnum.ORDER_REWARD, order.getId());
// 增加用户经验
getSelf().addUserExperienceAsync(order.getUserId(), order.getPayPrice(), order.getId());
// 增加用户佣金
@@ -482,6 +486,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
@Override
@Transactional(rollbackFor = Exception.class)
+ @TradeOrderLog(operateType = TradeOrderOperateTypeEnum.MEMBER_RECEIVE)
public void receiveOrder(Long userId, Long id) {
// 校验并获得交易订单（可收货）
TradeOrderDO order = validateOrderReceivable(userId, id);
@@ -492,7 +497,6 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
if (updateCount == 0) {
throw exception(ORDER_RECEIVE_FAIL_STATUS_NOT_DELIVERED);
}
- // TODO 芋艿：OrderLog
// TODO 芋艿：lili 发送订单变化的消息
@@ -500,7 +504,8 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
// TODO 芋艿：销售佣金的记录；
- // TODO 芋艿：获得积分；
+ // 插入订单日志
+ TradeOrderLogUtils.setOrderInfo(order.getId(), order.getStatus(), TradeOrderStatusEnum.COMPLETED.getStatus());
}
@Override
@@ -541,41 +546,49 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
tradeOrderMapper.updateById(update);
// TODO @芋艿：改价时，赠送的积分，要不要做改动？？？
- // TODO @puhui999：应该是按照 payPrice 分配；并且要考虑取余问题；payPrice 也要考虑，item 里的
- // TODO：先按 adjustPrice 实现，没明白 payPrice 怎么搞哈哈哈
- // TODO @puhui999：就是对比新老 adjustPrice 的差值，然后计算补充的 adjustPrice 最终值；另外，可以不用区分 items.size 是不是 > 1 哈；应该是一致的逻辑；分摊的逻辑，有点类似 dividePrice 方法噢；
// 5、更新 TradeOrderItem
- if (items.size() > 1) {
- // TradeOrderItemDO 需要做 adjustPrice 的分摊
- int price = reqVO.getAdjustPrice() / items.size();
- int remainderPrice = reqVO.getAdjustPrice() % items.size();
- List<TradeOrderItemDO> orders = new ArrayList<>();
- for (int i = 0; i < items.size(); i++) {
- // 把平摊后剩余的金额加到第一个订单项
- if (remainderPrice != 0 && i == 0) {
- orders.add(convertOrderItemPrice(items.get(i), price + remainderPrice));
- }
- orders.add(convertOrderItemPrice(items.get(i), price));
- }
- tradeOrderItemMapper.updateBatch(orders);
- } else {
- TradeOrderItemDO orderItem = items.get(0);
- TradeOrderItemDO updateItem = convertOrderItemPrice(orderItem, reqVO.getAdjustPrice());
- tradeOrderItemMapper.updateById(updateItem);
+ // TradeOrderItemDO 需要做 adjustPrice 的分摊
+ List<Integer> dividePrices = dividePrice(items, orderPayPrice);
+ List<TradeOrderItemDO> updateItems = new ArrayList<>();
+ for (int i = 0; i < items.size(); i++) {
+ TradeOrderItemDO item = items.get(i);
+ Integer adjustPrice = item.getPrice() - dividePrices.get(i); // 计算调整的金额
+ updateItems.add(new TradeOrderItemDO().setId(item.getId()).setAdjustPrice(adjustPrice)
+ .setPayPrice(item.getPayPrice() - adjustPrice));
}
+ tradeOrderItemMapper.updateBatch(updateItems);
+
// 6、更新支付订单
payOrderApi.updatePayOrderPrice(order.getPayOrderId(), update.getPayPrice());
}
- private TradeOrderItemDO convertOrderItemPrice(TradeOrderItemDO orderItem, Integer price) {
- TradeOrderItemDO newOrderItem = new TradeOrderItemDO();
- newOrderItem.setId(orderItem.getId());
- newOrderItem.setAdjustPrice(price);
- int payPrice = orderItem.getAdjustPrice() != null ? (orderItem.getPayPrice() - orderItem.getAdjustPrice())
- + price : orderItem.getPayPrice() + price;
- newOrderItem.setPayPrice(payPrice);
- return newOrderItem;
+ /**
+ * 计算订单调价价格分摊
+ *
+ * @param items 订单项
+ * @param orderPayPrice 订单支付金额
+ * @return 分摊金额数组，和传入的 orderItems 一一对应
+ */
+ private List<Integer> dividePrice(List<TradeOrderItemDO> items, Integer orderPayPrice) {
+ Integer total = getSumValue(items, TradeOrderItemDO::getPrice, Integer::sum);
+ assert total != null;
+ // 遍历每一个，进行分摊
+ List<Integer> prices = new ArrayList<>(items.size());
+ int remainPrice = orderPayPrice;
+ for (int i = 0; i < items.size(); i++) {
+ TradeOrderItemDO orderItem = items.get(i);
+ int partPrice;
+ if (i < items.size() - 1) { // 减一的原因，是因为拆分时，如果按照比例，可能会出现.所以最后一个，使用反减
+ partPrice = (int) (orderPayPrice * (1.0D * orderItem.getPayPrice() / total));
+ remainPrice -= partPrice;
+ } else {
+ partPrice = remainPrice;
+ }
+ Assert.isTrue(partPrice >= 0, "分摊金额必须大于等于 0");
+ prices.add(partPrice);
+ }
+ return prices;
}
@Override
@@ -640,11 +653,12 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
return;
}
// 计算总的退款金额
- TradeOrderDO order = tradeOrderMapper.selectById(tradeOrderItemMapper.selectById(id).getOrderId());
+ TradeOrderItemDO orderItem = tradeOrderItemMapper.selectById(id);
+ TradeOrderDO order = tradeOrderMapper.selectById(orderItem.getOrderId());
Integer orderRefundPrice = order.getRefundPrice() + refundPrice;
if (isAllOrderItemAfterSaleSuccess(order.getId())) { // 如果都售后成功，则需要取消订单
tradeOrderMapper.updateById(new TradeOrderDO().setId(order.getId())
- .setRefundStatus(TradeOrderRefundStatusEnum.ALL.getStatus()).setRefundPrice(orderRefundPrice)
+ .setRefundStatus(TradeOrderRefundStatusEnum.ALL.getStatus()).setRefundPrice(orderRefundPrice).setRefundPoint(order.getRefundPoint() + orderItem.getUsePoint())
.setCancelType(TradeOrderCancelTypeEnum.AFTER_SALE_CLOSE.getType()).setCancelTime(LocalDateTime.now()));
// TODO 芋艿：记录订单日志
@@ -655,16 +669,22 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
.setRefundStatus(TradeOrderRefundStatusEnum.PART.getStatus()).setRefundPrice(orderRefundPrice));
}
- // 扣减用户积分
- getSelf().reduceUserPointAsync(order.getUserId(), orderRefundPrice, afterSaleId);
- // 扣减用户经验
- getSelf().reduceUserExperienceAsync(order.getUserId(), orderRefundPrice, afterSaleId);
- // 更新分佣记录为已失效
- getSelf().cancelBrokerageAsync(order.getUserId(), id);
+ // 售后成功后，执行数据回滚逻辑
+ if (Objects.equals(newAfterSaleStatus, TradeOrderItemAfterSaleStatusEnum.SUCCESS.getStatus())) {
+ // 扣减用户积分（赠送的）
+ reduceUserPoint(order.getUserId(), orderItem.getGivePoint(), MemberPointBizTypeEnum.AFTER_SALE_DEDUCT_GIVE, afterSaleId);
+ // 增加用户积分（返还抵扣）
+ addUserPoint(order.getUserId(), orderItem.getUsePoint(), MemberPointBizTypeEnum.AFTER_SALE_REFUND_USED, afterSaleId);
+ // 扣减用户经验
+ getSelf().reduceUserExperienceAsync(order.getUserId(), orderRefundPrice, afterSaleId);
+ // 更新分佣记录为已失效
+ getSelf().cancelBrokerageAsync(order.getUserId(), id);
+ }
}
@Override
@Transactional(rollbackFor = Exception.class)
+ @TradeOrderLog(operateType = TradeOrderOperateTypeEnum.MEMBER_COMMENT)
public Long createOrderItemComment(Long userId, AppTradeOrderItemCommentCreateReqVO createReqVO) {
// 先通过订单项 ID，查询订单项是否存在
TradeOrderItemDO orderItem = tradeOrderItemMapper.selectByIdAndUserId(createReqVO.getOrderItemId(), userId);
@@ -692,24 +712,27 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
List<TradeOrderItemDO> orderItems = tradeOrderItemMapper.selectListByOrderId(order.getId());
if (!anyMatch(orderItems, item -> Objects.equals(item.getCommentStatus(), Boolean.FALSE))) {
tradeOrderMapper.updateById(new TradeOrderDO().setId(order.getId()).setCommentStatus(Boolean.TRUE));
- // TODO 待实现：已完成评价，要不要写一条订单日志？目前 crmeb 会写，有赞可以研究下
+ // 增加订单日志
+ TradeOrderLogUtils.setOrderInfo(order.getId(), order.getStatus(), order.getStatus());
}
return comment;
}
@Override
+ @Transactional(rollbackFor = Exception.class)
+ @TradeOrderLog(operateType = TradeOrderOperateTypeEnum.MEMBER_CANCEL)
public void cancelOrder(Long userId, Long id) {
- // 校验存在
+ // 1.1 校验存在
TradeOrderDO order = tradeOrderMapper.selectOrderByIdAndUserId(id, userId);
if (order == null) {
throw exception(ORDER_NOT_FOUND);
}
- // 校验状态
+ // 1.2 校验状态
if (ObjectUtil.notEqual(order.getStatus(), TradeOrderStatusEnum.UNPAID.getStatus())) {
throw exception(ORDER_CANCEL_FAIL_STATUS_NOT_UNPAID);
}
- // 1.更新 TradeOrderDO 状态为已取消
+ // 2. 更新 TradeOrderDO 状态为已取消
int updateCount = tradeOrderMapper.updateByIdAndStatus(id, order.getStatus(),
new TradeOrderDO().setStatus(TradeOrderStatusEnum.CANCELED.getStatus())
.setCancelTime(LocalDateTime.now())
@@ -718,22 +741,43 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
throw exception(ORDER_CANCEL_FAIL_STATUS_NOT_UNPAID);
}
- // TODO 活动相关库存回滚需要活动 id，活动 id 怎么获取？app 端能否传过来
+ // 3. TODO 活动相关库存回滚需要活动 id，活动 id 怎么获取？app 端能否传过来；回复：从订单里拿呀
tradeOrderHandlers.forEach(handler -> handler.rollback());
- // 2.回滚库存
+ // 4. 回滚库存
List<TradeOrderItemDO> orderItems = tradeOrderItemMapper.selectListByOrderId(id);
productSkuApi.updateSkuStock(TradeOrderConvert.INSTANCE.convert(orderItems));
- // 3.回滚优惠券
- couponApi.returnUsedCoupon(order.getCouponId());
+ // 5. 回滚优惠券
+ if (order.getCouponId() > 0) {
+ couponApi.returnUsedCoupon(order.getCouponId());
+ }
- // 4.回滚积分：积分是支付成功后才增加的吧？ 回复：每个项目不同，目前看下来，确认收货貌似更合适，我再看看其它项目的业务选择；
- // TODO @疯狂：有赞是可配置（支付 or 确认收货），我们按照支付好列；然后这里的退积分，指的是下单时的积分抵扣。
+ // 6. 回滚积分（抵扣的）
+ addUserPoint(order.getUserId(), order.getUsePoint(), MemberPointBizTypeEnum.ORDER_CANCEL, order.getId());
- // TODO 芋艿：OrderLog
+ // 7. 增加订单日志
+ TradeOrderLogUtils.setOrderInfo(order.getId(), order.getStatus(), TradeOrderStatusEnum.CANCELED.getStatus());
+ }
- // TODO 芋艿：lili 发送订单变化的消息
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ @TradeOrderLog(operateType = TradeOrderOperateTypeEnum.MEMBER_DELETE)
+ public void deleteOrder(Long userId, Long id) {
+ // 1.1 校验存在
+ TradeOrderDO order = tradeOrderMapper.selectOrderByIdAndUserId(id, userId);
+ if (order == null) {
+ throw exception(ORDER_NOT_FOUND);
+ }
+ // 1.2 校验状态
+ if (ObjectUtil.notEqual(order.getStatus(), TradeOrderStatusEnum.CANCELED.getStatus())) {
+ throw exception(ORDER_DELETE_FAIL_STATUS_NOT_CANCEL);
+ }
+ // 2. 删除订单
+ tradeOrderMapper.deleteById(id);
+
+ // 3. 记录日志
+ TradeOrderLogUtils.setOrderInfo(order.getId(), order.getStatus(), order.getStatus());
}
/**
@@ -760,29 +804,54 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
memberLevelApi.addExperience(userId, -refundPrice, bizType, String.valueOf(afterSaleId));
}
- @Async
- protected void addUserPointAsync(Long userId, Integer payPrice, Long orderId) {
- // TODO @疯狂：具体多少积分，需要分成 2 不分：1. 支付金额；2. 商品金额
- int bizType = MemberPointBizTypeEnum.ORDER_REWARD.getType();
- memberPointApi.addPoint(userId, payPrice, bizType, String.valueOf(orderId));
+ /**
+ * 添加用户积分
+ * <p>
+ * 目前是支付成功后，就会创建积分记录。
+ * <p>
+ * 业内还有两种做法，可以根据自己的业务调整：
+ * 1. 确认收货后，才创建积分记录
+ * 2. 支付 or 下单成功时，创建积分记录（冻结），确认收货解冻或者 n 天后解冻
+ *
+ * @param userId 用户编号
+ * @param point 增加积分数量
+ * @param bizType 业务编号
+ * @param bizId 业务编号
+ */
+ protected void addUserPoint(Long userId, Integer point, MemberPointBizTypeEnum bizType, Long bizId) {
+ if (point != null && point > 0) {
+ memberPointApi.addPoint(userId, point, bizType.getType(), String.valueOf(bizId));
+ }
}
- @Async
- protected void reduceUserPointAsync(Long userId, Integer refundPrice, Long afterSaleId) {
- // TODO @疯狂：退款时，按照金额比例，退还积分；https://help.youzan.com/displaylist/detail_4_4-1-49185
- int bizType = MemberPointBizTypeEnum.ORDER_CANCEL.getType();
- memberPointApi.addPoint(userId, -refundPrice, bizType, String.valueOf(afterSaleId));
+ protected void reduceUserPoint(Long userId, Integer point, MemberPointBizTypeEnum bizType, Long bizId) {
+ if (point != null && point > 0) {
+ memberPointApi.reducePoint(userId, point, bizType.getType(), String.valueOf(bizId));
+ }
}
+ /**
+ * 创建分销记录
+ *
+ * 目前是支付成功后，就会创建分销记录。
+ *
+ * 业内还有两种做法，可以根据自己的业务调整：
+ * 1. 确认收货后，才创建分销记录
+ * 2. 支付 or 下单成功时，创建分销记录（冻结），确认收货解冻或者 n 天后解冻
+ *
+ * @param userId 用户编号
+ * @param orderId 订单编号
+ */
@Async
protected void addBrokerageAsync(Long userId, Long orderId) {
MemberUserRespDTO user = memberUserApi.getUser(userId);
Assert.notNull(user);
-
+ // 每一个订单项，都会去生成分销记录
List<TradeOrderItemDO> orderItems = tradeOrderItemMapper.selectListByOrderId(orderId);
- List<BrokerageAddReqBO> list = convertList(orderItems,
- item -> TradeOrderConvert.INSTANCE.convert(user, item, productSkuApi.getSku(item.getSkuId())));
- brokerageRecordService.addBrokerage(userId, BrokerageRecordBizTypeEnum.ORDER, list);
+ List<BrokerageAddReqBO> addList = convertList(orderItems,
+ item -> TradeOrderConvert.INSTANCE.convert(user, item,
+ productSpuApi.getSpu(item.getSpuId()), productSkuApi.getSku(item.getSkuId())));
+ brokerageRecordService.addBrokerage(userId, BrokerageRecordBizTypeEnum.ORDER, addList);
}
@Async
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/bo/TradeBeforeOrderCreateReqBO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/bo/TradeBeforeOrderCreateReqBO.java
index 077b5a5ef..261683d3d 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/bo/TradeBeforeOrderCreateReqBO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/bo/TradeBeforeOrderCreateReqBO.java
@@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.trade.service.order.bo;
+import cn.iocoder.yudao.module.trade.enums.order.TradeOrderTypeEnum;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -14,36 +15,73 @@ import javax.validation.constraints.NotNull;
@Data
public class TradeBeforeOrderCreateReqBO {
- // TODO @puhui999：注释也写下哈；bo 还是写注释噢
-
+ /**
+ * 订单类型
+ *
+ * 枚举 {@link TradeOrderTypeEnum}
+ */
@NotNull(message = "订单类型不能为空")
private Integer orderType;
+ /**
+ * 用户编号
+ *
+ * 关联 MemberUserDO 的 id 编号
+ */
+ @NotNull(message = "用户编号不能为空")
+ private Long userId;
+
// ========== 秒杀活动相关字段 ==========
+ /**
+ *
+ */
@Schema(description = "秒杀活动编号", example = "1024")
private Long seckillActivityId;
// ========== 拼团活动相关字段 ==========
+ /**
+ * 拼团活动编号
+ */
@Schema(description = "拼团活动编号", example = "1024")
private Long combinationActivityId;
+ /**
+ * 拼团团长编号
+ */
@Schema(description = "拼团团长编号", example = "2048")
private Long combinationHeadId;
+ // ========== 砍价活动相关字段 ==========
+
+ /**
+ * 砍价活动编号
+ */
@Schema(description = "砍价活动编号", example = "123")
private Long bargainActivityId;
+ // ========== 活动购买商品相关字段 ==========
+
+ /**
+ * 商品 SPU 编号
+ *
+ * 关联 ProductSkuDO 的 spuId 编号
+ */
@NotNull(message = "SPU 编号不能为空")
private Long spuId;
+ /**
+ * 商品 SKU 编号
+ *
+ * 关联 ProductSkuDO 的 id 编号
+ */
@NotNull(message = "SKU 编号活动商品不能为空")
private Long skuId;
- @NotNull(message = "用户编号不能为空")
- private Long userId;
-
+ /**
+ * 购买的商品数量
+ */
@NotNull(message = "购买数量不能为空")
private Integer count;
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeBargainHandler.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeBargainHandler.java
index 72def213d..18a276fde 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeBargainHandler.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeBargainHandler.java
@@ -20,14 +20,17 @@ public class TradeBargainHandler implements TradeOrderHandler {
@Resource
private BargainActivityApi bargainActivityApi;
+ // TODO @puhui999：先临时写在这里；在价格计算时，如果是秒杀商品，需要校验如下条件：
+ // 1. 商品存在、库存充足、单次限购；
+ // 2. 活动进行中、时间段符合
+
@Override
public void beforeOrderCreate(TradeBeforeOrderCreateReqBO reqBO) {
// 如果是砍价订单
if (ObjectUtil.notEqual(TradeOrderTypeEnum.BARGAIN.getType(), reqBO.getOrderType())) {
return;
}
-
- // 额外扣减砍价的库存
+ // 扣减砍价活动的库存
bargainActivityApi.updateBargainActivityStock(reqBO.getBargainActivityId(), reqBO.getCount());
}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeOrderHandler.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeOrderHandler.java
index b747e35d4..47426dd9b 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeOrderHandler.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeOrderHandler.java
@@ -24,9 +24,12 @@ public interface TradeOrderHandler {
*/
void afterOrderCreate(TradeAfterOrderCreateReqBO reqBO);
+ // TODO @puhui999：这个搞成订单取消
/**
* 回滚
*/
void rollback();
+ // TODO @puhui999：再搞个订单项取消哈
+
}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeSeckillHandler.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeSeckillHandler.java
index ce1dfdb05..652717b77 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeSeckillHandler.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeSeckillHandler.java
@@ -20,13 +20,17 @@ public class TradeSeckillHandler implements TradeOrderHandler {
@Resource
private SeckillActivityApi seckillActivityApi;
+ // TODO @puhui999：先临时写在这里；在价格计算时，如果是秒杀商品，需要校验如下条件：
+ // 1. 商品存在、库存充足、单次限购；
+ // 2. 活动进行中、时间段符合
+
@Override
public void beforeOrderCreate(TradeBeforeOrderCreateReqBO reqBO) {
// 如果是秒杀订单：额外扣减秒杀的库存；
if (ObjectUtil.notEqual(TradeOrderTypeEnum.SECKILL.getType(), reqBO.getOrderType())) {
return;
}
-
+ // 扣减秒杀活动的库存
seckillActivityApi.updateSeckillStock(reqBO.getSeckillActivityId(), reqBO.getSkuId(), reqBO.getCount());
}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/TradePriceServiceImpl.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/TradePriceServiceImpl.java
index e211374bf..a6982c177 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/TradePriceServiceImpl.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/TradePriceServiceImpl.java
@@ -41,7 +41,6 @@ public class TradePriceServiceImpl implements TradePriceService {
@Resource
private List<TradePriceCalculator> priceCalculators;
- // TODO @疯狂：需要搞个 TradePriceCalculator，计算赠送积分；
@Override
public TradePriceCalculateRespBO calculatePrice(TradePriceCalculateReqBO calculateReqBO) {
// 1.1 获得商品 SKU 数组
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateReqBO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateReqBO.java
index 67019a49a..a908a93b9 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateReqBO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateReqBO.java
@@ -29,7 +29,7 @@ public class TradePriceCalculateReqBO {
* 对应 CouponDO 的 id 编号
*/
private Long couponId;
- // TODO @疯狂：需要增加一个 PriceCalculator 实现积分扣减的计算；写回到 TradePriceCalculateRespBO 的 usePoint
+
/**
* 是否使用积分
*/
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateRespBO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateRespBO.java
index 1171cd8f2..af73332de 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateRespBO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateRespBO.java
@@ -53,6 +53,11 @@ public class TradePriceCalculateRespBO {
*/
private Integer usePoint;
+ /**
+ * 使用的积分
+ */
+ private Integer givePoint;
+
/**
* 订单价格
*/
@@ -89,6 +94,10 @@ public class TradePriceCalculateRespBO {
* 对应 taobao 的 trade.point_fee 字段
*/
private Integer pointPrice;
+ /**
+ * VIP 减免金额，单位：分
+ */
+ private Integer vipPrice;
/**
* 最终购买金额（总），单位：分
*
@@ -97,6 +106,7 @@ public class TradePriceCalculateRespBO {
* - {@link #pointPrice}
* - {@link #discountPrice}
* + {@link #deliveryPrice}
+ * - {@link #vipPrice}
*/
private Integer payPrice;
@@ -158,6 +168,14 @@ public class TradePriceCalculateRespBO {
* 对应 taobao 的 trade.point_fee 字段
*/
private Integer pointPrice;
+ /**
+ * 使用的积分
+ */
+ private Integer usePoint;
+ /**
+ * VIP 减免金额，单位：分
+ */
+ private Integer vipPrice;
/**
* 应付金额（总），单位：分
*
@@ -166,6 +184,7 @@ public class TradePriceCalculateRespBO {
* - {@link #pointPrice}
* - {@link #discountPrice}
* + {@link #deliveryPrice}
+ * - {@link #vipPrice}
*/
private Integer payPrice;
@@ -205,6 +224,11 @@ public class TradePriceCalculateRespBO {
*/
private List<ProductPropertyValueDetailRespDTO> properties;
+ /**
+ * 使用的积分
+ */
+ private Integer givePoint;
+
}
/**
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeCouponPriceCalculator.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeCouponPriceCalculator.java
index 68955ce51..b871186bd 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeCouponPriceCalculator.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeCouponPriceCalculator.java
@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.trade.service.price.calculator;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.module.promotion.api.coupon.CouponApi;
import cn.iocoder.yudao.module.promotion.api.coupon.dto.CouponRespDTO;
@@ -9,6 +10,7 @@ import cn.iocoder.yudao.module.promotion.api.coupon.dto.CouponValidReqDTO;
import cn.iocoder.yudao.module.promotion.enums.common.PromotionDiscountTypeEnum;
import cn.iocoder.yudao.module.promotion.enums.common.PromotionProductScopeEnum;
import cn.iocoder.yudao.module.promotion.enums.common.PromotionTypeEnum;
+import cn.iocoder.yudao.module.trade.enums.order.TradeOrderTypeEnum;
import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateReqBO;
import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateRespBO;
import org.springframework.core.annotation.Order;
@@ -22,6 +24,7 @@ import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionU
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.filterList;
import static cn.iocoder.yudao.module.promotion.enums.ErrorCodeConstants.COUPON_NO_MATCH_MIN_PRICE;
import static cn.iocoder.yudao.module.promotion.enums.ErrorCodeConstants.COUPON_NO_MATCH_SPU;
+import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.PRICE_CALCULATE_COUPON_NOT_MATCH_NORMAL_ORDER;
/**
* 优惠劵的 {@link TradePriceCalculator} 实现类
@@ -44,6 +47,10 @@ public class TradeCouponPriceCalculator implements TradePriceCalculator {
CouponRespDTO coupon = couponApi.validateCoupon(new CouponValidReqDTO()
.setId(param.getCouponId()).setUserId(param.getUserId()));
Assert.notNull(coupon, "校验通过的优惠劵({})，不能为空", param.getCouponId());
+ // 1.2 只有【普通】订单，才允许使用优惠劵
+ if (ObjectUtil.notEqual(result.getType(), TradeOrderTypeEnum.NORMAL.getType())) {
+ throw exception(PRICE_CALCULATE_COUPON_NOT_MATCH_NORMAL_ORDER);
+ }
// 2.1 获得匹配的商品 SKU 数组
List<TradePriceCalculateRespBO.OrderItem> orderItems = filterMatchCouponOrderItems(result, coupon);
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDeliveryPriceCalculator.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDeliveryPriceCalculator.java
index 7a4669801..01796ad0e 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDeliveryPriceCalculator.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDeliveryPriceCalculator.java
@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.trade.service.price.calculator;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
import cn.iocoder.yudao.module.member.api.address.AddressApi;
import cn.iocoder.yudao.module.member.api.address.dto.AddressRespDTO;
@@ -55,15 +56,16 @@ public class TradeDeliveryPriceCalculator implements TradePriceCalculator {
return;
}
if (DeliveryTypeEnum.PICK_UP.getType().equals(param.getDeliveryType())) {
- calculateByPickUp(param, result);
+ calculateByPickUp(param);
} else if (DeliveryTypeEnum.EXPRESS.getType().equals(param.getDeliveryType())) {
calculateExpress(param, result);
}
}
- private void calculateByPickUp(TradePriceCalculateReqBO param, TradePriceCalculateRespBO result) {
+ private void calculateByPickUp(TradePriceCalculateReqBO param) {
if (param.getPickUpStoreId() == null) {
- throw exception(PRICE_CALCULATE_DELIVERY_PRICE_PICK_UP_STORE_IS_EMPTY);
+ // 价格计算时，如果为空就不算~最终下单，会校验该字段不允许空
+ return;
}
DeliveryPickUpStoreDO pickUpStore = deliveryPickUpStoreService.getDeliveryPickUpStore(param.getPickUpStoreId());
if (pickUpStore == null || CommonStatusEnum.DISABLE.getStatus().equals(pickUpStore.getStatus())) {
@@ -76,18 +78,19 @@ public class TradeDeliveryPriceCalculator implements TradePriceCalculator {
private void calculateExpress(TradePriceCalculateReqBO param, TradePriceCalculateRespBO result) {
// 0. 得到收件地址区域
if (param.getAddressId() == null) {
- throw exception(PRICE_CALCULATE_DELIVERY_PRICE_USER_ADDRESS_IS_EMPTY);
+ // 价格计算时，如果为空就不算~最终下单，会校验该字段不允许空
+ return;
}
AddressRespDTO address = addressApi.getAddress(param.getAddressId(), param.getUserId());
Assert.notNull(address, "收件人({})的地址，不能为空", param.getUserId());
// 情况一：全局包邮
- if (isGlobalExpressFree(param, result)) {
+ if (isGlobalExpressFree(result)) {
return;
}
- // 情况二：
- // 2.1 过滤出已选中的商品SKU
+ // 情况二：快递模版
+ // 2.1 过滤出已选中的商品 SKU
List<OrderItem> selectedItem = filterList(result.getItems(), OrderItem::getSelected);
Set<Long> deliveryTemplateIds = convertSet(selectedItem, OrderItem::getDeliveryTemplateId);
Map<Long, DeliveryExpressTemplateRespBO> expressTemplateMap =
@@ -103,11 +106,10 @@ public class TradeDeliveryPriceCalculator implements TradePriceCalculator {
/**
* 是否全局包邮
*
- * @param param 计算信息
* @param result 计算结果
* @return 是否包邮
*/
- private boolean isGlobalExpressFree(TradePriceCalculateReqBO param, TradePriceCalculateRespBO result) {
+ private boolean isGlobalExpressFree(TradePriceCalculateRespBO result) {
TradeConfigDO config = tradeConfigService.getTradeConfig();
return config != null
&& Boolean.TRUE.equals(config.getDeliveryExpressFreeEnabled()) // 开启包邮
@@ -118,9 +120,9 @@ public class TradeDeliveryPriceCalculator implements TradePriceCalculator {
Map<Long, DeliveryExpressTemplateRespBO> expressTemplateMap,
TradePriceCalculateRespBO result) {
// 按商品运费模板来计算商品的运费：相同的运费模板可能对应多条订单商品 SKU
- Map<Long, List<OrderItem>> tplIdItemMap = convertMultiMap(selectedSkus, OrderItem::getDeliveryTemplateId);
+ Map<Long, List<OrderItem>> template2ItemMap = convertMultiMap(selectedSkus, OrderItem::getDeliveryTemplateId);
// 依次计算快递运费
- for (Map.Entry<Long, List<OrderItem>> entry : tplIdItemMap.entrySet()) {
+ for (Map.Entry<Long, List<OrderItem>> entry : template2ItemMap.entrySet()) {
Long templateId = entry.getKey();
List<OrderItem> orderItems = entry.getValue();
DeliveryExpressTemplateRespBO templateBO = expressTemplateMap.get(templateId);
@@ -128,30 +130,12 @@ public class TradeDeliveryPriceCalculator implements TradePriceCalculator {
log.error("[calculateDeliveryPrice][不能计算快递运费，找不到 templateId({}) 对应的运费模板配置]", templateId);
continue;
}
- // 总件数, 总金额, 总重量， 总体积
- int totalCount = 0;
- int totalPrice = 0;
- double totalWeight = 0;
- double totalVolume = 0;
- for (OrderItem orderItem : orderItems) {
- totalCount += orderItem.getCount();
- totalPrice += orderItem.getPayPrice();
- if (orderItem.getWeight() != null) {
- totalWeight += totalWeight + orderItem.getWeight() * orderItem.getCount();
- }
- if (orderItem.getVolume() != null) {
- totalVolume += totalVolume + orderItem.getVolume() * orderItem.getCount();
- }
- }
- // 优先判断是否包邮. 如果包邮不计算快递运费
- if (isExpressFree(templateBO.getChargeMode(), totalCount, totalWeight,
- totalVolume, totalPrice, templateBO.getFree())) {
+ // 1. 优先判断是否包邮。如果包邮不计算快递运费
+ if (isExpressTemplateFree(orderItems, templateBO.getChargeMode(), templateBO.getFree())) {
continue;
}
- // 计算快递运费
- calculateExpressFeeByChargeMode(totalCount, totalWeight, totalVolume,
- templateBO.getChargeMode(), templateBO.getCharge(), orderItems);
-
+ // 2. 计算快递运费
+ calculateExpressFeeByChargeMode(orderItems, templateBO.getChargeMode(), templateBO.getCharge());
}
TradePriceCalculatorHelper.recountAllPrice(result);
}
@@ -159,73 +143,44 @@ public class TradeDeliveryPriceCalculator implements TradePriceCalculator {
/**
* 按配送方式来计算运费
*
- * @param totalCount 总件数
- * @param totalWeight 总重量
- * @param totalVolume 总体积
+ * @param orderItems SKU 商品项目
* @param chargeMode 配送计费方式
* @param templateCharge 快递运费配置
- * @param orderItems SKU 商品项目
*/
- private void calculateExpressFeeByChargeMode(double totalCount, double totalWeight, double totalVolume,
- int chargeMode, DeliveryExpressTemplateRespBO.Charge templateCharge,
- List<OrderItem> orderItems) {
+ private void calculateExpressFeeByChargeMode(List<OrderItem> orderItems, Integer chargeMode,
+ DeliveryExpressTemplateRespBO.Charge templateCharge) {
if (templateCharge == null) {
log.error("[calculateExpressFeeByChargeMode][计算快递运费时，找不到 SKU({}) 对应的运费模版]", orderItems);
return;
}
- DeliveryExpressChargeModeEnum chargeModeEnum = DeliveryExpressChargeModeEnum.valueOf(chargeMode);
- switch (chargeModeEnum) {
- case PIECE: {
- calculateExpressFee(totalCount, templateCharge, orderItems);
- break;
- }
- case WEIGHT: {
- calculateExpressFee(totalWeight, templateCharge, orderItems);
- break;
- }
- case VOLUME: {
- calculateExpressFee(totalVolume, templateCharge, orderItems);
- break;
- }
- }
- }
-
- /**
- * 计算 SKU 商品快递费用
- *
- * @param total 总件数/总重量/总体积
- * @param templateCharge 快递运费配置
- * @param orderItems SKU 商品项目
- */
- private void calculateExpressFee(double total, DeliveryExpressTemplateRespBO.Charge templateCharge, List<OrderItem> orderItems) {
+ double totalChargeValue = getTotalChargeValue(orderItems, chargeMode);
+ // 1. 计算 SKU 商品快递费用
int deliveryPrice;
- if (total <= templateCharge.getStartCount()) {
+ if (totalChargeValue <= templateCharge.getStartCount()) {
deliveryPrice = templateCharge.getStartPrice();
} else {
- double remainWeight = total - templateCharge.getStartCount();
+ double remainWeight = totalChargeValue - templateCharge.getStartCount();
// 剩余重量/ 续件 = 续件的次数. 向上取整
int extraNum = (int) Math.ceil(remainWeight / templateCharge.getExtraCount());
int extraPrice = templateCharge.getExtraPrice() * extraNum;
deliveryPrice = templateCharge.getStartPrice() + extraPrice;
}
- // 分摊快递费用到 SKU. 退费的时候，可能按照 SKU 考虑退费金额
- divideDeliveryPrice(deliveryPrice, orderItems);
- }
- /**
- * 快递运费分摊到每个 SKU 商品上
- *
- * @param deliveryPrice 快递运费
- * @param orderItems SKU 商品
- */
- private void divideDeliveryPrice(int deliveryPrice, List<OrderItem> orderItems) {
- // TODO @jason：分摊的话，是不是要按照比例呀？重量、价格、数量等等,
- // 按比例是不是有点复杂。后面看看是否需要；
- // TODO 可以看看别的项目怎么搞的哈。
- int dividePrice = deliveryPrice / orderItems.size();
- for (OrderItem item : orderItems) {
+ // 2. 分摊快递费用到 SKU. 退费的时候，可能按照 SKU 考虑退费金额
+ int remainPrice = deliveryPrice;
+ for (int i = 0; i < orderItems.size(); i++) {
+ TradePriceCalculateRespBO.OrderItem item = orderItems.get(i);
+ int partPrice;
+ double chargeValue = getChargeValue(item, chargeMode);
+ if (i < orderItems.size() - 1) { // 减一的原因，是因为拆分时，如果按照比例，可能会出现.所以最后一个，使用反减
+ partPrice = (int) (deliveryPrice * (chargeValue / totalChargeValue));
+ remainPrice -= partPrice;
+ } else {
+ partPrice = remainPrice;
+ }
+ Assert.isTrue(partPrice >= 0, "分摊金额必须大于等于 0");
// 更新快递运费
- item.setDeliveryPrice(dividePrice);
+ item.setDeliveryPrice(partPrice);
TradePriceCalculatorHelper.recountPayPrice(item);
}
}
@@ -234,42 +189,38 @@ public class TradeDeliveryPriceCalculator implements TradePriceCalculator {
* 检查是否包邮
*
* @param chargeMode 配送计费方式
- * @param totalCount 总件数
- * @param totalWeight 总重量
- * @param totalVolume 总体积
- * @param totalPrice 总金额
* @param templateFree 包邮配置
*/
- private boolean isExpressFree(Integer chargeMode, int totalCount, double totalWeight,
- double totalVolume, int totalPrice, DeliveryExpressTemplateRespBO.Free templateFree) {
+ private boolean isExpressTemplateFree(List<OrderItem> orderItems, Integer chargeMode,
+ DeliveryExpressTemplateRespBO.Free templateFree) {
if (templateFree == null) {
return false;
}
+ double totalChargeValue = getTotalChargeValue(orderItems, chargeMode);
+ double totalPrice = TradePriceCalculatorHelper.calculateTotalPayPrice(orderItems);
+ return totalChargeValue >= templateFree.getFreeCount() && totalPrice >= templateFree.getFreePrice();
+ }
+
+ private double getTotalChargeValue(List<OrderItem> orderItems, Integer chargeMode) {
+ double total = 0;
+ for (OrderItem orderItem : orderItems) {
+ total += getChargeValue(orderItem, chargeMode);
+ }
+ return total;
+ }
+
+ private double getChargeValue(OrderItem orderItem, Integer chargeMode) {
DeliveryExpressChargeModeEnum chargeModeEnum = DeliveryExpressChargeModeEnum.valueOf(chargeMode);
switch (chargeModeEnum) {
- case PIECE:
- // 两个条件都满足才包邮
- if (totalCount >= templateFree.getFreeCount() && totalPrice >= templateFree.getFreePrice()) {
- return true;
- }
- break;
+ case COUNT:
+ return orderItem.getCount();
case WEIGHT:
- // freeCount 是不是应该是 double ??
- // TODO @jason：要不配置的时候，把它的单位和商品对齐？到底是 kg、还是斤
- // TODO @芋艿 目前 包邮 件数/重量/体积 都用的是这个字段
- // TODO @jason：那要不快递模版也改成 kg？这样是不是就不用 double ？
- if (totalWeight >= templateFree.getFreeCount()
- && totalPrice >= templateFree.getFreePrice()) {
- return true;
- }
- break;
+ return orderItem.getWeight() != null ? orderItem.getWeight() * orderItem.getCount() : 0;
case VOLUME:
- if (totalVolume >= templateFree.getFreeCount()
- && totalPrice >= templateFree.getFreePrice()) {
- return true;
- }
- break;
+ return orderItem.getVolume() != null ? orderItem.getVolume() * orderItem.getCount() : 0;
+ default:
+ throw new IllegalArgumentException(StrUtil.format("未知的计费模式({})", chargeMode));
}
- return false;
}
+
}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDiscountActivityPriceCalculator.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDiscountActivityPriceCalculator.java
index fe465f37d..a42780625 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDiscountActivityPriceCalculator.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDiscountActivityPriceCalculator.java
@@ -1,11 +1,13 @@
package cn.iocoder.yudao.module.trade.service.price.calculator;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.module.promotion.api.discount.DiscountActivityApi;
import cn.iocoder.yudao.module.promotion.api.discount.dto.DiscountProductRespDTO;
import cn.iocoder.yudao.module.promotion.enums.common.PromotionDiscountTypeEnum;
import cn.iocoder.yudao.module.promotion.enums.common.PromotionTypeEnum;
+import cn.iocoder.yudao.module.trade.enums.order.TradeOrderTypeEnum;
import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateReqBO;
import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateRespBO;
import org.springframework.core.annotation.Order;
@@ -33,6 +35,10 @@ public class TradeDiscountActivityPriceCalculator implements TradePriceCalculato
@Override
public void calculate(TradePriceCalculateReqBO param, TradePriceCalculateRespBO result) {
+ // 0. 只有【普通】订单，才计算该优惠
+ if (ObjectUtil.notEqual(result.getType(), TradeOrderTypeEnum.NORMAL.getType())) {
+ return;
+ }
// 获得 SKU 对应的限时折扣活动
List<DiscountProductRespDTO> discountProducts = discountActivityApi.getMatchDiscountProductList(
convertSet(result.getItems(), TradePriceCalculateRespBO.OrderItem::getSkuId));
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeMemberLevelPriceCalculator.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeMemberLevelPriceCalculator.java
new file mode 100644
index 000000000..8aee001d5
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeMemberLevelPriceCalculator.java
@@ -0,0 +1,88 @@
+package cn.iocoder.yudao.module.trade.service.price.calculator;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.iocoder.yudao.module.member.api.level.MemberLevelApi;
+import cn.iocoder.yudao.module.member.api.level.dto.MemberLevelRespDTO;
+import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
+import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
+import cn.iocoder.yudao.module.promotion.enums.common.PromotionTypeEnum;
+import cn.iocoder.yudao.module.trade.enums.order.TradeOrderTypeEnum;
+import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateReqBO;
+import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateRespBO;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+import static cn.iocoder.yudao.module.trade.service.price.calculator.TradePriceCalculatorHelper.formatPrice;
+
+/**
+ * 会员 VIP 折扣的 {@link TradePriceCalculator} 实现类
+ *
+ * @author 芋道源码
+ */
+@Component
+@Order(TradePriceCalculator.ORDER_MEMBER_LEVEL)
+public class TradeMemberLevelPriceCalculator implements TradePriceCalculator {
+
+ @Resource
+ private MemberLevelApi memberLevelApi;
+ @Resource
+ private MemberUserApi memberUserApi;
+
+ @Override
+ public void calculate(TradePriceCalculateReqBO param, TradePriceCalculateRespBO result) {
+ // 0. 只有【普通】订单，才计算该优惠
+ if (ObjectUtil.notEqual(result.getType(), TradeOrderTypeEnum.NORMAL.getType())) {
+ return;
+ }
+ // 1. 获得用户的会员等级
+ MemberUserRespDTO user = memberUserApi.getUser(param.getUserId());
+ if (user.getLevelId() == null || user.getLevelId() <= 0) {
+ return;
+ }
+ MemberLevelRespDTO level = memberLevelApi.getMemberLevel(user.getLevelId());
+ if (level == null || level.getDiscountPercent() == null) {
+ return;
+ }
+
+ // 2. 计算每个 SKU 的优惠金额
+ result.getItems().forEach(orderItem -> {
+ // 2.1 计算优惠金额
+ Integer vipPrice = calculateVipPrice(orderItem.getPayPrice(), level.getDiscountPercent());
+ if (vipPrice <= 0) {
+ return;
+ }
+
+ // 2.2 记录优惠明细
+ if (orderItem.getSelected()) {
+ // 注意，只有在选中的情况下，才会记录到优惠明细。否则仅仅是更新 SKU 优惠金额，用于展示
+ TradePriceCalculatorHelper.addPromotion(result, orderItem,
+ level.getId(), level.getName(), PromotionTypeEnum.MEMBER_LEVEL.getType(),
+ String.format("会员等级折扣：省 %s 元", formatPrice(vipPrice)),
+ vipPrice);
+ }
+
+ // 2.3 更新 SKU 的优惠金额
+ orderItem.setVipPrice(vipPrice);
+ TradePriceCalculatorHelper.recountPayPrice(orderItem);
+ });
+ TradePriceCalculatorHelper.recountAllPrice(result);
+ }
+
+ /**
+ * 计算会员 VIP 优惠价格
+ *
+ * @param price 原价
+ * @param discountPercent 折扣
+ * @return 优惠价格
+ */
+ public Integer calculateVipPrice(Integer price, Integer discountPercent) {
+ if (discountPercent == null) {
+ return 0;
+ }
+ Integer newPrice = price * discountPercent / 100;
+ return price - newPrice;
+ }
+
+}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradePointGiveCalculator.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradePointGiveCalculator.java
new file mode 100644
index 000000000..4fb2b2d7b
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradePointGiveCalculator.java
@@ -0,0 +1,62 @@
+package cn.iocoder.yudao.module.trade.service.price.calculator;
+
+import cn.hutool.core.util.BooleanUtil;
+import cn.iocoder.yudao.framework.common.util.number.MoneyUtils;
+import cn.iocoder.yudao.module.member.api.point.MemberPointApi;
+import cn.iocoder.yudao.module.member.api.point.dto.MemberPointConfigRespDTO;
+import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateReqBO;
+import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateRespBO;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Optional;
+
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.filterList;
+
+/**
+ * 赠送积分的 {@link TradePriceCalculator} 实现类
+ *
+ * @author owen
+ */
+@Component
+@Order(TradePriceCalculator.ORDER_POINT_GIVE)
+@Slf4j
+public class TradePointGiveCalculator implements TradePriceCalculator {
+ @Resource
+ private MemberPointApi memberPointApi;
+
+ @Override
+ public void calculate(TradePriceCalculateReqBO param, TradePriceCalculateRespBO result) {
+ // 1.1 校验积分功能是否开启
+ int givePointPerYuan = Optional.ofNullable(memberPointApi.getConfig())
+ .filter(config -> BooleanUtil.isTrue(config.getTradeDeductEnable()))
+ .map(MemberPointConfigRespDTO::getTradeGivePoint)
+ .orElse(0);
+ if (givePointPerYuan <= 0) {
+ return;
+ }
+ // 1.2 校验支付金额
+ if (result.getPrice().getPayPrice() <= 0) {
+ return;
+ }
+
+ // 2.1 计算赠送积分
+ int givePoint = MoneyUtils.calculateRatePriceFloor(result.getPrice().getPayPrice(), (double) givePointPerYuan);
+ // 2.2 计算分摊的赠送积分
+ List<TradePriceCalculateRespBO.OrderItem> orderItems = filterList(result.getItems(), TradePriceCalculateRespBO.OrderItem::getSelected);
+ List<Integer> dividePoints = TradePriceCalculatorHelper.dividePrice(orderItems, givePoint);
+
+ // 3.2 更新 SKU 赠送积分
+ for (int i = 0; i < orderItems.size(); i++) {
+ TradePriceCalculateRespBO.OrderItem orderItem = orderItems.get(i);
+ // 商品可能赠送了积分，所以这里要加上
+ orderItem.setGivePoint(orderItem.getGivePoint() + dividePoints.get(i));
+ TradePriceCalculatorHelper.recountPayPrice(orderItem);
+ }
+ // 3.3 更新订单赠送积分
+ TradePriceCalculatorHelper.recountAllGivePoint(result);
+ }
+}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradePointUsePriceCalculator.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradePointUsePriceCalculator.java
index 6bd479802..b2fd10572 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradePointUsePriceCalculator.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradePointUsePriceCalculator.java
@@ -1,11 +1,25 @@
package cn.iocoder.yudao.module.trade.service.price.calculator;
+import cn.hutool.core.util.BooleanUtil;
+import cn.hutool.core.util.NumberUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.module.member.api.point.MemberPointApi;
+import cn.iocoder.yudao.module.member.api.point.dto.MemberPointConfigRespDTO;
+import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
+import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
+import cn.iocoder.yudao.module.promotion.enums.common.PromotionTypeEnum;
import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateReqBO;
import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateRespBO;
import lombok.extern.slf4j.Slf4j;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
+import javax.annotation.Resource;
+import java.math.RoundingMode;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.filterList;
+
/**
* 使用积分的 {@link TradePriceCalculator} 实现类
*
@@ -15,15 +29,81 @@ import org.springframework.stereotype.Component;
@Order(TradePriceCalculator.ORDER_POINT_USE)
@Slf4j
public class TradePointUsePriceCalculator implements TradePriceCalculator {
+ @Resource
+ private MemberPointApi memberPointApi;
+ @Resource
+ private MemberUserApi memberUserApi;
@Override
public void calculate(TradePriceCalculateReqBO param, TradePriceCalculateRespBO result) {
- // TODO 疯狂：待实现，嘿嘿；
- if (param.getPointStatus()) {
- result.setUsePoint(10);
- } else {
+ // 1.1 校验是否使用积分
+ if (!BooleanUtil.isTrue(param.getPointStatus())) {
result.setUsePoint(0);
+ return;
}
+ // 1.2 校验积分抵扣是否开启
+ MemberPointConfigRespDTO config = memberPointApi.getConfig();
+ if (!checkDeductPointEnable(config)) {
+ return;
+ }
+ // 1.3 校验用户积分余额
+ MemberUserRespDTO user = memberUserApi.getUser(param.getUserId());
+ if (user.getPoint() == null || user.getPoint() < 0) {
+ return;
+ }
+
+ // 2.1 计算积分优惠金额
+ int pointPrice = calculatePointPrice(config, user.getPoint(), result);
+ // 2.1 计算分摊的积分、抵扣金额
+ List<TradePriceCalculateRespBO.OrderItem> orderItems = filterList(result.getItems(), TradePriceCalculateRespBO.OrderItem::getSelected);
+ List<Integer> dividePointPrices = TradePriceCalculatorHelper.dividePrice(orderItems, pointPrice);
+ List<Integer> divideUsePoints = TradePriceCalculatorHelper.dividePrice(orderItems, result.getUsePoint());
+
+ // 3.1 记录优惠明细
+ TradePriceCalculatorHelper.addPromotion(result, orderItems,
+ param.getUserId(), "积分抵扣", PromotionTypeEnum.POINT.getType(),
+ StrUtil.format("积分抵扣：省 {} 元", TradePriceCalculatorHelper.formatPrice(pointPrice)),
+ dividePointPrices);
+ // 3.2 更新 SKU 优惠金额
+ for (int i = 0; i < orderItems.size(); i++) {
+ TradePriceCalculateRespBO.OrderItem orderItem = orderItems.get(i);
+ orderItem.setPointPrice(dividePointPrices.get(i));
+ orderItem.setUsePoint(divideUsePoints.get(i));
+ TradePriceCalculatorHelper.recountPayPrice(orderItem);
+ }
+ TradePriceCalculatorHelper.recountAllPrice(result);
}
+ private boolean checkDeductPointEnable(MemberPointConfigRespDTO config) {
+ if (config == null) {
+ return false;
+ }
+ if (!BooleanUtil.isTrue(config.getTradeDeductEnable())) {
+ return false;
+ }
+
+ // 有没有配置：1 积分抵扣多少分
+ return config.getTradeDeductUnitPrice() != null && config.getTradeDeductUnitPrice() > 0;
+ }
+
+ private Integer calculatePointPrice(MemberPointConfigRespDTO config, Integer usePoint, TradePriceCalculateRespBO result) {
+ // 每个订单最多可以使用的积分数量
+ if (config.getTradeDeductMaxPrice() != null && config.getTradeDeductMaxPrice() > 0) {
+ usePoint = Math.min(usePoint, config.getTradeDeductMaxPrice());
+ }
+ // 积分优惠金额（分）
+ int pointPrice = usePoint * config.getTradeDeductUnitPrice();
+ // 0元购!!!：用户积分比较多时，积分可以抵扣的金额要大于支付金额， 这时需要根据支付金额反推使用多少积分
+ if (result.getPrice().getPayPrice() < pointPrice) {
+ pointPrice = result.getPrice().getPayPrice();
+ // 反推需要扣除的积分
+ usePoint = NumberUtil.toBigDecimal(pointPrice)
+ .divide(NumberUtil.toBigDecimal(config.getTradeDeductUnitPrice()), 0, RoundingMode.HALF_UP)
+ .intValue();
+ }
+ // 记录使用的积分
+ result.setUsePoint(usePoint);
+
+ return pointPrice;
+ }
}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradePriceCalculator.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradePriceCalculator.java
index cddc1ea21..620c3e13f 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradePriceCalculator.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradePriceCalculator.java
@@ -13,6 +13,7 @@ import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateRespBO;
*/
public interface TradePriceCalculator {
+ int ORDER_MEMBER_LEVEL = 5;
int ORDER_DISCOUNT_ACTIVITY = 10;
int ORDER_REWARD_ACTIVITY = 20;
int ORDER_COUPON = 30;
@@ -23,6 +24,10 @@ public interface TradePriceCalculator {
* 放在各种营销活动、优惠劵后面 TODO
*/
int ORDER_DELIVERY = 50;
+ /**
+ * 赠送积分，放最后
+ */
+ int ORDER_POINT_GIVE = 999;
void calculate(TradePriceCalculateReqBO param, TradePriceCalculateRespBO result);
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradePriceCalculatorHelper.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradePriceCalculatorHelper.java
index b8b9e0fb9..812ce5591 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradePriceCalculatorHelper.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradePriceCalculatorHelper.java
@@ -52,13 +52,14 @@ public class TradePriceCalculatorHelper {
.setCount(item.getCount()).setCartId(item.getCartId()).setSelected(item.getSelected());
// sku 价格
orderItem.setPrice(sku.getPrice()).setPayPrice(sku.getPrice() * item.getCount())
- .setDiscountPrice(0).setDeliveryPrice(0).setCouponPrice(0).setPointPrice(0);
+ .setDiscountPrice(0).setDeliveryPrice(0).setCouponPrice(0).setPointPrice(0).setVipPrice(0);
// sku 信息
orderItem.setPicUrl(sku.getPicUrl()).setProperties(sku.getProperties())
.setWeight(sku.getWeight()).setVolume(sku.getVolume());
// spu 信息
orderItem.setSpuName(spu.getName()).setCategoryId(spu.getCategoryId())
- .setDeliveryTemplateId(spu.getDeliveryTemplateId());
+ .setDeliveryTemplateId(spu.getDeliveryTemplateId())
+ .setGivePoint(spu.getGiveIntegral()).setUsePoint(0);
if (orderItem.getPicUrl() == null) {
orderItem.setPicUrl(spu.getPicUrl());
}
@@ -67,6 +68,7 @@ public class TradePriceCalculatorHelper {
// 创建它的 Price 属性
result.setPrice(new TradePriceCalculateRespBO.Price());
recountAllPrice(result);
+ recountAllGivePoint(result);
return result;
}
@@ -96,7 +98,7 @@ public class TradePriceCalculatorHelper {
// 先重置
TradePriceCalculateRespBO.Price price = result.getPrice();
price.setTotalPrice(0).setDiscountPrice(0).setDeliveryPrice(0)
- .setCouponPrice(0).setPointPrice(0).setPayPrice(0);
+ .setCouponPrice(0).setPointPrice(0).setVipPrice(0).setPayPrice(0);
// 再合计 item
result.getItems().forEach(item -> {
if (!item.getSelected()) {
@@ -107,21 +109,33 @@ public class TradePriceCalculatorHelper {
price.setDeliveryPrice(price.getDeliveryPrice() + item.getDeliveryPrice());
price.setCouponPrice(price.getCouponPrice() + item.getCouponPrice());
price.setPointPrice(price.getPointPrice() + item.getPointPrice());
+ price.setVipPrice(price.getVipPrice() + item.getVipPrice());
price.setPayPrice(price.getPayPrice() + item.getPayPrice());
});
}
+ /**
+ * 基于订单项，重新计算赠送积分
+ *
+ * @param result 计算结果
+ */
+ public static void recountAllGivePoint(TradePriceCalculateRespBO result) {
+ result.setGivePoint(getSumValue(result.getItems(), item -> item.getSelected() ? item.getGivePoint() : 0, Integer::sum));
+ }
+
/**
* 重新计算单个订单项的支付金额
*
* @param orderItem 订单项
*/
public static void recountPayPrice(TradePriceCalculateRespBO.OrderItem orderItem) {
- orderItem.setPayPrice(orderItem.getPrice()* orderItem.getCount()
+ orderItem.setPayPrice(orderItem.getPrice() * orderItem.getCount()
- orderItem.getDiscountPrice()
+ orderItem.getDeliveryPrice()
- orderItem.getCouponPrice()
- - orderItem.getPointPrice());
+ - orderItem.getPointPrice()
+ - orderItem.getVipPrice()
+ );
}
/**
@@ -145,6 +159,15 @@ public class TradePriceCalculatorHelper {
if (orderItem.getPointPrice() == null) {
orderItem.setPointPrice(0);
}
+ if (orderItem.getUsePoint() == null) {
+ orderItem.setUsePoint(0);
+ }
+ if (orderItem.getGivePoint() == null) {
+ orderItem.setGivePoint(0);
+ }
+ if (orderItem.getVipPrice() == null) {
+ orderItem.setVipPrice(0);
+ }
recountPayPrice(orderItem);
});
}
@@ -169,7 +192,7 @@ public class TradePriceCalculatorHelper {
*/
public static Integer calculateTotalCount(List<TradePriceCalculateRespBO.OrderItem> orderItems) {
return getSumValue(orderItems,
- orderItem -> orderItem.getSelected() ? orderItem.getCount() : 0, // 未选中的情况下，不计算数量
+ orderItem -> orderItem.getSelected() ? orderItem.getCount() : 0, // 未选中的情况下，不计算数量
Integer::sum);
}
@@ -177,7 +200,7 @@ public class TradePriceCalculatorHelper {
* 按照支付金额，返回每个订单项的分摊金额数组
*
* @param orderItems 订单项数组
- * @param price 金额
+ * @param price 金额
* @return 分摊金额数组，和传入的 orderItems 一一对应
*/
public static List<Integer> dividePrice(List<TradePriceCalculateRespBO.OrderItem> orderItems, Integer price) {
@@ -210,12 +233,12 @@ public class TradePriceCalculatorHelper {
/**
* 添加【匹配】单个 OrderItem 的营销明细
*
- * @param result 价格计算结果
+ * @param result 价格计算结果
* @param orderItem 单个订单商品 SKU
- * @param id 营销编号
- * @param name 营销名字
- * @param description 满足条件的提示
- * @param type 营销类型
+ * @param id 营销编号
+ * @param name 营销名字
+ * @param description 满足条件的提示
+ * @param type 营销类型
* @param discountPrice 单个订单商品 SKU 的优惠价格（总）
*/
public static void addPromotion(TradePriceCalculateRespBO result, TradePriceCalculateRespBO.OrderItem orderItem,
@@ -226,7 +249,7 @@ public class TradePriceCalculatorHelper {
/**
* 添加【匹配】多个 OrderItem 的营销明细
*
- * @param result 价格计算结果
+ * @param result 价格计算结果
* @param orderItems 多个订单商品 SKU
* @param id 营销编号
* @param name 营销名字
@@ -235,7 +258,7 @@ public class TradePriceCalculatorHelper {
* @param discountPrices 多个订单商品 SKU 的优惠价格（总），和 orderItems 一一对应
*/
public static void addPromotion(TradePriceCalculateRespBO result, List<TradePriceCalculateRespBO.OrderItem> orderItems,
- Long id, String name, Integer type, String description, List<Integer> discountPrices) {
+ Long id, String name, Integer type, String description, List<Integer> discountPrices) {
// 创建营销明细 Item
List<TradePriceCalculateRespBO.PromotionItem> promotionItems = new ArrayList<>(discountPrices.size());
for (int i = 0; i < orderItems.size(); i++) {
@@ -255,12 +278,12 @@ public class TradePriceCalculatorHelper {
/**
* 添加【不匹配】多个 OrderItem 的营销明细
*
- * @param result 价格计算结果
- * @param orderItems 多个订单商品 SKU
- * @param id 营销编号
- * @param name 营销名字
- * @param description 满足条件的提示
- * @param type 营销类型
+ * @param result 价格计算结果
+ * @param orderItems 多个订单商品 SKU
+ * @param id 营销编号
+ * @param name 营销名字
+ * @param description 满足条件的提示
+ * @param type 营销类型
*/
public static void addNotMatchPromotion(TradePriceCalculateRespBO result, List<TradePriceCalculateRespBO.OrderItem> orderItems,
Long id, String name, Integer type, String description) {
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeRewardActivityPriceCalculator.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeRewardActivityPriceCalculator.java
index f2cfe71cd..d9b44c2b6 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeRewardActivityPriceCalculator.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeRewardActivityPriceCalculator.java
@@ -1,11 +1,13 @@
package cn.iocoder.yudao.module.trade.service.price.calculator;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.module.promotion.api.reward.RewardActivityApi;
import cn.iocoder.yudao.module.promotion.api.reward.dto.RewardActivityMatchRespDTO;
import cn.iocoder.yudao.module.promotion.enums.common.PromotionConditionTypeEnum;
import cn.iocoder.yudao.module.promotion.enums.common.PromotionTypeEnum;
+import cn.iocoder.yudao.module.trade.enums.order.TradeOrderTypeEnum;
import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateReqBO;
import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateRespBO;
import org.springframework.core.annotation.Order;
@@ -32,6 +34,10 @@ public class TradeRewardActivityPriceCalculator implements TradePriceCalculator
@Override
public void calculate(TradePriceCalculateReqBO param, TradePriceCalculateRespBO result) {
+ // 0. 只有【普通】订单，才计算该优惠
+ if (ObjectUtil.notEqual(result.getType(), TradeOrderTypeEnum.NORMAL.getType())) {
+ return;
+ }
// 获得 SKU 对应的满减送活动
List<RewardActivityMatchRespDTO> rewardActivities = rewardActivityApi.getMatchRewardActivityList(
convertSet(result.getItems(), TradePriceCalculateRespBO.OrderItem::getSpuId));
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/resources/mapper/brokerage/BrokerageUserMapper.xml b/yudao-module-mall/yudao-module-trade-biz/src/main/resources/mapper/brokerage/BrokerageUserMapper.xml
new file mode 100644
index 000000000..b1a1ef8d6
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/resources/mapper/brokerage/BrokerageUserMapper.xml
@@ -0,0 +1,43 @@
+<?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="cn.iocoder.yudao.module.trade.dal.mysql.brokerage.BrokerageUserMapper">
+
+ <select id="selectSummaryPageByUserId"
+ resultType="cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.user.AppBrokerageUserChildSummaryRespVO">
+ SELECT bu.id, bu.bind_user_time AS brokerageTime, u.nickname, u.avatar,
+ (SELECT SUM(price) FROM trade_brokerage_record r
+ WHERE r.user_id = u.id AND biz_type = 1 AND r.status = 1 AND r.deleted = FALSE) AS brokeragePrice,
+ (SELECT COUNT(1) FROM trade_brokerage_record r
+ WHERE r.user_id = u.id AND biz_type = 1 AND r.status = 1 AND r.deleted = FALSE) AS brokerageOrderCount,
+ (SELECT COUNT(1) FROM trade_brokerage_user c
+ WHERE c.bind_user_id = u.id AND c.deleted = FALSE) AS brokerageUserCount
+ FROM member_user AS u
+ JOIN trade_brokerage_user AS bu ON bu.id = u.id
+ <where>
+ <if test="param.nickname != null and param.nickname != ''">
+ AND u.nickname LIKE concat('', #{param.nickname}, '')
+ </if>
+ <if test="param.level == 1">
+ AND bu.bind_user_id = #{userId}
+ </if>
+ <if test="param.level == 2">
+ AND bu.bind_user_id IN (SELECT id FROM trade_brokerage_user c WHERE c.bind_user_id = #{userId})
+ </if>
+ </where>
+ <choose>
+ <when test="param.sortingField.field == 'userCount'">
+ ORDER BY brokerageUserCount ${param.sortingField.order}
+ </when>
+ <when test="param.sortingField.field == 'orderCount'">
+ ORDER BY brokerageOrderCount ${param.sortingField.order}
+ </when>
+ <when test="param.sortingField.field == 'price'">
+ ORDER BY brokeragePrice ${param.sortingField.order}
+ </when>
+ <otherwise>
+ ORDER BY bu.bind_user_time DESC
+ </otherwise>
+ </choose>
+ </select>
+
+</mapper>
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/brokerage/record/BrokerageRecordServiceImplTest.java b/yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageRecordServiceImplTest.java
similarity index 91%
rename from yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/brokerage/record/BrokerageRecordServiceImplTest.java
rename to yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageRecordServiceImplTest.java
index abf2b37c1..99a815e5e 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/brokerage/record/BrokerageRecordServiceImplTest.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageRecordServiceImplTest.java
@@ -1,12 +1,13 @@
-package cn.iocoder.yudao.module.trade.service.brokerage.record;
+package cn.iocoder.yudao.module.trade.service.brokerage;
import cn.hutool.core.util.NumberUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
-import cn.iocoder.yudao.module.trade.controller.admin.brokerage.record.vo.BrokerageRecordPageReqVO;
-import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.record.BrokerageRecordDO;
-import cn.iocoder.yudao.module.trade.dal.mysql.brokerage.record.BrokerageRecordMapper;
-import cn.iocoder.yudao.module.trade.service.brokerage.user.BrokerageUserService;
+import cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.record.BrokerageRecordPageReqVO;
+import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.BrokerageRecordDO;
+import cn.iocoder.yudao.module.trade.dal.mysql.brokerage.BrokerageRecordMapper;
+import cn.iocoder.yudao.module.trade.service.brokerage.BrokerageRecordServiceImpl;
+import cn.iocoder.yudao.module.trade.service.brokerage.BrokerageUserService;
import cn.iocoder.yudao.module.trade.service.config.TradeConfigService;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/brokerage/user/BrokerageUserServiceImplTest.java b/yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserServiceImplTest.java
similarity index 88%
rename from yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/brokerage/user/BrokerageUserServiceImplTest.java
rename to yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserServiceImplTest.java
index 1c505e1b4..88157c204 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/brokerage/user/BrokerageUserServiceImplTest.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserServiceImplTest.java
@@ -1,10 +1,11 @@
-package cn.iocoder.yudao.module.trade.service.brokerage.user;
+package cn.iocoder.yudao.module.trade.service.brokerage;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
-import cn.iocoder.yudao.module.trade.controller.admin.brokerage.user.vo.BrokerageUserPageReqVO;
-import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.user.BrokerageUserDO;
-import cn.iocoder.yudao.module.trade.dal.mysql.brokerage.user.BrokerageUserMapper;
+import cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.user.BrokerageUserPageReqVO;
+import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.BrokerageUserDO;
+import cn.iocoder.yudao.module.trade.dal.mysql.brokerage.BrokerageUserMapper;
+import cn.iocoder.yudao.module.trade.service.brokerage.BrokerageUserServiceImpl;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.context.annotation.Import;
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/withdraw/BrokerageWithdrawServiceImplTest.java b/yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawServiceImplTest.java
similarity index 73%
rename from yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/withdraw/BrokerageWithdrawServiceImplTest.java
rename to yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawServiceImplTest.java
index ce53b38a6..af0cdbb1a 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/withdraw/BrokerageWithdrawServiceImplTest.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawServiceImplTest.java
@@ -1,16 +1,19 @@
-package cn.iocoder.yudao.module.trade.service.withdraw;
+package cn.iocoder.yudao.module.trade.service.brokerage;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
-import cn.iocoder.yudao.module.trade.controller.admin.brokerage.withdraw.vo.BrokerageWithdrawPageReqVO;
-import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.withdraw.BrokerageWithdrawDO;
-import cn.iocoder.yudao.module.trade.dal.mysql.brokerage.withdraw.BrokerageWithdrawMapper;
-import cn.iocoder.yudao.module.trade.service.brokerage.withdraw.BrokerageWithdrawServiceImpl;
+import cn.iocoder.yudao.module.system.api.notify.NotifyMessageSendApi;
+import cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.withdraw.BrokerageWithdrawPageReqVO;
+import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.BrokerageWithdrawDO;
+import cn.iocoder.yudao.module.trade.dal.mysql.brokerage.BrokerageWithdrawMapper;
+import cn.iocoder.yudao.module.trade.service.config.TradeConfigService;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.context.annotation.Import;
import javax.annotation.Resource;
+import javax.validation.Validator;
import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime;
import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
@@ -33,6 +36,19 @@ public class BrokerageWithdrawServiceImplTest extends BaseDbUnitTest {
@Resource
private BrokerageWithdrawMapper brokerageWithdrawMapper;
+ @MockBean
+ private BrokerageRecordService brokerageRecordService;
+ @MockBean
+ private BrokerageUserService brokerageUserService;
+ @MockBean
+ private TradeConfigService tradeConfigService;
+
+ @MockBean
+ private NotifyMessageSendApi notifyMessageSendApi;
+
+ @Resource
+ private Validator validator;
+
@Test
@Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
public void testGetBrokerageWithdrawPage() {
@@ -85,4 +101,17 @@ public class BrokerageWithdrawServiceImplTest extends BaseDbUnitTest {
assertPojoEquals(dbBrokerageWithdraw, pageResult.getList().get(0));
}
+ @Test
+ public void testCalculateFeePrice() {
+ Integer withdrawPrice = 100;
+ // 测试手续费比例未设置
+ Integer percent = null;
+ assertEquals(brokerageWithdrawService.calculateFeePrice(withdrawPrice, percent), 0);
+ // 测试手续费给为0
+ percent = 0;
+ assertEquals(brokerageWithdrawService.calculateFeePrice(withdrawPrice, percent), 0);
+ // 测试手续费
+ percent = 1;
+ assertEquals(brokerageWithdrawService.calculateFeePrice(withdrawPrice, percent), 1);
+ }
}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeCouponPriceCalculatorTest.java b/yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeCouponPriceCalculatorTest.java
index 94ac66c9b..06655e0b2 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeCouponPriceCalculatorTest.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeCouponPriceCalculatorTest.java
@@ -7,6 +7,7 @@ import cn.iocoder.yudao.module.promotion.api.coupon.dto.CouponValidReqDTO;
import cn.iocoder.yudao.module.promotion.enums.common.PromotionDiscountTypeEnum;
import cn.iocoder.yudao.module.promotion.enums.common.PromotionProductScopeEnum;
import cn.iocoder.yudao.module.promotion.enums.common.PromotionTypeEnum;
+import cn.iocoder.yudao.module.trade.enums.order.TradeOrderTypeEnum;
import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateReqBO;
import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateRespBO;
import org.junit.jupiter.api.Test;
@@ -47,6 +48,7 @@ public class TradeCouponPriceCalculatorTest extends BaseMockitoUnitTest {
new TradePriceCalculateReqBO.Item().setSkuId(40L).setCount(5).setSelected(false) // 匹配优惠劵，但是未选中
));
TradePriceCalculateRespBO result = new TradePriceCalculateRespBO()
+ .setType(TradeOrderTypeEnum.NORMAL.getType())
.setPrice(new TradePriceCalculateRespBO.Price())
.setPromotions(new ArrayList<>())
.setItems(asList(
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDeliveryPriceCalculatorTest.java b/yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDeliveryPriceCalculatorTest.java
index 5aa75fd94..3c1c107ed 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDeliveryPriceCalculatorTest.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDeliveryPriceCalculatorTest.java
@@ -91,7 +91,7 @@ public class TradeDeliveryPriceCalculatorTest extends BaseMockitoUnitTest {
item -> item.setFreeCount(20).setFreePrice(100));
// 准备 SP 运费模板数据
templateRespBO = randomPojo(DeliveryExpressTemplateRespBO.class,
- item -> item.setChargeMode(DeliveryExpressChargeModeEnum.PIECE.getType())
+ item -> item.setChargeMode(DeliveryExpressChargeModeEnum.COUNT.getType())
.setCharge(chargeBO).setFree(freeBO));
}
@@ -144,11 +144,11 @@ public class TradeDeliveryPriceCalculatorTest extends BaseMockitoUnitTest {
// 断言：SKU1
assertThat(resultBO.getItems().get(0))
.extracting("price", "count","discountPrice" ,"couponPrice", "pointPrice","deliveryPrice","payPrice")
- .containsExactly(100, 2, 0, 0, 0, 1500, 1700);
+ .containsExactly(100, 2, 0, 0, 0, 500, 700);
// 断言：SKU2
assertThat(resultBO.getItems().get(1))
.extracting("price", "count","discountPrice" ,"couponPrice", "pointPrice","deliveryPrice","payPrice")
- .containsExactly(200, 10, 0, 0, 0, 1500, 3500);
+ .containsExactly(200, 10, 0, 0, 0, 2500, 4500);
// 断言：SKU3 未选中
assertThat(resultBO.getItems().get(2))
.extracting("price", "count","discountPrice" ,"couponPrice", "pointPrice","deliveryPrice","payPrice")
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDiscountActivityPriceCalculatorTest.java b/yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDiscountActivityPriceCalculatorTest.java
index 9175e1643..21760217c 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDiscountActivityPriceCalculatorTest.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDiscountActivityPriceCalculatorTest.java
@@ -5,6 +5,7 @@ import cn.iocoder.yudao.module.promotion.api.discount.DiscountActivityApi;
import cn.iocoder.yudao.module.promotion.api.discount.dto.DiscountProductRespDTO;
import cn.iocoder.yudao.module.promotion.enums.common.PromotionDiscountTypeEnum;
import cn.iocoder.yudao.module.promotion.enums.common.PromotionTypeEnum;
+import cn.iocoder.yudao.module.trade.enums.order.TradeOrderTypeEnum;
import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateReqBO;
import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateRespBO;
import org.junit.jupiter.api.Test;
@@ -42,6 +43,7 @@ public class TradeDiscountActivityPriceCalculatorTest extends BaseMockitoUnitTes
new TradePriceCalculateReqBO.Item().setSkuId(20L).setCount(3).setSelected(false) // 匹配活动，但未选中
));
TradePriceCalculateRespBO result = new TradePriceCalculateRespBO()
+ .setType(TradeOrderTypeEnum.NORMAL.getType())
.setPrice(new TradePriceCalculateRespBO.Price())
.setPromotions(new ArrayList<>())
.setItems(asList(
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeMemberLevelPriceCalculatorTest.java b/yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeMemberLevelPriceCalculatorTest.java
new file mode 100644
index 000000000..44e783103
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeMemberLevelPriceCalculatorTest.java
@@ -0,0 +1,118 @@
+package cn.iocoder.yudao.module.trade.service.price.calculator;
+
+import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
+import cn.iocoder.yudao.module.member.api.level.MemberLevelApi;
+import cn.iocoder.yudao.module.member.api.level.dto.MemberLevelRespDTO;
+import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
+import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
+import cn.iocoder.yudao.module.promotion.enums.common.PromotionTypeEnum;
+import cn.iocoder.yudao.module.trade.enums.order.TradeOrderTypeEnum;
+import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateReqBO;
+import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateRespBO;
+import org.junit.jupiter.api.Test;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+
+import java.util.ArrayList;
+
+import static java.util.Arrays.asList;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.when;
+
+/**
+ * {@link TradeMemberLevelPriceCalculator} 的单元测试类
+ *
+ * @author 芋道源码
+ */
+public class TradeMemberLevelPriceCalculatorTest extends BaseMockitoUnitTest {
+
+ @InjectMocks
+ private TradeMemberLevelPriceCalculator memberLevelPriceCalculator;
+
+ @Mock
+ private MemberLevelApi memberLevelApi;
+ @Mock
+ private MemberUserApi memberUserApi;
+
+ @Test
+ public void testCalculate() {
+ // 准备参数
+ TradePriceCalculateReqBO param = new TradePriceCalculateReqBO()
+ .setUserId(1024L)
+ .setItems(asList(
+ new TradePriceCalculateReqBO.Item().setSkuId(10L).setCount(2).setSelected(true), // 匹配活动，且已选中
+ new TradePriceCalculateReqBO.Item().setSkuId(20L).setCount(3).setSelected(false) // 匹配活动，但未选中
+ ));
+ TradePriceCalculateRespBO result = new TradePriceCalculateRespBO()
+ .setType(TradeOrderTypeEnum.NORMAL.getType())
+ .setPrice(new TradePriceCalculateRespBO.Price())
+ .setPromotions(new ArrayList<>())
+ .setItems(asList(
+ new TradePriceCalculateRespBO.OrderItem().setSkuId(10L).setCount(2).setSelected(true)
+ .setPrice(100),
+ new TradePriceCalculateRespBO.OrderItem().setSkuId(20L).setCount(3).setSelected(false)
+ .setPrice(50)
+ ));
+ // 保证价格被初始化上
+ TradePriceCalculatorHelper.recountPayPrice(result.getItems());
+ TradePriceCalculatorHelper.recountAllPrice(result);
+
+ // mock 方法（会员等级）
+ when(memberUserApi.getUser(eq(1024L))).thenReturn(new MemberUserRespDTO().setLevelId(2048L));
+ when(memberLevelApi.getMemberLevel(eq(2048L))).thenReturn(
+ new MemberLevelRespDTO().setId(2048L).setName("VIP 会员").setDiscountPercent(60));
+
+ // 调用
+ memberLevelPriceCalculator.calculate(param, result);
+ // 断言：Price 部分
+ TradePriceCalculateRespBO.Price price = result.getPrice();
+ assertEquals(price.getTotalPrice(), 200);
+ assertEquals(price.getDiscountPrice(), 0);
+ assertEquals(price.getPointPrice(), 0);
+ assertEquals(price.getDeliveryPrice(), 0);
+ assertEquals(price.getCouponPrice(), 0);
+ assertEquals(price.getVipPrice(), 80);
+ assertEquals(price.getPayPrice(), 120);
+ assertNull(result.getCouponId());
+ // 断言：SKU 1
+ assertEquals(result.getItems().size(), 2);
+ TradePriceCalculateRespBO.OrderItem orderItem01 = result.getItems().get(0);
+ assertEquals(orderItem01.getSkuId(), 10L);
+ assertEquals(orderItem01.getCount(), 2);
+ assertEquals(orderItem01.getPrice(), 100);
+ assertEquals(orderItem01.getDiscountPrice(), 0);
+ assertEquals(orderItem01.getDeliveryPrice(), 0);
+ assertEquals(orderItem01.getCouponPrice(), 0);
+ assertEquals(orderItem01.getPointPrice(), 0);
+ assertEquals(orderItem01.getVipPrice(), 80);
+ assertEquals(orderItem01.getPayPrice(), 120);
+ // 断言：SKU 2
+ TradePriceCalculateRespBO.OrderItem orderItem02 = result.getItems().get(1);
+ assertEquals(orderItem02.getSkuId(), 20L);
+ assertEquals(orderItem02.getCount(), 3);
+ assertEquals(orderItem02.getPrice(), 50);
+ assertEquals(orderItem02.getDiscountPrice(), 0);
+ assertEquals(orderItem02.getDeliveryPrice(), 0);
+ assertEquals(orderItem02.getCouponPrice(), 0);
+ assertEquals(orderItem02.getPointPrice(), 0);
+ assertEquals(orderItem02.getVipPrice(), 60);
+ assertEquals(orderItem02.getPayPrice(), 90);
+ // 断言：Promotion 部分
+ assertEquals(result.getPromotions().size(), 1);
+ TradePriceCalculateRespBO.Promotion promotion01 = result.getPromotions().get(0);
+ assertEquals(promotion01.getId(), 2048L);
+ assertEquals(promotion01.getName(), "VIP 会员");
+ assertEquals(promotion01.getType(), PromotionTypeEnum.MEMBER_LEVEL.getType());
+ assertEquals(promotion01.getTotalPrice(), 200);
+ assertEquals(promotion01.getDiscountPrice(), 80);
+ assertTrue(promotion01.getMatch());
+ assertEquals(promotion01.getDescription(), "会员等级折扣：省 0.80 元");
+ TradePriceCalculateRespBO.PromotionItem promotionItem01 = promotion01.getItems().get(0);
+ assertEquals(promotion01.getItems().size(), 1);
+ assertEquals(promotionItem01.getSkuId(), 10L);
+ assertEquals(promotionItem01.getTotalPrice(), 200);
+ assertEquals(promotionItem01.getDiscountPrice(), 80);
+ }
+
+}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeRewardActivityPriceCalculatorTest.java b/yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeRewardActivityPriceCalculatorTest.java
index 30107d5b4..de72ed616 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeRewardActivityPriceCalculatorTest.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeRewardActivityPriceCalculatorTest.java
@@ -5,6 +5,7 @@ import cn.iocoder.yudao.module.promotion.api.reward.RewardActivityApi;
import cn.iocoder.yudao.module.promotion.api.reward.dto.RewardActivityMatchRespDTO;
import cn.iocoder.yudao.module.promotion.enums.common.PromotionConditionTypeEnum;
import cn.iocoder.yudao.module.promotion.enums.common.PromotionTypeEnum;
+import cn.iocoder.yudao.module.trade.enums.order.TradeOrderTypeEnum;
import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateReqBO;
import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateRespBO;
import org.junit.jupiter.api.Test;
@@ -44,6 +45,7 @@ public class TradeRewardActivityPriceCalculatorTest extends BaseMockitoUnitTest
new TradePriceCalculateReqBO.Item().setSkuId(30L).setCount(4).setSelected(true) // 匹配活动 2
));
TradePriceCalculateRespBO result = new TradePriceCalculateRespBO()
+ .setType(TradeOrderTypeEnum.NORMAL.getType())
.setPrice(new TradePriceCalculateRespBO.Price())
.setPromotions(new ArrayList<>())
.setItems(asList(
@@ -157,6 +159,7 @@ public class TradeRewardActivityPriceCalculatorTest extends BaseMockitoUnitTest
new TradePriceCalculateReqBO.Item().setSkuId(30L).setCount(4).setSelected(true)
));
TradePriceCalculateRespBO result = new TradePriceCalculateRespBO()
+ .setType(TradeOrderTypeEnum.NORMAL.getType())
.setPrice(new TradePriceCalculateRespBO.Price())
.setPromotions(new ArrayList<>())
.setItems(asList(
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/test/resources/sql/create_tables.sql b/yudao-module-mall/yudao-module-trade-biz/src/test/resources/sql/create_tables.sql
index e78cd187b..d263fdfb9 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/test/resources/sql/create_tables.sql
+++ b/yudao-module-mall/yudao-module-trade-biz/src/test/resources/sql/create_tables.sql
@@ -186,6 +186,6 @@ CREATE TABLE IF NOT EXISTS "trade_brokerage_withdraw"
"updater" varchar DEFAULT '',
"update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
"deleted" bit NOT NULL DEFAULT FALSE,
- "tenant_id" bigint not null default '0',目
+ "tenant_id" bigint not null default '0',
PRIMARY KEY ("id")
) COMMENT '佣金提现';
\ No newline at end of file
diff --git a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/level/MemberLevelApi.java b/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/level/MemberLevelApi.java
index 2091189a2..1ddd899cb 100644
--- a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/level/MemberLevelApi.java
+++ b/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/level/MemberLevelApi.java
@@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.member.api.level;
+import cn.iocoder.yudao.module.member.api.level.dto.MemberLevelRespDTO;
import cn.iocoder.yudao.module.member.enums.MemberExperienceBizTypeEnum;
/**
@@ -9,6 +10,14 @@ import cn.iocoder.yudao.module.member.enums.MemberExperienceBizTypeEnum;
*/
public interface MemberLevelApi {
+ /**
+ * 获得会员等级
+ *
+ * @param id 会员等级编号
+ * @return 会员等级
+ */
+ MemberLevelRespDTO getMemberLevel(Long id);
+
/**
* 增加会员经验
*
diff --git a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/level/dto/MemberLevelRespDTO.java b/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/level/dto/MemberLevelRespDTO.java
new file mode 100644
index 000000000..a72d65f23
--- /dev/null
+++ b/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/level/dto/MemberLevelRespDTO.java
@@ -0,0 +1,41 @@
+package cn.iocoder.yudao.module.member.api.level.dto;
+
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import lombok.Data;
+
+/**
+ * 会员等级 Resp DTO
+ *
+ * @author 芋道源码
+ */
+@Data
+public class MemberLevelRespDTO {
+
+ /**
+ * 编号
+ */
+ private Long id;
+ /**
+ * 等级名称
+ */
+ private String name;
+ /**
+ * 等级
+ */
+ private Integer level;
+ /**
+ * 升级经验
+ */
+ private Integer experience;
+ /**
+ * 享受折扣
+ */
+ private Integer discountPercent;
+ /**
+ * 状态
+ *
+ * 枚举 {@link CommonStatusEnum}
+ */
+ private Integer status;
+
+}
diff --git a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/point/MemberPointApi.java b/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/point/MemberPointApi.java
index 3eb749fb6..c6df95f7c 100644
--- a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/point/MemberPointApi.java
+++ b/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/point/MemberPointApi.java
@@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.member.api.point;
+import cn.iocoder.yudao.module.member.api.point.dto.MemberPointConfigRespDTO;
import cn.iocoder.yudao.module.member.enums.point.MemberPointBizTypeEnum;
import javax.validation.constraints.Min;
@@ -11,6 +12,13 @@ import javax.validation.constraints.Min;
*/
public interface MemberPointApi {
+ /**
+ * 获得积分配置
+ *
+ * @return 积分配置
+ */
+ MemberPointConfigRespDTO getConfig();
+
/**
* 增加用户积分
*
diff --git a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/point/dto/MemberPointConfigRespDTO.java b/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/point/dto/MemberPointConfigRespDTO.java
new file mode 100644
index 000000000..a9783352a
--- /dev/null
+++ b/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/point/dto/MemberPointConfigRespDTO.java
@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.member.api.point.dto;
+
+import lombok.Data;
+
+/**
+ * 用户信息 Response DTO
+ *
+ * @author 芋道源码
+ */
+@Data
+public class MemberPointConfigRespDTO {
+ /**
+ * 积分抵扣开关
+ */
+ private Boolean tradeDeductEnable;
+ /**
+ * 积分抵扣，单位：分
+ * <p>
+ * 1 积分抵扣多少分
+ */
+ private Integer tradeDeductUnitPrice;
+ /**
+ * 积分抵扣最大值
+ */
+ private Integer tradeDeductMaxPrice;
+ /**
+ * 1 元赠送多少分
+ */
+ private Integer tradeGivePoint;
+}
diff --git a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/dto/MemberUserRespDTO.java b/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/dto/MemberUserRespDTO.java
index 10d96365f..e55eda154 100644
--- a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/dto/MemberUserRespDTO.java
+++ b/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/dto/MemberUserRespDTO.java
@@ -3,6 +3,8 @@ package cn.iocoder.yudao.module.member.api.user.dto;
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
import lombok.Data;
+import java.time.LocalDateTime;
+
/**
* 用户信息 Response DTO
*
@@ -33,5 +35,20 @@ public class MemberUserRespDTO {
* 手机
*/
private String mobile;
+ /**
+ * 创建时间（注册时间）
+ */
+ private LocalDateTime createTime;
+ // ========== 其它信息 ==========
+
+ /**
+ * 会员级别编号
+ */
+ private Long levelId;
+
+ /**
+ * 积分
+ */
+ private Integer point;
}
diff --git a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java b/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
index 933f17168..c25de2461 100644
--- a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
+++ b/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
@@ -13,6 +13,7 @@ public interface ErrorCodeConstants {
ErrorCode USER_NOT_EXISTS = new ErrorCode(1004001000, "用户不存在");
ErrorCode USER_MOBILE_NOT_EXISTS = new ErrorCode(1004001001, "手机号未注册用户");
ErrorCode USER_MOBILE_USED = new ErrorCode(1004001002, "修改手机失败，该手机号({})已经被使用");
+ ErrorCode USER_POINT_NOT_ENOUGH = new ErrorCode(1004001003, "用户积分余额不足");
// ========== AUTH 模块 1004003000 ==========
ErrorCode AUTH_LOGIN_BAD_CREDENTIALS = new ErrorCode(1004003000, "登录失败，账号密码不正确");
diff --git a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/point/MemberPointBizTypeEnum.java b/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/point/MemberPointBizTypeEnum.java
index fe76cdb52..68e61cc9f 100644
--- a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/point/MemberPointBizTypeEnum.java
+++ b/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/point/MemberPointBizTypeEnum.java
@@ -18,8 +18,10 @@ public enum MemberPointBizTypeEnum implements IntArrayValuable {
SIGN(1, "签到", "签到获得 {} 积分", true),
ORDER_REWARD(10, "订单奖励", "下单获得 {} 积分", true),
- ORDER_CANCEL(11, "订单取消", "退单获得 {} 积分", false), // 退回积分
+ ORDER_CANCEL(11, "订单取消", "订单取消，退还 {} 积分", true), // 退回积分
ORDER_USE(12, "订单使用", "下单使用 {} 积分", false), // 扣减积分
+ AFTER_SALE_REFUND_USED(13, "订单退款", "订单退款，退还 {} 积分", true), // 退回积分
+ AFTER_SALE_DEDUCT_GIVE(14, "订单退款", "订单退款，扣除赠送的 {} 积分", false), // 扣减积分
;
/**
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/level/MemberLevelApiImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/level/MemberLevelApiImpl.java
index 3cd2cad65..519a8e8a1 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/level/MemberLevelApiImpl.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/level/MemberLevelApiImpl.java
@@ -1,5 +1,7 @@
package cn.iocoder.yudao.module.member.api.level;
+import cn.iocoder.yudao.module.member.api.level.dto.MemberLevelRespDTO;
+import cn.iocoder.yudao.module.member.convert.level.MemberLevelConvert;
import cn.iocoder.yudao.module.member.enums.MemberExperienceBizTypeEnum;
import cn.iocoder.yudao.module.member.service.level.MemberLevelService;
import org.springframework.stereotype.Service;
@@ -22,6 +24,11 @@ public class MemberLevelApiImpl implements MemberLevelApi {
@Resource
private MemberLevelService memberLevelService;
+ @Override
+ public MemberLevelRespDTO getMemberLevel(Long id) {
+ return MemberLevelConvert.INSTANCE.convert02(memberLevelService.getLevel(id));
+ }
+
@Override
public void addExperience(Long userId, Integer experience, Integer bizType, String bizId) {
MemberExperienceBizTypeEnum bizTypeEnum = MemberExperienceBizTypeEnum.getByType(bizType);
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/point/MemberPointApiImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/point/MemberPointApiImpl.java
index ee407eaf6..51239388a 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/point/MemberPointApiImpl.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/point/MemberPointApiImpl.java
@@ -1,6 +1,10 @@
package cn.iocoder.yudao.module.member.api.point;
+import cn.hutool.core.lang.Assert;
+import cn.iocoder.yudao.module.member.api.point.dto.MemberPointConfigRespDTO;
+import cn.iocoder.yudao.module.member.convert.point.MemberPointConfigConvert;
import cn.iocoder.yudao.module.member.enums.point.MemberPointBizTypeEnum;
+import cn.iocoder.yudao.module.member.service.point.MemberPointConfigService;
import cn.iocoder.yudao.module.member.service.point.MemberPointRecordService;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
@@ -21,9 +25,17 @@ public class MemberPointApiImpl implements MemberPointApi {
@Resource
private MemberPointRecordService memberPointRecordService;
+ @Resource
+ private MemberPointConfigService memberPointConfigService;
+
+ @Override
+ public MemberPointConfigRespDTO getConfig() {
+ return MemberPointConfigConvert.INSTANCE.convert01(memberPointConfigService.getPointConfig());
+ }
@Override
public void addPoint(Long userId, Integer point, Integer bizType, String bizId) {
+ Assert.isTrue(point > 0);
MemberPointBizTypeEnum bizTypeEnum = MemberPointBizTypeEnum.getByType(bizType);
if (bizTypeEnum == null) {
throw exception(POINT_RECORD_BIZ_NOT_SUPPORT);
@@ -33,11 +45,12 @@ public class MemberPointApiImpl implements MemberPointApi {
@Override
public void reducePoint(Long userId, Integer point, Integer bizType, String bizId) {
+ Assert.isTrue(point > 0);
MemberPointBizTypeEnum bizTypeEnum = MemberPointBizTypeEnum.getByType(bizType);
if (bizTypeEnum == null) {
throw exception(POINT_RECORD_BIZ_NOT_SUPPORT);
}
- memberPointRecordService.createPointRecord(userId, point, bizTypeEnum, bizId);
+ memberPointRecordService.createPointRecord(userId, -point, bizTypeEnum, bizId);
}
}
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberLevelConvert.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberLevelConvert.java
index 073f76027..f2282815e 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberLevelConvert.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberLevelConvert.java
@@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.member.convert.level;
+import cn.iocoder.yudao.module.member.api.level.dto.MemberLevelRespDTO;
import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelCreateReqVO;
import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelRespVO;
import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelSimpleRespVO;
@@ -33,4 +34,6 @@ public interface MemberLevelConvert {
List<AppMemberLevelRespVO> convertList02(List<MemberLevelDO> list);
+ MemberLevelRespDTO convert02(MemberLevelDO bean);
+
}
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/point/MemberPointConfigConvert.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/point/MemberPointConfigConvert.java
index e600378bb..c7f0e9881 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/point/MemberPointConfigConvert.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/point/MemberPointConfigConvert.java
@@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.member.convert.point;
+import cn.iocoder.yudao.module.member.api.point.dto.MemberPointConfigRespDTO;
import cn.iocoder.yudao.module.member.controller.admin.point.vo.config.MemberPointConfigRespVO;
import cn.iocoder.yudao.module.member.controller.admin.point.vo.config.MemberPointConfigSaveReqVO;
import cn.iocoder.yudao.module.member.dal.dataobject.point.MemberPointConfigDO;
@@ -20,4 +21,5 @@ public interface MemberPointConfigConvert {
MemberPointConfigDO convert(MemberPointConfigSaveReqVO bean);
+ MemberPointConfigRespDTO convert01(MemberPointConfigDO pointConfig);
}
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/MemberUserMapper.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/MemberUserMapper.java
index 902057272..3f871020c 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/MemberUserMapper.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/MemberUserMapper.java
@@ -1,12 +1,14 @@
package cn.iocoder.yudao.module.member.dal.mysql.user;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserPageReqVO;
import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@@ -62,4 +64,33 @@ public interface MemberUserMapper extends BaseMapperX<MemberUserDO> {
.apply("FIND_IN_SET({0}, tag_ids)", tagId));
}
+ /**
+ * 更新用户积分（增加）
+ *
+ * @param id 用户编号
+ * @param incrCount 增加积分（正数）
+ */
+ default void updatePointIncr(Long id, Integer incrCount) {
+ Assert.isTrue(incrCount > 0);
+ LambdaUpdateWrapper<MemberUserDO> lambdaUpdateWrapper = new LambdaUpdateWrapper<MemberUserDO>()
+ .setSql(" point = point + " + incrCount)
+ .eq(MemberUserDO::getId, id);
+ update(null, lambdaUpdateWrapper);
+ }
+
+ /**
+ * 更新用户积分（减少）
+ *
+ * @param id 用户编号
+ * @param incrCount 增加积分（负数）
+ * @return 更新行数
+ */
+ default int updatePointDecr(Long id, Integer incrCount) {
+ Assert.isTrue(incrCount < 0);
+ LambdaUpdateWrapper<MemberUserDO> lambdaUpdateWrapper = new LambdaUpdateWrapper<MemberUserDO>()
+ .setSql(" point = point + " + incrCount) // 负数，所以使用 + 号
+ .eq(MemberUserDO::getId, id);
+ return update(null, lambdaUpdateWrapper);
+ }
+
}
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/point/MemberPointRecordServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/point/MemberPointRecordServiceImpl.java
index a28e94795..da67a9ec2 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/point/MemberPointRecordServiceImpl.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/point/MemberPointRecordServiceImpl.java
@@ -5,7 +5,6 @@ import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.member.controller.admin.point.vo.recrod.MemberPointRecordPageReqVO;
-import cn.iocoder.yudao.module.member.dal.dataobject.point.MemberPointConfigDO;
import cn.iocoder.yudao.module.member.dal.dataobject.point.MemberPointRecordDO;
import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
import cn.iocoder.yudao.module.member.dal.mysql.point.MemberPointRecordMapper;
@@ -14,6 +13,7 @@ import cn.iocoder.yudao.module.member.service.user.MemberUserService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.validation.annotation.Validated;
@@ -21,7 +21,9 @@ import javax.annotation.Resource;
import java.util.List;
import java.util.Set;
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
+import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.USER_POINT_NOT_ENOUGH;
/**
@@ -36,8 +38,6 @@ public class MemberPointRecordServiceImpl implements MemberPointRecordService {
@Resource
private MemberPointRecordMapper memberPointRecordMapper;
- @Resource
- private MemberPointConfigService memberPointConfigService;
@Resource
private MemberUserService memberUserService;
@@ -64,32 +64,28 @@ public class MemberPointRecordServiceImpl implements MemberPointRecordService {
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void createPointRecord(Long userId, Integer point, MemberPointBizTypeEnum bizType, String bizId) {
- MemberPointConfigDO pointConfig = memberPointConfigService.getPointConfig();
- if (pointConfig == null || pointConfig.getTradeGivePoint() == null) {
- log.error("[createPointRecord][增加积分失败：tradeGivePoint 未配置，userId({}) point({}) bizType({}) bizId({})]",
- userId, point, bizType.getType(), bizId);
- return;
- }
-
- // 1. 根据配置的比例，换算实际的积分
- point = point * pointConfig.getTradeGivePoint();
- if (!bizType.isAdd() && point > 0) {
- point = -point;
- }
-
- // 2. 增加积分记录
+ // 1. 校验用户积分余额
MemberUserDO user = memberUserService.getUser(userId);
Integer userPoint = ObjectUtil.defaultIfNull(user.getPoint(), 0);
- Integer totalPoint = userPoint + point; // 用户变动后的积分
+ int totalPoint = userPoint + point; // 用户变动后的积分
+ if (totalPoint < 0) {
+ throw exception(USER_POINT_NOT_ENOUGH);
+ }
+
+ // 2. 更新用户积分
+ boolean success = memberUserService.updateUserPoint(userId, point);
+ if (!success) {
+ throw exception(USER_POINT_NOT_ENOUGH);
+ }
+
+ // 3. 增加积分记录
MemberPointRecordDO record = new MemberPointRecordDO()
.setUserId(userId).setBizId(bizId).setBizType(bizType.getType())
.setTitle(bizType.getName()).setDescription(StrUtil.format(bizType.getDescription(), point))
.setPoint(point).setTotalPoint(totalPoint);
memberPointRecordMapper.insert(record);
-
- // 3. 更新用户积分
- memberUserService.updateUserPoint(userId, totalPoint);
}
}
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java
index f1a0a7265..50433a559 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java
@@ -164,6 +164,7 @@ public interface MemberUserService {
*
* @param userId 用户编号
* @param point 积分数量
+ * @return 更新结果
*/
- void updateUserPoint(Long userId, Integer point);
+ boolean updateUserPoint(Long userId, Integer point);
}
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java
index 8381c73f1..3119c48db 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java
@@ -260,8 +260,13 @@ public class MemberUserServiceImpl implements MemberUserService {
}
@Override
- public void updateUserPoint(Long userId, Integer point) {
- memberUserMapper.updateById(new MemberUserDO().setId(userId).setPoint(point));
+ public boolean updateUserPoint(Long id, Integer point) {
+ if (point > 0) {
+ memberUserMapper.updatePointIncr(id, point);
+ } else if (point < 0) {
+ return memberUserMapper.updatePointDecr(id, point) > 0;
+ }
+ return true;
}
}
diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dict/DictDataApi.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dict/DictDataApi.java
index 3bc28c89e..107184564 100644
--- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dict/DictDataApi.java
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dict/DictDataApi.java
@@ -17,14 +17,14 @@ public interface DictDataApi {
* 2. 字典数据被禁用
*
* @param dictType 字典类型
- * @param values 字典数据值的数组
+ * @param values 字典数据值的数组
*/
void validateDictDataList(String dictType, Collection<String> values);
/**
* 获得指定的字典数据，从缓存中
*
- * @param type 字典类型
+ * @param type 字典类型
* @param value 字典数据值
* @return 字典数据
*/
@@ -33,7 +33,7 @@ public interface DictDataApi {
/**
* 解析获得指定的字典数据，从缓存中
*
- * @param type 字典类型
+ * @param type 字典类型
* @param label 字典数据标签
* @return 字典数据
*/
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/dict/AppDictDataController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/dict/AppDictDataController.java
index c4946c371..1f4f78c80 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/dict/AppDictDataController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/dict/AppDictDataController.java
@@ -1,4 +1,39 @@
package cn.iocoder.yudao.module.system.controller.app.dict;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.system.controller.app.dict.vo.AppDictDataRespVO;
+import cn.iocoder.yudao.module.system.convert.dict.DictDataConvert;
+import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictDataDO;
+import cn.iocoder.yudao.module.system.service.dict.DictDataService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "用户 App - 字典数据")
+@RestController
+@RequestMapping("/system/dict-data")
+@Validated
public class AppDictDataController {
+
+ @Resource
+ private DictDataService dictDataService;
+
+ @GetMapping("/type")
+ @Operation(summary = "根据字典类型查询字典数据信息")
+ @Parameter(name = "type", description = "字典类型", required = true, example = "common_status")
+ public CommonResult<List<AppDictDataRespVO>> getDictDataListByType(@RequestParam("type") String type) {
+ List<DictDataDO> list = dictDataService.getEnabledDictDataListByType(type);
+ return success(DictDataConvert.INSTANCE.convertList03(list));
+ }
+
}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/dict/vo/AppDictDataRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/dict/vo/AppDictDataRespVO.java
new file mode 100644
index 000000000..e2d141603
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/dict/vo/AppDictDataRespVO.java
@@ -0,0 +1,29 @@
+package cn.iocoder.yudao.module.system.controller.app.dict.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+
+@Schema(description = "用户 App - 字典数据信息 Response VO")
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class AppDictDataRespVO {
+
+ @Schema(description = "字典数据编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+ private Long id;
+
+ @Schema(description = "字典标签", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
+ private String label;
+
+ @Schema(description = "字典值", requiredMode = Schema.RequiredMode.REQUIRED, example = "iocoder")
+ private String value;
+
+ @Schema(description = "字典类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "sys_common_sex")
+ private String dictType;
+
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/dict/DictDataConvert.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/dict/DictDataConvert.java
index 89e4d9e06..1c4895110 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/dict/DictDataConvert.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/dict/DictDataConvert.java
@@ -3,11 +3,11 @@ package cn.iocoder.yudao.module.system.convert.dict;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.system.api.dict.dto.DictDataRespDTO;
import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.*;
+import cn.iocoder.yudao.module.system.controller.app.dict.vo.AppDictDataRespVO;
import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictDataDO;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
-import java.util.Collection;
import java.util.List;
@Mapper
@@ -29,4 +29,7 @@ public interface DictDataConvert {
DictDataRespDTO convert02(DictDataDO bean);
+ List<AppDictDataRespVO> convertList03(List<DictDataDO> list);
+
+ List<DictDataRespDTO> convertList04(List<DictDataDO> list);
}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dict/DictDataMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dict/DictDataMapper.java
index 244825093..f92c86298 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dict/DictDataMapper.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dict/DictDataMapper.java
@@ -48,4 +48,10 @@ public interface DictDataMapper extends BaseMapperX<DictDataDO> {
.eqIfPresent(DictDataDO::getStatus, reqVO.getStatus()));
}
+ default List<DictDataDO> selectListByTypeAndStatus(String dictType, Integer status) {
+ return selectList(new LambdaQueryWrapper<DictDataDO>()
+ .eq(DictDataDO::getDictType, dictType)
+ .eq(DictDataDO::getStatus, status));
+ }
+
}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictDataService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictDataService.java
index d2eb8c519..3fc6a4071 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictDataService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictDataService.java
@@ -62,6 +62,14 @@ public interface DictDataService {
*/
List<DictDataDO> getDictDataList(DictDataExportReqVO reqVO);
+ /**
+ * 获得字典数据列表
+ *
+ * @param dictType 字典类型
+ * @return 字典数据列表
+ */
+ List<DictDataDO> getEnabledDictDataListByType(String dictType);
+
/**
* 获得字典数据详情
*
@@ -84,7 +92,7 @@ public interface DictDataService {
* 2. 字典数据被禁用
*
* @param dictType 字典类型
- * @param values 字典数据值的数组
+ * @param values 字典数据值的数组
*/
void validateDictDataList(String dictType, Collection<String> values);
@@ -92,7 +100,7 @@ public interface DictDataService {
* 获得指定的字典数据
*
* @param dictType 字典类型
- * @param value 字典数据值
+ * @param value 字典数据值
* @return 字典数据
*/
DictDataDO getDictData(String dictType, String value);
@@ -101,7 +109,7 @@ public interface DictDataService {
* 解析获得指定的字典数据，从缓存中
*
* @param dictType 字典类型
- * @param label 字典数据标签
+ * @param label 字典数据标签
* @return 字典数据
*/
DictDataDO parseDictData(String dictType, String label);
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictDataServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictDataServiceImpl.java
index eccd2c219..8a49719fb 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictDataServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictDataServiceImpl.java
@@ -49,7 +49,7 @@ public class DictDataServiceImpl implements DictDataService {
@Override
public List<DictDataDO> getDictDataList() {
- List<DictDataDO> list = dictDataMapper.selectList();
+ List<DictDataDO> list = dictDataMapper.selectList(DictDataDO::getStatus, CommonStatusEnum.ENABLE.getStatus());
list.sort(COMPARATOR_TYPE_AND_SORT);
return list;
}
@@ -66,6 +66,13 @@ public class DictDataServiceImpl implements DictDataService {
return list;
}
+ @Override
+ public List<DictDataDO> getEnabledDictDataListByType(String dictType) {
+ List<DictDataDO> list = dictDataMapper.selectListByTypeAndStatus(dictType, CommonStatusEnum.ENABLE.getStatus());
+ list.sort(COMPARATOR_TYPE_AND_SORT);
+ return list;
+ }
+
@Override
public DictDataDO getDictData(Long id) {
return dictDataMapper.selectById(id);
diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/dict/DictDataServiceImplTest.java b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/dict/DictDataServiceImplTest.java
index 1e4dc9f90..bb962b0dd 100644
--- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/dict/DictDataServiceImplTest.java
+++ b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/dict/DictDataServiceImplTest.java
@@ -43,10 +43,15 @@ public class DictDataServiceImplTest extends BaseDbUnitTest {
@Test
public void testGetDictDataList() {
// mock 数据
- DictDataDO dictDataDO01 = randomDictDataDO().setDictType("yunai").setSort(2);
+ DictDataDO dictDataDO01 = randomDictDataDO().setDictType("yunai").setSort(2)
+ .setStatus(CommonStatusEnum.ENABLE.getStatus());
dictDataMapper.insert(dictDataDO01);
- DictDataDO dictDataDO02 = randomDictDataDO().setDictType("yunai").setSort(1);
+ DictDataDO dictDataDO02 = randomDictDataDO().setDictType("yunai").setSort(1)
+ .setStatus(CommonStatusEnum.ENABLE.getStatus());
dictDataMapper.insert(dictDataDO02);
+ DictDataDO dictDataDO03 = randomDictDataDO().setDictType("yunai").setSort(3)
+ .setStatus(CommonStatusEnum.DISABLE.getStatus());
+ dictDataMapper.insert(dictDataDO03);
// 准备参数
// 调用