Bläddra i källkod

[集团版][修改]:集团版预处理

release_toaliyun_real
Stormeye Wu 6 år sedan
förälder
incheckning
cb23d129bf
3 ändrade filer med 7 tillägg och 6 borttagningar
  1. +5
    -5
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java
  2. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java
  3. +1
    -0
      mallinkWebSocketServer/src/main/java/com/iformall/controller/BaseController.java

+ 5
- 5
mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java Visa fil

@@ -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(), "手机号已存在");
} }
} }


+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java Visa fil

@@ -75,7 +75,7 @@ public class WxCreditHistoryController extends BaseController {
public ResultData add(@RequestBody WxCreditHistory wxCreditHistory) { public ResultData add(@RequestBody WxCreditHistory wxCreditHistory) {
logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::add"); logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::add");
MallUserInfo user = getUser(); MallUserInfo user = getUser();
wxCreditHistory.setTenantId(user.getTenantId());
wxCreditHistory.updateTenantInfo(user);
wxCreditHistory.setOperatorId(user.getId()); wxCreditHistory.setOperatorId(user.getId());
try { try {
wxCreditHistoryService.creditUsercheck(wxCreditHistory.getCUserId()) ; wxCreditHistoryService.creditUsercheck(wxCreditHistory.getCUserId()) ;


+ 1
- 0
mallinkWebSocketServer/src/main/java/com/iformall/controller/BaseController.java Visa fil

@@ -5,6 +5,7 @@ import com.iformall.common.ErrorCode;
import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxAppinfo;
import com.iformall.domain.po.WxCUser; import com.iformall.domain.po.WxCUser;
import com.iformall.domain.po.WxCUserBasicInfo; import com.iformall.domain.po.WxCUserBasicInfo;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.exception.MallinkException; import com.iformall.exception.MallinkException;
import com.iformall.interceptor.AuthHandshakeInterceptor; import com.iformall.interceptor.AuthHandshakeInterceptor;
import com.iformall.service.WxAppinfoService; import com.iformall.service.WxAppinfoService;


Laddar…
Avbryt
Spara