From 8657f3758fa1acef3445f82b82f81fdba5e0c1db Mon Sep 17 00:00:00 2001 From: Administrator <15274802129@163.com> Date: Thu, 25 Sep 2025 11:29:00 +0800 Subject: [PATCH] feat(member): 更新会员公司ID逻辑 - 从API DTO中提取公司ID - 验证并转换公司编码为内部ID - 设置会员关联的公司ID - 优化公司信息查询逻辑 - 修复公司ID更新问题 - 确保会员信息正确绑定公司关系 --- src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java b/src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java index 012f7be..08cf033 100644 --- a/src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java +++ b/src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java @@ -37,6 +37,9 @@ @ApiModelProperty(value = "状态") private Integer status; + @ApiModelProperty(value = "订单积分") + private BigDecimal scoreAmount; + @ApiModelProperty(value = "订单金额") private BigDecimal amount; @@ -100,9 +103,9 @@ /** * 自提点信息 */ - @ApiModelProperty(value = "团长姓名") + @ApiModelProperty(value = "自提点联系人姓名") private String leaderName; - @ApiModelProperty(value = "团长电话") + @ApiModelProperty(value = "自提点联系人电话") private String leaderPhone; @ApiModelProperty(value = "自提点图片") private String addressPic; @@ -124,5 +127,8 @@ private Integer deliveryState; @ApiModelProperty(value = "是否送货上门 1:是 2:否") private Integer isHome; + + @ApiModelProperty(value = "是否赠送 1-是 2-否") + private Integer isFree; } -- Gitblit v1.9.1