diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java index 841a93b1e..80b81da96 100755 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java @@ -211,8 +211,8 @@ public class WxCUserController extends BaseController { } }else{ TenantEntity tenantEntity = new TenantEntity(); - tenantEntity.setTenantId(wxCUser.getTenantId()); - tenantEntity.setParentTenantId(wxCUser.getParentTenantId()); + tenantEntity.setTenantId(bUser.getTenantId()); + tenantEntity.setParentTenantId(bUser.getParentTenantId()); WxCUserBasicInfo infoByPhone = wxCUserBasicInfoService.findInfoByPhone(tenantEntity, wxCUserFromBDto.getPhone()); if(infoByPhone != null){ return new ResultData(ErrorCode.USER_PHONE_IS_FOUND,"手机号已存在"); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxGameController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxGameController.java index 0cf753f33..75e85b649 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxGameController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxGameController.java @@ -1,15 +1,11 @@ package com.iformall.controller; -import com.github.pagehelper.Page; -import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.domain.po.*; import com.iformall.enums.EnumGameStatus; import com.iformall.service.WxCouponOrderService; import com.iformall.service.WxGameService; -import com.iformall.service.WxGameTemplateService; -import com.iformall.service.WxOrderService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; @@ -18,7 +14,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.HashMap; import java.util.Map; @RestController