diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java index abce06f79..a327522f8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java @@ -12,6 +12,7 @@ import com.iformall.controller.base.BaseController; import com.iformall.domain.dto.WxCUserBasicInfoFilterDto; import com.iformall.domain.po.*; import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.UserTradeRecordVo; import com.iformall.enums.EnumAssignTagsTrigger; import com.iformall.enums.EnumCouponOrderStatus; @@ -149,8 +150,7 @@ public class WxCUserBasicInfoController extends BaseController { wxCUserBasicInfo.setName(null); } } - String tenantId = getTenantId(); - wxCUserBasicInfo.setTenantId(tenantId); + wxCUserBasicInfo.updateTenantInfo(getTenantInfo()); wxCUserBasicInfo.setSortColumns(BaseEntity.SortField.ActiveTime_DESC); PageInfo page = wxCUserBasicInfoService.listAsPage(wxCUserBasicInfo, pageNum, pageSize); @@ -163,10 +163,10 @@ public class WxCUserBasicInfoController extends BaseController { return new ResultData(page); } - private int checkUniquePhone(String phone, String tenantId) { + private int checkUniquePhone(String phone, TenantEntity tenantEntity) { WxCUserBasicInfo baseInfoQ = new WxCUserBasicInfo(); baseInfoQ.setPhone(phone); - baseInfoQ.setTenantId(tenantId); + baseInfoQ.updateTenantInfo(tenantEntity); return wxCUserBasicInfoService.countUser(baseInfoQ); } @@ -177,7 +177,7 @@ public class WxCUserBasicInfoController extends BaseController { logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::update"); WxCUserBasicInfo oldInfo = wxCUserBasicInfoService.getById(wxCUserBasicInfo.getId()); if (!oldInfo.getPhone().equals(wxCUserBasicInfo.getPhone())) { - if (checkUniquePhone(wxCUserBasicInfo.getPhone(), getTenantId()) > 0) { + if (checkUniquePhone(wxCUserBasicInfo.getPhone(), getTenantInfo()) > 0) { return new ResultData(ErrorCode.USER_PHONE_IS_FOUND.getCode(), "手机号已存在"); } } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java index 25767e9d1..f3cdaf45e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java @@ -75,7 +75,7 @@ public class WxCreditHistoryController extends BaseController { public ResultData add(@RequestBody WxCreditHistory wxCreditHistory) { logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::add"); MallUserInfo user = getUser(); - wxCreditHistory.setTenantId(user.getTenantId()); + wxCreditHistory.updateTenantInfo(user); wxCreditHistory.setOperatorId(user.getId()); try { wxCreditHistoryService.creditUsercheck(wxCreditHistory.getCUserId()) ; diff --git a/mallinkWebSocketServer/src/main/java/com/iformall/controller/BaseController.java b/mallinkWebSocketServer/src/main/java/com/iformall/controller/BaseController.java index 3595c45ac..dd014bb31 100644 --- a/mallinkWebSocketServer/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkWebSocketServer/src/main/java/com/iformall/controller/BaseController.java @@ -5,6 +5,7 @@ import com.iformall.common.ErrorCode; import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxCUser; import com.iformall.domain.po.WxCUserBasicInfo; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.exception.MallinkException; import com.iformall.interceptor.AuthHandshakeInterceptor; import com.iformall.service.WxAppinfoService;