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/OrderItemVo.java | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/vo/OrderItemVo.java b/src/main/java/cc/mrbird/febs/mall/vo/OrderItemVo.java index 0fc75b3..87369e7 100644 --- a/src/main/java/cc/mrbird/febs/mall/vo/OrderItemVo.java +++ b/src/main/java/cc/mrbird/febs/mall/vo/OrderItemVo.java @@ -1,5 +1,6 @@ package cc.mrbird.febs.mall.vo; +import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,8 +16,20 @@ @ApiModel(value = "OrderListItemVo", description = "订单列表明细返回参数类") public class OrderItemVo { + @ApiModelProperty(value = "id") + private Long id; + + @ApiModelProperty(value = "skuId") + private Long skuId; + @ApiModelProperty(value = "商品名称") private String goodsName; + + @ApiModelProperty(value = "优惠卷ID") + private Long memberCouponId; + + @ApiModelProperty(value = "推销员邀请码") + private String memberInviteId; @ApiModelProperty(value = "样式名称") private String styleName; @@ -32,4 +45,22 @@ @ApiModelProperty(value = "单价") private BigDecimal price; + + @ApiModelProperty(value = "1-普通商品 2-套餐") + private Integer isNormal; + + @ApiModelProperty(value = "商品ID") + private Long goodsId; + + @ApiModelProperty(value = "1:正常 2:退款中3:已退") + private Integer state; + + @ApiModelProperty(value = "支付金额") + private BigDecimal itemAmount; + + @TableField(exist = false) + private BigDecimal itemScoreAmount; + + @TableField(exist = false) + private BigDecimal itemScorePrice; } -- Gitblit v1.9.1