From 38d547d91d7eee81ed56ca6ceba7fd393952a082 Mon Sep 17 00:00:00 2001 From: Administrator <15274802129@163.com> Date: Mon, 12 May 2025 16:12:15 +0800 Subject: [PATCH] feat(sign): 增加签到获得会员经验或积分的功能 - 在 ApiSignVo 中添加 mostSignIn 字段,用于区分签到获得的类型 - 在 ScoreFlowTypeEnum 中新增 SIGN_EXPERIENCE 和 SIGN_SCORE 类型 - 修改 ScoreServiceImpl 中的签到逻辑,支持获得会员经验和积分 - 更新 ScoreSettingDto,添加 mostSignIn 字段用于配置签到获得类型 - 在前端设置页面添加签到获得类型的选项 --- src/main/java/cc/mrbird/febs/mall/entity/MallOrderRefund.java | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallOrderRefund.java b/src/main/java/cc/mrbird/febs/mall/entity/MallOrderRefund.java index 6ee61ac..9c0d1ff 100644 --- a/src/main/java/cc/mrbird/febs/mall/entity/MallOrderRefund.java +++ b/src/main/java/cc/mrbird/febs/mall/entity/MallOrderRefund.java @@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import java.math.BigDecimal; +import java.util.Date; + /** * @author wzy * @date 2021-09-23 @@ -23,11 +26,31 @@ private String remark; /** - * 1-已申请 2-同意退款 3-驳回退款 4-已提交物流信息 5-已退款 + * 1-已申请 2-同意退款 3-驳回退款 4-已提交物流信息 5-已退款 6-已取消 */ private Integer status; private String expressNo; private String expressCom; + + /** + * 1-仅退款不退货 2-退款退货 + */ + private Integer type; + + /** + * 退款前订单状态 + */ + private Integer beforeStatus; + + private Date refundTime; + + private String name; + + private String phone; + + private String address; + + private BigDecimal amount; } -- Gitblit v1.9.1