Просмотр исходного кода

Merge branch 'release_toaliyun_real_20230511' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_20230511

release_toaliyun_real
xhxu 3 лет назад
Родитель
Сommit
7593fcb34b
4 измененных файлов: 22 добавлений и 11 удалений
  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. +16
    -6
      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 {
boolean isSaas = this.isGoodLifeSaas();
if (!isSaas) {
ttMerchantPoiService.exportTemplate(request, response,false);
//ttMerchantPoiService.exportTemplate(request, response,false);
throw new MallinkException(Result.ERROR,"当前版本无需导出模板");
}else {
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;
}
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;
}
CUser user = cuserFactory.getBUserService(appPlat).getById(bUserId, orgUser.getTenantId());
CUser user = cuserFactory.getBUserService(appPlat).getById(orgUser.getId(), orgUser.getTenantId());
if (null == user) {
return;
}


+ 16
- 6
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);
resultMap.put("token", cUser.getToken());
@@ -301,7 +308,8 @@ public class WxInfoController extends BaseController {
* @return
*/
@PostMapping("/getUserPhoneForBuser")
@ApiOperation(value = "登录后授权获取用户的手机号", notes="{\"appId\":\"string\",\"encryptedData\":\"string\",\"iv\":\"string\",\"openId\":\"string\",\"session_key\":\"string\"}")
@ApiOperation(value = "登录后授权获取用户的手机号", notes="{\"appId\":\"string\",\"encryptedData\":\"string\",\"iv\":\"string\","
+ "\"openId\":\"string\",\"session_key\":\"string\",\"isCheck\":\"string\"}")
public ResultData getUserPhoneForBuser(@RequestBody Map<String, String> map) {
logger.debug(map.toString());
Map resultMap = new HashMap();
@@ -310,7 +318,7 @@ public class WxInfoController extends BaseController {
String iv = map.get("iv");
String openId = map.get("openId");
String session_key = map.get("session_key");
String isCheck = map.get("isCheck");
//登录凭证不能为空
if (StringUtils.isBlank(encryptedData)) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "encryptedData 不能为空");
@@ -338,10 +346,12 @@ public class WxInfoController extends BaseController {
resultMap.put("msg", "授权手机成功!");
resultMap.put("phone", phone);
try {
checkLoginUserPhone(buser, phone,this.getLoginBUser().getPhone());
}catch(Exception e) {
return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(),e.getMessage());
if (StringUtils.isNotBlank(isCheck) && "Y".equals(isCheck)) {
try {
checkLoginUserPhone(buser, phone,this.getLoginBUser().getPhone());
}catch(Exception e) {
return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(),e.getMessage());
}
}
return new ResultData(resultMap);


+ 1
- 1
mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java Просмотреть файл

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


Загрузка…
Отмена
Сохранить