소스 검색

fix bug

release_toaliyun_real
winter 3 년 전
부모
커밋
c12785a796
4개의 변경된 파일13개의 추가작업 그리고 5개의 파일을 삭제
  1. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMerchantPoiController.java
  2. +3
    -3
      mallinkBApi/src/main/java/com/iformall/controller/BaseController.java
  3. +7
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java
  4. +1
    -1
      mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java

+ 2
- 1
mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMerchantPoiController.java 파일 보기

@@ -238,7 +238,8 @@ public class TtMerchantPoiController extends DouyinBaseController {
try { try {
boolean isSaas = this.isGoodLifeSaas(); boolean isSaas = this.isGoodLifeSaas();
if (!isSaas) { if (!isSaas) {
ttMerchantPoiService.exportTemplate(request, response,false);
//ttMerchantPoiService.exportTemplate(request, response,false);
throw new MallinkException(Result.ERROR,"当前版本无需导出模板");
}else { }else {
ttMerchantPoiService.exportTemplate(request, response,true); ttMerchantPoiService.exportTemplate(request, response,true);
} }


+ 3
- 3
mallinkBApi/src/main/java/com/iformall/controller/BaseController.java 파일 보기

@@ -185,11 +185,11 @@ public class BaseController {
return ipaddress; return ipaddress;
} }
public void checkLoginUserPhone(WxMerchantBUser orgUser,Long bUserId,EnumAppPlat appPlat) throws Exception {
if (null == bUserId) {
public void checkLoginUserPhone(WxMerchantBUser orgUser,EnumAppPlat appPlat) throws Exception {
if (null == orgUser) {
return; return;
} }
CUser user = cuserFactory.getBUserService(appPlat).getById(bUserId, orgUser.getTenantId());
CUser user = cuserFactory.getBUserService(appPlat).getById(orgUser.getId(), orgUser.getTenantId());
if (null == user) { if (null == user) {
return; return;
} }


+ 7
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java 파일 보기

@@ -153,6 +153,13 @@ public class WxInfoController extends BaseController {


} }
} }
try {
this.checkLoginUserPhone(buUser, appPlat);
} catch (Exception e) {
return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(), e.getMessage());
}
//处理登陆用户 //处理登陆用户
cUser = cuserFactory.getBUserService(appPlat).handleLoginUser(cUser,null); cUser = cuserFactory.getBUserService(appPlat).handleLoginUser(cUser,null);
resultMap.put("token", cUser.getToken()); resultMap.put("token", cUser.getToken());


+ 1
- 1
mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java 파일 보기

@@ -271,7 +271,7 @@ public class WxMerchantBUserController extends BaseController {
if(appPlat == null){ if(appPlat == null){
return new ResultData(ErrorCode.APP_PLAT_ERROR); return new ResultData(ErrorCode.APP_PLAT_ERROR);
} }
checkLoginUserPhone(orgUser, orgUser.getId(),appPlat);
checkLoginUserPhone(orgUser, appPlat);
}catch(Exception e) { }catch(Exception e) {
return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(),e.getMessage()); return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(),e.getMessage());
} }


불러오는 중...
취소
저장