From f894a228fa018a6affd3d08b72b57142b937a4ff Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 18 七月 2024 17:21:52 +0800
Subject: [PATCH] 代码提交
---
server/web/src/main/java/com/doumee/api/web/CustomerApi.java | 1 +
server/service/src/main/java/com/doumee/dao/business/model/CustomerLog.java | 6 ++++++
server/service/src/main/java/com/doumee/service/business/impl/CustomerLogServiceImpl.java | 2 +-
3 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/CustomerLog.java b/server/service/src/main/java/com/doumee/dao/business/model/CustomerLog.java
index e36119d..554ca9b 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/CustomerLog.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/CustomerLog.java
@@ -10,6 +10,8 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.xpath.operations.Bool;
+
import java.util.Date;
/**
@@ -159,4 +161,8 @@
@TableField(exist = false)
private Long memberId;
+ @ApiModelProperty(value = "鏄惁鑴辨晱鎵嬫満鍙�",hidden = true)
+ @TableField(exist = false)
+ private Integer isHiddenPhone;
+
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CustomerLogServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CustomerLogServiceImpl.java
index 0abb8e5..5e73a02 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CustomerLogServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CustomerLogServiceImpl.java
@@ -233,7 +233,7 @@
queryWrapper.orderByDesc(CustomerLog::getCreateDate);
PageData<CustomerLog> pageData = PageData.from(customerLogMapper.selectJoinPage(page,CustomerLog.class, queryWrapper));
for (CustomerLog customerLog:pageData.getRecords()) {
- if(Objects.nonNull(pageWrap.getModel().getMemberId())){
+ if(Objects.nonNull(pageWrap.getModel().getIsHiddenPhone())&& Constants.equalsInteger(pageWrap.getModel().getIsHiddenPhone(),Constants.ZERO)){
customerLog.setPhone(
customerLog.getPhone().replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2")
);
diff --git a/server/web/src/main/java/com/doumee/api/web/CustomerApi.java b/server/web/src/main/java/com/doumee/api/web/CustomerApi.java
index 0ca27b0..da00ef7 100644
--- a/server/web/src/main/java/com/doumee/api/web/CustomerApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/CustomerApi.java
@@ -298,6 +298,7 @@
})
public ApiResponse<PageData<CustomerLog>> customerLogPage(@RequestBody PageWrap<CustomerLog> pageWrap) {
pageWrap.getModel().setCostomerId(getMemberId().toString());
+ pageWrap.getModel().setIsHiddenPhone(Constants.ZERO);
return ApiResponse.success(customerLogService.findPage(pageWrap));
}
--
Gitblit v1.9.3