diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/Member.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/Member.java index a18bd9822..964d3f668 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dos/Member.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/Member.java @@ -101,7 +101,7 @@ public class Member extends BaseEntity { this.username = username; this.password = password; this.mobile = mobile; - this.nickName = mobile; + this.nickName = "临时昵称"; this.disabled = true; this.haveStore = false; this.sex = 0; diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberEvaluation.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberEvaluation.java index d33d11368..90be33619 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberEvaluation.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberEvaluation.java @@ -1,6 +1,8 @@ package cn.lili.modules.member.entity.dos; import cn.lili.common.enums.SwitchEnum; +import cn.lili.common.security.sensitive.Sensitive; +import cn.lili.common.security.sensitive.enums.SensitiveStrategy; import cn.lili.common.utils.StringUtils; import cn.lili.modules.goods.entity.dos.GoodsSku; import cn.lili.modules.member.entity.dto.MemberEvaluationDTO; @@ -50,6 +52,7 @@ public class MemberEvaluation extends BaseEntity { @NotNull @ApiModelProperty(value = "会员名称") + @Sensitive(strategy = SensitiveStrategy.PHONE) private String memberName; @NotNull diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberPointsHistory.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberPointsHistory.java index 11254eb26..dc91cebc3 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberPointsHistory.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberPointsHistory.java @@ -1,6 +1,8 @@ package cn.lili.modules.member.entity.dos; +import cn.lili.common.security.sensitive.Sensitive; +import cn.lili.common.security.sensitive.enums.SensitiveStrategy; import cn.lili.mybatis.BaseIdEntity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; @@ -43,6 +45,8 @@ public class MemberPointsHistory extends BaseIdEntity { @ApiModelProperty(value = "会员ID") private String memberId; + + @Sensitive(strategy = SensitiveStrategy.PHONE) @ApiModelProperty(value = "会员名称") private String memberName; diff --git a/framework/src/main/java/cn/lili/modules/order/aftersale/entity/dos/AfterSale.java b/framework/src/main/java/cn/lili/modules/order/aftersale/entity/dos/AfterSale.java index 52e345b87..212c4f3ca 100644 --- a/framework/src/main/java/cn/lili/modules/order/aftersale/entity/dos/AfterSale.java +++ b/framework/src/main/java/cn/lili/modules/order/aftersale/entity/dos/AfterSale.java @@ -1,5 +1,7 @@ package cn.lili.modules.order.aftersale.entity.dos; +import cn.lili.common.security.sensitive.Sensitive; +import cn.lili.common.security.sensitive.enums.SensitiveStrategy; import cn.lili.mybatis.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -41,6 +43,7 @@ public class AfterSale extends BaseEntity { private String memberId; @ApiModelProperty(value = "会员名称") + @Sensitive(strategy = SensitiveStrategy.PHONE) private String memberName; @ApiModelProperty(value = "商家ID") diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java index aacd8360b..f185d17d5 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java @@ -4,6 +4,8 @@ import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.json.JSONUtil; import cn.lili.common.enums.ClientTypeEnum; import cn.lili.common.enums.PromotionTypeEnum; +import cn.lili.common.security.sensitive.Sensitive; +import cn.lili.common.security.sensitive.enums.SensitiveStrategy; import cn.lili.common.utils.BeanUtil; import cn.lili.modules.goods.entity.enums.GoodsTypeEnum; import cn.lili.modules.order.cart.entity.dto.MemberCouponDTO; @@ -58,6 +60,7 @@ public class Order extends BaseEntity { private String memberId; @ApiModelProperty(value = "用户名") + @Sensitive(strategy = SensitiveStrategy.PHONE) private String memberName; /** diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderComplaint.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderComplaint.java index 9b3111de2..a61314108 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderComplaint.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderComplaint.java @@ -1,5 +1,7 @@ package cn.lili.modules.order.order.entity.dos; +import cn.lili.common.security.sensitive.Sensitive; +import cn.lili.common.security.sensitive.enums.SensitiveStrategy; import cn.lili.modules.order.aftersale.entity.enums.ComplaintStatusEnum; import cn.lili.mybatis.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; @@ -95,6 +97,7 @@ public class OrderComplaint extends BaseEntity { private String memberId; @ApiModelProperty(value = "会员名称") + @Sensitive(strategy = SensitiveStrategy.PHONE) private String memberName; @ApiModelProperty(value = "收货人") diff --git a/framework/src/main/java/cn/lili/modules/wallet/entity/dos/MemberWithdrawApply.java b/framework/src/main/java/cn/lili/modules/wallet/entity/dos/MemberWithdrawApply.java index cf598ddf6..364bd5adf 100644 --- a/framework/src/main/java/cn/lili/modules/wallet/entity/dos/MemberWithdrawApply.java +++ b/framework/src/main/java/cn/lili/modules/wallet/entity/dos/MemberWithdrawApply.java @@ -1,5 +1,7 @@ package cn.lili.modules.wallet.entity.dos; +import cn.lili.common.security.sensitive.Sensitive; +import cn.lili.common.security.sensitive.enums.SensitiveStrategy; import cn.lili.modules.wallet.entity.enums.WithdrawStatusEnum; import cn.lili.mybatis.BaseEntity; import com.baomidou.mybatisplus.annotation.FieldFill; @@ -39,6 +41,7 @@ public class MemberWithdrawApply extends BaseEntity { private String memberId; @ApiModelProperty(value = "会员名称") + @Sensitive(strategy = SensitiveStrategy.PHONE) private String memberName; @ApiModelProperty(value = "审核备注") diff --git a/framework/src/main/java/cn/lili/modules/wallet/entity/dos/Recharge.java b/framework/src/main/java/cn/lili/modules/wallet/entity/dos/Recharge.java index fb1bf4541..7b6159858 100644 --- a/framework/src/main/java/cn/lili/modules/wallet/entity/dos/Recharge.java +++ b/framework/src/main/java/cn/lili/modules/wallet/entity/dos/Recharge.java @@ -1,5 +1,7 @@ package cn.lili.modules.wallet.entity.dos; +import cn.lili.common.security.sensitive.Sensitive; +import cn.lili.common.security.sensitive.enums.SensitiveStrategy; import cn.lili.modules.order.order.entity.enums.PayStatusEnum; import cn.lili.mybatis.BaseIdEntity; import com.baomidou.mybatisplus.annotation.FieldFill; @@ -52,6 +54,7 @@ public class Recharge extends BaseIdEntity { private String memberId; @ApiModelProperty(value = "会员名称") + @Sensitive(strategy = SensitiveStrategy.PHONE) private String memberName; @NotEmpty(message = "充值金额不能为空") diff --git a/framework/src/main/java/cn/lili/modules/wallet/entity/dos/WalletLog.java b/framework/src/main/java/cn/lili/modules/wallet/entity/dos/WalletLog.java index 601851538..12bbf7939 100644 --- a/framework/src/main/java/cn/lili/modules/wallet/entity/dos/WalletLog.java +++ b/framework/src/main/java/cn/lili/modules/wallet/entity/dos/WalletLog.java @@ -1,5 +1,7 @@ package cn.lili.modules.wallet.entity.dos; +import cn.lili.common.security.sensitive.Sensitive; +import cn.lili.common.security.sensitive.enums.SensitiveStrategy; import cn.lili.modules.wallet.entity.dto.MemberWalletUpdateDTO; import cn.lili.modules.wallet.entity.enums.DepositServiceTypeEnum; import cn.lili.mybatis.BaseIdEntity; @@ -35,6 +37,7 @@ public class WalletLog extends BaseIdEntity { private String memberId; @ApiModelProperty(value = "会员名称") + @Sensitive(strategy = SensitiveStrategy.PHONE) private String memberName; @ApiModelProperty(value = "金额") diff --git a/manager-api/src/main/java/cn/lili/controller/order/AfterSaleManagerController.java b/manager-api/src/main/java/cn/lili/controller/order/AfterSaleManagerController.java index 10748a0b0..2764615b5 100644 --- a/manager-api/src/main/java/cn/lili/controller/order/AfterSaleManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/order/AfterSaleManagerController.java @@ -63,6 +63,7 @@ public class AfterSaleManagerController { return ResultUtil.data(afterSaleService.deliveryTraces(sn)); } + @PreventDuplicateSubmissions @ApiOperation(value = "售后线下退款") @ApiImplicitParams({ @ApiImplicitParam(name = "afterSaleSn", value = "售后sn", required = true, paramType = "path"),