|
|
@@ -12,6 +12,7 @@ import com.iformall.controller.base.BaseController; |
|
|
import com.iformall.domain.dto.WxCUserBasicInfoFilterDto; |
|
|
import com.iformall.domain.dto.WxCUserBasicInfoFilterDto; |
|
|
import com.iformall.domain.po.*; |
|
|
import com.iformall.domain.po.*; |
|
|
import com.iformall.domain.po.base.BaseEntity; |
|
|
import com.iformall.domain.po.base.BaseEntity; |
|
|
|
|
|
import com.iformall.domain.po.base.TenantEntity; |
|
|
import com.iformall.domain.vo.UserTradeRecordVo; |
|
|
import com.iformall.domain.vo.UserTradeRecordVo; |
|
|
import com.iformall.enums.EnumAssignTagsTrigger; |
|
|
import com.iformall.enums.EnumAssignTagsTrigger; |
|
|
import com.iformall.enums.EnumCouponOrderStatus; |
|
|
import com.iformall.enums.EnumCouponOrderStatus; |
|
|
@@ -149,8 +150,7 @@ public class WxCUserBasicInfoController extends BaseController { |
|
|
wxCUserBasicInfo.setName(null); |
|
|
wxCUserBasicInfo.setName(null); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
String tenantId = getTenantId(); |
|
|
|
|
|
wxCUserBasicInfo.setTenantId(tenantId); |
|
|
|
|
|
|
|
|
wxCUserBasicInfo.updateTenantInfo(getTenantInfo()); |
|
|
wxCUserBasicInfo.setSortColumns(BaseEntity.SortField.ActiveTime_DESC); |
|
|
wxCUserBasicInfo.setSortColumns(BaseEntity.SortField.ActiveTime_DESC); |
|
|
PageInfo<WxCUserBasicInfo> page = wxCUserBasicInfoService.listAsPage(wxCUserBasicInfo, pageNum, pageSize); |
|
|
PageInfo<WxCUserBasicInfo> page = wxCUserBasicInfoService.listAsPage(wxCUserBasicInfo, pageNum, pageSize); |
|
|
|
|
|
|
|
|
@@ -163,10 +163,10 @@ public class WxCUserBasicInfoController extends BaseController { |
|
|
return new ResultData(page); |
|
|
return new ResultData(page); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private int checkUniquePhone(String phone, String tenantId) { |
|
|
|
|
|
|
|
|
private int checkUniquePhone(String phone, TenantEntity tenantEntity) { |
|
|
WxCUserBasicInfo baseInfoQ = new WxCUserBasicInfo(); |
|
|
WxCUserBasicInfo baseInfoQ = new WxCUserBasicInfo(); |
|
|
baseInfoQ.setPhone(phone); |
|
|
baseInfoQ.setPhone(phone); |
|
|
baseInfoQ.setTenantId(tenantId); |
|
|
|
|
|
|
|
|
baseInfoQ.updateTenantInfo(tenantEntity); |
|
|
return wxCUserBasicInfoService.countUser(baseInfoQ); |
|
|
return wxCUserBasicInfoService.countUser(baseInfoQ); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@@ -177,7 +177,7 @@ public class WxCUserBasicInfoController extends BaseController { |
|
|
logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::update"); |
|
|
logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::update"); |
|
|
WxCUserBasicInfo oldInfo = wxCUserBasicInfoService.getById(wxCUserBasicInfo.getId()); |
|
|
WxCUserBasicInfo oldInfo = wxCUserBasicInfoService.getById(wxCUserBasicInfo.getId()); |
|
|
if (!oldInfo.getPhone().equals(wxCUserBasicInfo.getPhone())) { |
|
|
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(), "手机号已存在"); |
|
|
return new ResultData(ErrorCode.USER_PHONE_IS_FOUND.getCode(), "手机号已存在"); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|