Compare commits

...

3 Commits

Author SHA1 Message Date
xm
48ae0ddfe6 优化分红金额计算业务 2026-06-02 15:11:00 +08:00
xm
5b3506fa00 商品增加分享图业务 2026-06-01 17:05:28 +08:00
xm
471927ccfc 商品订单增加配送时间业务 2026-06-01 11:34:04 +08:00
4 changed files with 13 additions and 3 deletions

View File

@@ -277,7 +277,7 @@ public class DealerOrderSettlement10584Task {
profitVOS.forEach(profitVO ->{
ShopDealerSettlementItemDto itemDto = new ShopDealerSettlementItemDto();
String no = orderNoUtils.generate("C");
BigDecimal money = profitVO.getProfit().divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP).multiply(itemProfitPrice).setScale(3, RoundingMode.HALF_UP);
BigDecimal money = profitVO.getProfit().divide(BigDecimal.valueOf(100)).multiply(itemProfitPrice).setScale(3, RoundingMode.HALF_UP);
itemDto.setNo(no);
itemDto.setUserId(profitVO.getUserId());
itemDto.setMoney(money);

View File

@@ -6,6 +6,7 @@ import lombok.Data;
import javax.validation.Valid;
import javax.validation.constraints.*;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
/**
@@ -159,6 +160,9 @@ public class OrderCreateRequest {
@Schema(description = "秒杀活动ID")
private Integer activityId;
@Schema(description = "配送时间")
private LocalDateTime sendTime;
@Schema(description = "订单商品列表")
@Valid
@NotEmpty(message = "订单商品列表不能为空")
@@ -173,14 +177,14 @@ public class OrderCreateRequest {
@Schema(description = "秒杀活动ID")
private Integer activityId;
@Schema(description = "商品ID", required = true)
@Schema(description = "商品ID")
@NotNull(message = "商品ID不能为空")
private Integer goodsId;
@Schema(description = "商品SKU ID")
private Integer skuId;
@Schema(description = "商品数量", required = true)
@Schema(description = "商品数量")
@NotNull(message = "商品数量不能为空")
@Min(value = 1, message = "商品数量必须大于0")
private Integer quantity;

View File

@@ -200,6 +200,9 @@ public class ShopGoods implements Serializable {
@Schema(description = "配送楼层步梯费(元)")
private BigDecimal deliveryFee;
@Schema(description = "分享图")
private String shareImg;
@Schema(description = "租户id")
private Integer tenantId;

View File

@@ -363,6 +363,9 @@ public class ShopOrder implements Serializable {
@Schema(description = "配送费(步梯配送特有)")
private BigDecimal deliveryFee;
@Schema(description = "配送时间")
private LocalDateTime sendTime;
@Schema(description = "修改时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;