zenghuapei
/
cyywl_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product

pull/13/head
TianYu 2023-06-02 11:27:05 +08:00
parent 38209dd485 413ded83a9
commit fd3c805655
10 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/PromoterDrawExcelVO.java
View File

@ -20,9 +20,9 @@ public class PromoterDrawExcelVO {
@ExcelProperty( "成为推广员时间")
private LocalDateTime createTime;
@ExcelProperty( "会员提成")
private Integer memberCommission;
private BigDecimal memberCommission;
@ExcelProperty( "商品提成")
private Integer goodsCommission;
private BigDecimal goodsCommission;
@ExcelProperty( "成交定单数")
private BigDecimal orderCount;

4
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/PromoterDrawVO.java
View File

@ -26,9 +26,9 @@ public class PromoterDrawVO {
@Schema(description = "成为推广员时间")
private LocalDateTime createTime;
@Schema(description = "会员提成")
private Integer memberCommission;
private BigDecimal memberCommission;
@Schema(description = "商品提成")
private Integer goodsCommission;
private BigDecimal goodsCommission;
@Schema(description = "成交定单数")
private BigDecimal orderCount;

2
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/app/member/vo/PromoterMemberOrderVO.java
View File

@ -14,5 +14,5 @@ public class PromoterMemberOrderVO {
@Schema(description = "总金额")
private BigDecimal totalAmount;
@Schema(description = "会员提成")
private Integer memberCommission;
private BigDecimal memberCommission;
}

2
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/app/member/vo/ShoppingMemberOrderVO.java
View File

@ -14,5 +14,5 @@ public class ShoppingMemberOrderVO {
@Schema(description = "总金额")
private BigDecimal totalAmount;
@Schema(description = "会员提成")
private Integer goodsCommission;
private BigDecimal goodsCommission;
}

2
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java
View File

@ -152,7 +152,7 @@ public class RechargeOrderServiceImpl implements RechargeOrderService {
// Map<Long, PromoterDrawVO> nameList = promoterDrawVOList.stream().collect(toMap(PromoterDrawVO::getUserId, value -> value, (value1, value2) -> value1));
list.forEach(promoterDrawVO -> {
if (promoterDrawVO.getMemberCommission() == null) {
promoterDrawVO.setMemberCommission(0);
promoterDrawVO.setMemberCommission(new BigDecimal(0));
}
if (promoterDrawVO.getTotalAmount() == null) {
promoterDrawVO.setTotalAmount(new BigDecimal(0));

5
yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/tenant/dto/TenantDTO.java
View File

@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.system.api.tenant.dto;
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
import lombok.*;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@ -108,11 +109,11 @@ public class TenantDTO{
/**
* 商品提成
*/
private Integer goodsCommission;
private BigDecimal goodsCommission;
/**
* 会员充值提成
*/
private Integer memberCommission;
private BigDecimal memberCommission;
/**
* logo
*/

5
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/tenant/TenantBaseVO.java
View File

@ -6,6 +6,7 @@ import lombok.*;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.*;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@ -105,11 +106,11 @@ public class TenantBaseVO {
/**
* 商品提成
*/
private Integer goodsCommission;
private BigDecimal goodsCommission;
/**
* 会员充值提成
*/
private Integer memberCommission;
private BigDecimal memberCommission;
}

5
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/tenant/TenantCommissionUpdateReqVO.java
View File

@ -7,6 +7,7 @@ import lombok.ToString;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import java.math.BigDecimal;
@Schema(description = "管理后台 - 租户更新 Request VO")
@Data
@ -22,11 +23,11 @@ public class TenantCommissionUpdateReqVO {
*/
@NotNull(message = "商品提成不能为空")
// @Size(min = 0,max = 100,message ="商品提成{min}{max}之间" )
private Integer goodsCommission;
private BigDecimal goodsCommission;
/**
* 会员充值提成
*/
@NotNull(message = "会员充值提成不能为空")
// @Size(min = 0,max = 100,message ="会员充值提成{min}{max}之间" )
private Integer memberCommission;
private BigDecimal memberCommission;
}

6
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/tenant/vo/TenantRespVO.java
View File

@ -4,6 +4,8 @@ import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.ToString;
import java.math.BigDecimal;
@Schema(description = "管理后台 - 租户 Response VO")
@Data
@ToString(callSuper = true)
@ -55,11 +57,11 @@ public class TenantRespVO {
* 商品提成
*/
@Schema(description = "商品提成")
private Integer goodsCommission;
private BigDecimal goodsCommission;
/**
* 会员充值提成
*/
@Schema(description = "会员充值提成")
private Integer memberCommission;
private BigDecimal memberCommission;
}

5
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/tenant/TenantDO.java
View File

@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.*;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@ -115,11 +116,11 @@ public class TenantDO extends BaseDO {
/**
* 商品提成
*/
private Integer goodsCommission;
private BigDecimal goodsCommission;
/**
* 会员充值提成
*/
private Integer memberCommission;
private BigDecimal memberCommission;
/**
* logo
*/