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/entity/MallRefundEntity.java | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallRefundEntity.java b/src/main/java/cc/mrbird/febs/mall/entity/MallRefundEntity.java index 884b517..dae67f7 100644 --- a/src/main/java/cc/mrbird/febs/mall/entity/MallRefundEntity.java +++ b/src/main/java/cc/mrbird/febs/mall/entity/MallRefundEntity.java @@ -1,10 +1,13 @@ package cc.mrbird.febs.mall.entity; import cc.mrbird.febs.common.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.math.BigDecimal; +import java.util.Date; @Data @TableName("mall_refund") @@ -16,6 +19,8 @@ private Long memberId; //退款订单ID private Long orderId; + //退款订单详情ID + private Long itemId; //退款方式 1:微信 2:支付宝 3:其他 private Integer type; //退款状态 1:成功 2:失败 3:退款中 @@ -23,4 +28,40 @@ //退款金额 private BigDecimal amount; + //退款原因 + private String refundReason; + //退款说明 + private String refundRemark; + //退款图片 + private String refundPic; + + @TableField(exist = false) + private String orderNo; + + @TableField(exist = false) + private String status; + + @TableField(exist = false) + private String goodsName; + + @TableField(exist = false) + private Integer cnt; + + @TableField(exist = false) + private String[] refundPicList; + + @TableField(exist = false) + private String refundMemberName; + @TableField(exist = false) + private String refundMemberPhone; + + @TableField(exist = false) + private String leaderName; + @TableField(exist = false) + private String leaderPhone; + + @TableField(exist = false) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date orderTime; + } -- Gitblit v1.9.1