fix

app/main/api/internal/logic/query/queryservicelogic.go

@@ -8,7 +8,6 @@ import (
 	"os"
 	"time"
 	"ycc-server/app/main/api/internal/service"
-	"ycc-server/app/main/model"
 	"ycc-server/common/ctxdata"
 	"ycc-server/common/xerr"
 	"ycc-server/pkg/lzkit/crypto"
@@ -60,60 +59,60 @@ var productProcessors = map[string]func(*QueryServiceLogic, *types.QueryServiceR
 
 func (l *QueryServiceLogic) PreprocessLogic(req *types.QueryServiceReq, product string) (*types.QueryServiceResp, error) {
 	if processor, exists := productProcessors[product]; exists {
-		return processor(l, req) // 调用对应的处理函数
+		return processor(l, req) // 璋冪敤瀵瑰簲鐨勫鐞嗗嚱鏁?
 	}
-	return nil, errors.New("未找到相应的处理程序")
+	return nil, errors.New("鏈壘鍒扮浉搴旂殑澶勭悊绋嬪簭")
 }
 func (l *QueryServiceLogic) ProcessMarriageLogic(req *types.QueryServiceReq) (*types.QueryServiceResp, error) {
 
-	// AES解密
+	// AES瑙ｅ瘑
 	decryptData, DecryptDataErr := l.DecryptData(req.Data)
 	if DecryptDataErr != nil {
 		return nil, DecryptDataErr
 	}
 
-	// 校验参数
+	// 鏍￠獙鍙傛暟
 	var data types.MarriageReq
 	if unmarshalErr := json.Unmarshal(decryptData, &data); unmarshalErr != nil {
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 解密后的数据格式不正确: %+v", unmarshalErr)
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 瑙ｅ瘑鍚庣殑鏁版嵁鏍煎紡涓嶆纭? %+v", unmarshalErr)
 	}
 
 	if validatorErr := validator.Validate(data); validatorErr != nil {
-		return nil, errors.Wrapf(xerr.NewErrCodeMsg(xerr.PARAM_VERIFICATION_ERROR, validatorErr.Error()), "查询服务, 参数不正确: %+v", validatorErr)
+		return nil, errors.Wrapf(xerr.NewErrCodeMsg(xerr.PARAM_VERIFICATION_ERROR, validatorErr.Error()), "鏌ヨ鏈嶅姟, 鍙傛暟涓嶆纭? %+v", validatorErr)
 	}
 
-	// 校验验证码
+	// 鏍￠獙楠岃瘉鐮?
 	verifyCodeErr := l.VerifyCode(data.Mobile, data.Code)
 	if verifyCodeErr != nil {
 		return nil, verifyCodeErr
 	}
 
-	// 校验三要素
+	// 鏍￠獙涓夎绱?
 	verifyErr := l.Verify(data.Name, data.IDCard, data.Mobile)
 	if verifyErr != nil {
 		return nil, verifyErr
 	}
 
-	// 缓存
+	// 缂撳瓨
 	params := map[string]interface{}{
 		"name":    data.Name,
 		"id_card": data.IDCard,
 		"mobile":  data.Mobile,
 	}
-    userID, userType, err := l.GetOrCreateUser()
-    if err != nil {
-        return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 处理用户失败: %v", err)
-    }
+	userID, err := l.GetOrCreateUser()
+	if err != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 澶勭悊鐢ㄦ埛澶辫触: %v", err)
+	}
 	cacheNo, cacheDataErr := l.CacheData(params, "marriage", userID)
 	if cacheDataErr != nil {
 		return nil, cacheDataErr
 	}
-    token, err := l.svcCtx.UserService.GeneralUserToken(l.ctx, userID, userType)
+	token, err := l.svcCtx.UserService.GeneralUserToken(l.ctx, userID)
 	if err != nil {
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 生成token失败 : %v", err)
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 鐢熸垚token澶辫触 : %v", err)
 	}
 
-	// 获取当前时间戳
+	// 鑾峰彇褰撳墠鏃堕棿鎴?
 	now := time.Now().Unix()
 	return &types.QueryServiceResp{
 		Id:           cacheNo,
@@ -123,58 +122,58 @@ func (l *QueryServiceLogic) ProcessMarriageLogic(req *types.QueryServiceReq) (*t
 	}, nil
 }
 
-// 处理家政服务相关逻辑
+// 澶勭悊瀹舵斂鏈嶅姟鐩稿叧閫昏緫
 func (l *QueryServiceLogic) ProcessHomeServiceLogic(req *types.QueryServiceReq) (*types.QueryServiceResp, error) {
 
-	// AES解密
+	// AES瑙ｅ瘑
 	decryptData, DecryptDataErr := l.DecryptData(req.Data)
 	if DecryptDataErr != nil {
 		return nil, DecryptDataErr
 	}
 
-	// 校验参数
+	// 鏍￠獙鍙傛暟
 	var data types.HomeServiceReq
 	if unmarshalErr := json.Unmarshal(decryptData, &data); unmarshalErr != nil {
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 解密后的数据格式不正确: %+v", unmarshalErr)
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 瑙ｅ瘑鍚庣殑鏁版嵁鏍煎紡涓嶆纭? %+v", unmarshalErr)
 	}
 
 	if validatorErr := validator.Validate(data); validatorErr != nil {
-		return nil, errors.Wrapf(xerr.NewErrCodeMsg(xerr.PARAM_VERIFICATION_ERROR, validatorErr.Error()), "查询服务, 参数不正确: %+v", validatorErr)
+		return nil, errors.Wrapf(xerr.NewErrCodeMsg(xerr.PARAM_VERIFICATION_ERROR, validatorErr.Error()), "鏌ヨ鏈嶅姟, 鍙傛暟涓嶆纭? %+v", validatorErr)
 	}
 
-	// 校验验证码
+	// 鏍￠獙楠岃瘉鐮?
 	verifyCodeErr := l.VerifyCode(data.Mobile, data.Code)
 	if verifyCodeErr != nil {
 		return nil, verifyCodeErr
 	}
 
-	// 校验三要素
+	// 鏍￠獙涓夎绱?
 	verifyErr := l.Verify(data.Name, data.IDCard, data.Mobile)
 	if verifyErr != nil {
 		return nil, verifyErr
 	}
 
-	// 缓存
+	// 缂撳瓨
 	params := map[string]interface{}{
 		"name":    data.Name,
 		"id_card": data.IDCard,
 		"mobile":  data.Mobile,
 	}
-    userID, userType, err := l.GetOrCreateUser()
-    if err != nil {
-        return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 处理用户失败: %v", err)
-    }
+	userID, err := l.GetOrCreateUser()
+	if err != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 澶勭悊鐢ㄦ埛澶辫触: %v", err)
+	}
 	cacheNo, cacheDataErr := l.CacheData(params, "homeservice", userID)
 	if cacheDataErr != nil {
 		return nil, cacheDataErr
 	}
 
-    token, err := l.svcCtx.UserService.GeneralUserToken(l.ctx, userID, userType)
+	token, err := l.svcCtx.UserService.GeneralUserToken(l.ctx, userID)
 	if err != nil {
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 生成token失败 : %d", userID)
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 鐢熸垚token澶辫触 : %d", userID)
 	}
 
-	// 获取当前时间戳
+	// 鑾峰彇褰撳墠鏃堕棿鎴?
 	now := time.Now().Unix()
 	return &types.QueryServiceResp{
 		Id:           cacheNo,
@@ -184,58 +183,58 @@ func (l *QueryServiceLogic) ProcessHomeServiceLogic(req *types.QueryServiceReq)
 	}, nil
 }
 
-// 处理风险评估相关逻辑
+// 澶勭悊椋庨櫓璇勪及鐩稿叧閫昏緫
 func (l *QueryServiceLogic) ProcessRiskAssessmentLogic(req *types.QueryServiceReq) (*types.QueryServiceResp, error) {
 
-	// AES解密
+	// AES瑙ｅ瘑
 	decryptData, DecryptDataErr := l.DecryptData(req.Data)
 	if DecryptDataErr != nil {
 		return nil, DecryptDataErr
 	}
 
-	// 校验参数
+	// 鏍￠獙鍙傛暟
 	var data types.RiskAssessmentReq
 	if unmarshalErr := json.Unmarshal(decryptData, &data); unmarshalErr != nil {
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 解密后的数据格式不正确: %+v", unmarshalErr)
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 瑙ｅ瘑鍚庣殑鏁版嵁鏍煎紡涓嶆纭? %+v", unmarshalErr)
 	}
 
 	if validatorErr := validator.Validate(data); validatorErr != nil {
-		return nil, errors.Wrapf(xerr.NewErrCodeMsg(xerr.PARAM_VERIFICATION_ERROR, validatorErr.Error()), "查询服务, 参数不正确: %+v", validatorErr)
+		return nil, errors.Wrapf(xerr.NewErrCodeMsg(xerr.PARAM_VERIFICATION_ERROR, validatorErr.Error()), "鏌ヨ鏈嶅姟, 鍙傛暟涓嶆纭? %+v", validatorErr)
 	}
 
-	// 校验验证码
+	// 鏍￠獙楠岃瘉鐮?
 	verifyCodeErr := l.VerifyCode(data.Mobile, data.Code)
 	if verifyCodeErr != nil {
 		return nil, verifyCodeErr
 	}
 
-	// 校验三要素
+	// 鏍￠獙涓夎绱?
 	verifyErr := l.Verify(data.Name, data.IDCard, data.Mobile)
 	if verifyErr != nil {
 		return nil, verifyErr
 	}
 
-	// 缓存
+	// 缂撳瓨
 	params := map[string]interface{}{
 		"name":    data.Name,
 		"id_card": data.IDCard,
 		"mobile":  data.Mobile,
 	}
-    userID, userType, err := l.GetOrCreateUser()
-    if err != nil {
-        return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 处理用户失败: %v", err)
-    }
+	userID, err := l.GetOrCreateUser()
+	if err != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 澶勭悊鐢ㄦ埛澶辫触: %v", err)
+	}
 	cacheNo, cacheDataErr := l.CacheData(params, "riskassessment", userID)
 	if cacheDataErr != nil {
 		return nil, cacheDataErr
 	}
 
-    token, err := l.svcCtx.UserService.GeneralUserToken(l.ctx, userID, userType)
+	token, err := l.svcCtx.UserService.GeneralUserToken(l.ctx, userID)
 	if err != nil {
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 生成token失败 : %d", userID)
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 鐢熸垚token澶辫触 : %d", userID)
 	}
 
-	// 获取当前时间戳
+	// 鑾峰彇褰撳墠鏃堕棿鎴?
 	now := time.Now().Unix()
 	return &types.QueryServiceResp{
 		Id:           cacheNo,
@@ -245,57 +244,57 @@ func (l *QueryServiceLogic) ProcessRiskAssessmentLogic(req *types.QueryServiceRe
 	}, nil
 }
 
-// 处理公司信息查询相关逻辑
+// 澶勭悊鍏徃淇℃伅鏌ヨ鐩稿叧閫昏緫
 func (l *QueryServiceLogic) ProcessCompanyInfoLogic(req *types.QueryServiceReq) (*types.QueryServiceResp, error) {
-	// AES解密
+	// AES瑙ｅ瘑
 	decryptData, DecryptDataErr := l.DecryptData(req.Data)
 	if DecryptDataErr != nil {
 		return nil, DecryptDataErr
 	}
 
-	// 校验参数
+	// 鏍￠獙鍙傛暟
 	var data types.CompanyInfoReq
 	if unmarshalErr := json.Unmarshal(decryptData, &data); unmarshalErr != nil {
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 解密后的数据格式不正确: %+v", unmarshalErr)
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 瑙ｅ瘑鍚庣殑鏁版嵁鏍煎紡涓嶆纭? %+v", unmarshalErr)
 	}
 
 	if validatorErr := validator.Validate(data); validatorErr != nil {
-		return nil, errors.Wrapf(xerr.NewErrCodeMsg(xerr.PARAM_VERIFICATION_ERROR, validatorErr.Error()), "查询服务, 参数不正确: %+v", validatorErr)
+		return nil, errors.Wrapf(xerr.NewErrCodeMsg(xerr.PARAM_VERIFICATION_ERROR, validatorErr.Error()), "鏌ヨ鏈嶅姟, 鍙傛暟涓嶆纭? %+v", validatorErr)
 	}
 
-	// 校验验证码
+	// 鏍￠獙楠岃瘉鐮?
 	verifyCodeErr := l.VerifyCode(data.Mobile, data.Code)
 	if verifyCodeErr != nil {
 		return nil, verifyCodeErr
 	}
 
-	// 校验三要素
+	// 鏍￠獙涓夎绱?
 	verifyErr := l.Verify(data.Name, data.IDCard, data.Mobile)
 	if verifyErr != nil {
 		return nil, verifyErr
 	}
 
-	// 缓存
+	// 缂撳瓨
 	params := map[string]interface{}{
 		"name":    data.Name,
 		"id_card": data.IDCard,
 		"mobile":  data.Mobile,
 	}
-    userID, userType, err := l.GetOrCreateUser()
-    if err != nil {
-        return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 处理用户失败: %v", err)
-    }
+	userID, err := l.GetOrCreateUser()
+	if err != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 澶勭悊鐢ㄦ埛澶辫触: %v", err)
+	}
 	cacheNo, cacheDataErr := l.CacheData(params, "companyinfo", userID)
 	if cacheDataErr != nil {
 		return nil, cacheDataErr
 	}
 
-    token, err := l.svcCtx.UserService.GeneralUserToken(l.ctx, userID, userType)
+	token, err := l.svcCtx.UserService.GeneralUserToken(l.ctx, userID)
 	if err != nil {
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 生成token失败 : %d", userID)
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 鐢熸垚token澶辫触 : %d", userID)
 	}
 
-	// 获取当前时间戳
+	// 鑾峰彇褰撳墠鏃堕棿鎴?
 	now := time.Now().Unix()
 	return &types.QueryServiceResp{
 		Id:           cacheNo,
@@ -305,58 +304,58 @@ func (l *QueryServiceLogic) ProcessCompanyInfoLogic(req *types.QueryServiceReq)
 	}, nil
 }
 
-// 处理租赁信息查询相关逻辑
+// 澶勭悊绉熻祦淇℃伅鏌ヨ鐩稿叧閫昏緫
 func (l *QueryServiceLogic) ProcessRentalInfoLogic(req *types.QueryServiceReq) (*types.QueryServiceResp, error) {
 
-	// AES解密
+	// AES瑙ｅ瘑
 	decryptData, DecryptDataErr := l.DecryptData(req.Data)
 	if DecryptDataErr != nil {
 		return nil, DecryptDataErr
 	}
 
-	// 校验参数
+	// 鏍￠獙鍙傛暟
 	var data types.RentalInfoReq
 	if unmarshalErr := json.Unmarshal(decryptData, &data); unmarshalErr != nil {
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 解密后的数据格式不正确: %+v", unmarshalErr)
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 瑙ｅ瘑鍚庣殑鏁版嵁鏍煎紡涓嶆纭? %+v", unmarshalErr)
 	}
 
 	if validatorErr := validator.Validate(data); validatorErr != nil {
-		return nil, errors.Wrapf(xerr.NewErrCodeMsg(xerr.PARAM_VERIFICATION_ERROR, validatorErr.Error()), "查询服务, 参数不正确: %+v", validatorErr)
+		return nil, errors.Wrapf(xerr.NewErrCodeMsg(xerr.PARAM_VERIFICATION_ERROR, validatorErr.Error()), "鏌ヨ鏈嶅姟, 鍙傛暟涓嶆纭? %+v", validatorErr)
 	}
 
-	// 校验验证码
+	// 鏍￠獙楠岃瘉鐮?
 	verifyCodeErr := l.VerifyCode(data.Mobile, data.Code)
 	if verifyCodeErr != nil {
 		return nil, verifyCodeErr
 	}
 
-	// 校验三要素
+	// 鏍￠獙涓夎绱?
 	verifyErr := l.Verify(data.Name, data.IDCard, data.Mobile)
 	if verifyErr != nil {
 		return nil, verifyErr
 	}
 
-	// 缓存
+	// 缂撳瓨
 	params := map[string]interface{}{
 		"name":    data.Name,
 		"id_card": data.IDCard,
 		"mobile":  data.Mobile,
 	}
-    userID, userType, err := l.GetOrCreateUser()
-    if err != nil {
-        return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 处理用户失败: %v", err)
-    }
+	userID, err := l.GetOrCreateUser()
+	if err != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 澶勭悊鐢ㄦ埛澶辫触: %v", err)
+	}
 	cacheNo, cacheDataErr := l.CacheData(params, "rentalinfo", userID)
 	if cacheDataErr != nil {
 		return nil, cacheDataErr
 	}
 
-    token, err := l.svcCtx.UserService.GeneralUserToken(l.ctx, userID, userType)
+	token, err := l.svcCtx.UserService.GeneralUserToken(l.ctx, userID)
 	if err != nil {
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 生成token失败 : %d", userID)
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 鐢熸垚token澶辫触 : %d", userID)
 	}
 
-	// 获取当前时间戳
+	// 鑾峰彇褰撳墠鏃堕棿鎴?
 	now := time.Now().Unix()
 	return &types.QueryServiceResp{
 		Id:           cacheNo,
@@ -366,58 +365,58 @@ func (l *QueryServiceLogic) ProcessRentalInfoLogic(req *types.QueryServiceReq) (
 	}, nil
 }
 
-// 处理贷前背景检查相关逻辑
+// 澶勭悊璐峰墠鑳屾櫙妫€鏌ョ浉鍏抽€昏緫
 func (l *QueryServiceLogic) ProcessPreLoanBackgroundCheckLogic(req *types.QueryServiceReq) (*types.QueryServiceResp, error) {
 
-	// AES解密
+	// AES瑙ｅ瘑
 	decryptData, DecryptDataErr := l.DecryptData(req.Data)
 	if DecryptDataErr != nil {
 		return nil, DecryptDataErr
 	}
 
-	// 校验参数
+	// 鏍￠獙鍙傛暟
 	var data types.PreLoanBackgroundCheckReq
 	if unmarshalErr := json.Unmarshal(decryptData, &data); unmarshalErr != nil {
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 解密后的数据格式不正确: %+v", unmarshalErr)
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 瑙ｅ瘑鍚庣殑鏁版嵁鏍煎紡涓嶆纭? %+v", unmarshalErr)
 	}
 
 	if validatorErr := validator.Validate(data); validatorErr != nil {
-		return nil, errors.Wrapf(xerr.NewErrCodeMsg(xerr.PARAM_VERIFICATION_ERROR, validatorErr.Error()), "查询服务, 参数不正确: %+v", validatorErr)
+		return nil, errors.Wrapf(xerr.NewErrCodeMsg(xerr.PARAM_VERIFICATION_ERROR, validatorErr.Error()), "鏌ヨ鏈嶅姟, 鍙傛暟涓嶆纭? %+v", validatorErr)
 	}
 
-	// 校验验证码
+	// 鏍￠獙楠岃瘉鐮?
 	verifyCodeErr := l.VerifyCode(data.Mobile, data.Code)
 	if verifyCodeErr != nil {
 		return nil, verifyCodeErr
 	}
 
-	// 校验三要素
+	// 鏍￠獙涓夎绱?
 	verifyErr := l.Verify(data.Name, data.IDCard, data.Mobile)
 	if verifyErr != nil {
 		return nil, verifyErr
 	}
 
-	// 缓存
+	// 缂撳瓨
 	params := map[string]interface{}{
 		"name":    data.Name,
 		"id_card": data.IDCard,
 		"mobile":  data.Mobile,
 	}
-    userID, userType, err := l.GetOrCreateUser()
-    if err != nil {
-        return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 处理用户失败: %v", err)
-    }
+	userID, err := l.GetOrCreateUser()
+	if err != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 澶勭悊鐢ㄦ埛澶辫触: %v", err)
+	}
 	cacheNo, cacheDataErr := l.CacheData(params, "preloanbackgroundcheck", userID)
 	if cacheDataErr != nil {
 		return nil, cacheDataErr
 	}
 
-    token, err := l.svcCtx.UserService.GeneralUserToken(l.ctx, userID, userType)
+	token, err := l.svcCtx.UserService.GeneralUserToken(l.ctx, userID)
 	if err != nil {
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 生成token失败 : %d", userID)
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 鐢熸垚token澶辫触 : %d", userID)
 	}
 
-	// 获取当前时间戳
+	// 鑾峰彇褰撳墠鏃堕棿鎴?
 	now := time.Now().Unix()
 	return &types.QueryServiceResp{
 		Id:           cacheNo,
@@ -427,57 +426,57 @@ func (l *QueryServiceLogic) ProcessPreLoanBackgroundCheckLogic(req *types.QueryS
 	}, nil
 }
 
-// 处理人事背调相关逻辑
+// 澶勭悊浜轰簨鑳岃皟鐩稿叧閫昏緫
 func (l *QueryServiceLogic) ProcessBackgroundCheckLogic(req *types.QueryServiceReq) (*types.QueryServiceResp, error) {
-	// AES解密
+	// AES瑙ｅ瘑
 	decryptData, DecryptDataErr := l.DecryptData(req.Data)
 	if DecryptDataErr != nil {
 		return nil, DecryptDataErr
 	}
 
-	// 校验参数
+	// 鏍￠獙鍙傛暟
 	var data types.BackgroundCheckReq
 	if unmarshalErr := json.Unmarshal(decryptData, &data); unmarshalErr != nil {
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 解密后的数据格式不正确: %+v", unmarshalErr)
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 瑙ｅ瘑鍚庣殑鏁版嵁鏍煎紡涓嶆纭? %+v", unmarshalErr)
 	}
 
 	if validatorErr := validator.Validate(data); validatorErr != nil {
-		return nil, errors.Wrapf(xerr.NewErrCodeMsg(xerr.PARAM_VERIFICATION_ERROR, validatorErr.Error()), "查询服务, 参数不正确: %+v", validatorErr)
+		return nil, errors.Wrapf(xerr.NewErrCodeMsg(xerr.PARAM_VERIFICATION_ERROR, validatorErr.Error()), "鏌ヨ鏈嶅姟, 鍙傛暟涓嶆纭? %+v", validatorErr)
 	}
 
-	// 校验验证码
+	// 鏍￠獙楠岃瘉鐮?
 	verifyCodeErr := l.VerifyCode(data.Mobile, data.Code)
 	if verifyCodeErr != nil {
 		return nil, verifyCodeErr
 	}
 
-	// 校验三要素
+	// 鏍￠獙涓夎绱?
 	verifyErr := l.Verify(data.Name, data.IDCard, data.Mobile)
 	if verifyErr != nil {
 		return nil, verifyErr
 	}
 
-	// 缓存
+	// 缂撳瓨
 	params := map[string]interface{}{
 		"name":    data.Name,
 		"id_card": data.IDCard,
 		"mobile":  data.Mobile,
 	}
-    userID, userType, err := l.GetOrCreateUser()
-    if err != nil {
-        return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 处理用户失败: %v", err)
-    }
+	userID, err := l.GetOrCreateUser()
+	if err != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 澶勭悊鐢ㄦ埛澶辫触: %v", err)
+	}
 	cacheNo, cacheDataErr := l.CacheData(params, "backgroundcheck", userID)
 	if cacheDataErr != nil {
 		return nil, cacheDataErr
 	}
 
-    token, err := l.svcCtx.UserService.GeneralUserToken(l.ctx, userID, userType)
+	token, err := l.svcCtx.UserService.GeneralUserToken(l.ctx, userID)
 	if err != nil {
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 生成token失败 : %d", userID)
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 鐢熸垚token澶辫触 : %d", userID)
 	}
 
-	// 获取当前时间戳
+	// 鑾峰彇褰撳墠鏃堕棿鎴?
 	now := time.Now().Unix()
 	return &types.QueryServiceResp{
 		Id:           cacheNo,
@@ -487,55 +486,55 @@ func (l *QueryServiceLogic) ProcessBackgroundCheckLogic(req *types.QueryServiceR
 	}, nil
 }
 func (l *QueryServiceLogic) ProcessPersonalDataLogic(req *types.QueryServiceReq) (*types.QueryServiceResp, error) {
-	// AES解密
+	// AES瑙ｅ瘑
 	decryptData, DecryptDataErr := l.DecryptData(req.Data)
 	if DecryptDataErr != nil {
 		return nil, DecryptDataErr
 	}
 
-	// 校验参数
+	// 鏍￠獙鍙傛暟
 	var data types.PersonalDataReq
 	if unmarshalErr := json.Unmarshal(decryptData, &data); unmarshalErr != nil {
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 解密后的数据格式不正确: %+v", unmarshalErr)
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 瑙ｅ瘑鍚庣殑鏁版嵁鏍煎紡涓嶆纭? %+v", unmarshalErr)
 	}
 
 	if validatorErr := validator.Validate(data); validatorErr != nil {
-		return nil, errors.Wrapf(xerr.NewErrCodeMsg(xerr.PARAM_VERIFICATION_ERROR, validatorErr.Error()), "查询服务, 参数不正确: %+v", validatorErr)
+		return nil, errors.Wrapf(xerr.NewErrCodeMsg(xerr.PARAM_VERIFICATION_ERROR, validatorErr.Error()), "鏌ヨ鏈嶅姟, 鍙傛暟涓嶆纭? %+v", validatorErr)
 	}
 
-	// 校验验证码
+	// 鏍￠獙楠岃瘉鐮?
 	verifyCodeErr := l.VerifyCode(data.Mobile, data.Code)
 	if verifyCodeErr != nil {
 		return nil, verifyCodeErr
 	}
 
-	// 校验三要素
+	// 鏍￠獙涓夎绱?
 	verifyErr := l.Verify(data.Name, data.IDCard, data.Mobile)
 	if verifyErr != nil {
 		return nil, verifyErr
 	}
 
-	// 缓存
+	// 缂撳瓨
 	params := map[string]interface{}{
 		"name":    data.Name,
 		"id_card": data.IDCard,
 		"mobile":  data.Mobile,
 	}
-    userID, userType, err := l.GetOrCreateUser()
-    if err != nil {
-        return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 处理用户失败: %v", err)
-    }
+	userID, err := l.GetOrCreateUser()
+	if err != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 澶勭悊鐢ㄦ埛澶辫触: %v", err)
+	}
 	cacheNo, cacheDataErr := l.CacheData(params, "personalData", userID)
 	if cacheDataErr != nil {
 		return nil, cacheDataErr
 	}
 
-    token, err := l.svcCtx.UserService.GeneralUserToken(l.ctx, userID, userType)
+	token, err := l.svcCtx.UserService.GeneralUserToken(l.ctx, userID)
 	if err != nil {
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 生成token失败 : %d", userID)
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 鐢熸垚token澶辫触 : %d", userID)
 	}
 
-	// 获取当前时间戳
+	// 鑾峰彇褰撳墠鏃堕棿鎴?
 	now := time.Now().Unix()
 	return &types.QueryServiceResp{
 		Id:           cacheNo,
@@ -545,55 +544,55 @@ func (l *QueryServiceLogic) ProcessPersonalDataLogic(req *types.QueryServiceReq)
 	}, nil
 }
 func (l *QueryServiceLogic) ProcessConsumerFinanceReportLogic(req *types.QueryServiceReq) (*types.QueryServiceResp, error) {
-	// AES解密
+	// AES瑙ｅ瘑
 	decryptData, DecryptDataErr := l.DecryptData(req.Data)
 	if DecryptDataErr != nil {
 		return nil, DecryptDataErr
 	}
 
-	// 校验参数
+	// 鏍￠獙鍙傛暟
 	var data types.ConsumerFinanceReportReq
 	if unmarshalErr := json.Unmarshal(decryptData, &data); unmarshalErr != nil {
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 解密后的数据格式不正确: %+v", unmarshalErr)
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 瑙ｅ瘑鍚庣殑鏁版嵁鏍煎紡涓嶆纭? %+v", unmarshalErr)
 	}
 
 	if validatorErr := validator.Validate(data); validatorErr != nil {
-		return nil, errors.Wrapf(xerr.NewErrCodeMsg(xerr.PARAM_VERIFICATION_ERROR, validatorErr.Error()), "查询服务, 参数不正确: %+v", validatorErr)
+		return nil, errors.Wrapf(xerr.NewErrCodeMsg(xerr.PARAM_VERIFICATION_ERROR, validatorErr.Error()), "鏌ヨ鏈嶅姟, 鍙傛暟涓嶆纭? %+v", validatorErr)
 	}
 
-	// 校验验证码
+	// 鏍￠獙楠岃瘉鐮?
 	verifyCodeErr := l.VerifyCode(data.Mobile, data.Code)
 	if verifyCodeErr != nil {
 		return nil, verifyCodeErr
 	}
 
-	// 校验三要素
+	// 鏍￠獙涓夎绱?
 	verifyErr := l.Verify(data.Name, data.IDCard, data.Mobile)
 	if verifyErr != nil {
 		return nil, verifyErr
 	}
 
-	// 缓存
+	// 缂撳瓨
 	params := map[string]interface{}{
 		"name":    data.Name,
 		"id_card": data.IDCard,
 		"mobile":  data.Mobile,
 	}
-    userID, userType, err := l.GetOrCreateUser()
-    if err != nil {
-        return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 处理用户失败: %v", err)
-    }
+	userID, err := l.GetOrCreateUser()
+	if err != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 澶勭悊鐢ㄦ埛澶辫触: %v", err)
+	}
 	cacheNo, cacheDataErr := l.CacheData(params, "consumerFinanceReport", userID)
 	if cacheDataErr != nil {
 		return nil, cacheDataErr
 	}
 
-    token, err := l.svcCtx.UserService.GeneralUserToken(l.ctx, userID, userType)
+	token, err := l.svcCtx.UserService.GeneralUserToken(l.ctx, userID)
 	if err != nil {
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 生成token失败 : %d", userID)
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 鐢熸垚token澶辫触 : %d", userID)
 	}
 
-	// 获取当前时间戳
+	// 鑾峰彇褰撳墠鏃堕棿鎴?
 	now := time.Now().Unix()
 	return &types.QueryServiceResp{
 		Id:           cacheNo,
@@ -606,43 +605,43 @@ func (l *QueryServiceLogic) DecryptData(data string) ([]byte, error) {
 	secretKey := l.svcCtx.Config.Encrypt.SecretKey
 	key, decodeErr := hex.DecodeString(secretKey)
 	if decodeErr != nil {
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "密钥获取失败: %+v", decodeErr)
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "瀵嗛挜鑾峰彇澶辫触: %+v", decodeErr)
 	}
 	decryptData, aesDecryptErr := crypto.AesDecrypt(data, key)
 	if aesDecryptErr != nil || len(decryptData) == 0 {
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "解密失败: %+v", aesDecryptErr)
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "瑙ｅ瘑澶辫触: %+v", aesDecryptErr)
 	}
 	return decryptData, nil
 }
 
-// 校验验证码
+// 鏍￠獙楠岃瘉鐮?
 func (l *QueryServiceLogic) VerifyCode(mobile string, code string) error {
-	// 开发环境下跳过验证码校验
+	// 寮€鍙戠幆澧冧笅璺宠繃楠岃瘉鐮佹牎楠?
 	if os.Getenv("ENV") == "development" {
 		return nil
 	}
 	secretKey := l.svcCtx.Config.Encrypt.SecretKey
 	encryptedMobile, err := crypto.EncryptMobile(mobile, secretKey)
 	if err != nil {
-		return errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "加密手机号失败: %+v", err)
+		return errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鍔犲瘑鎵嬫満鍙峰け璐? %+v", err)
 	}
 	codeRedisKey := fmt.Sprintf("%s:%s", "query", encryptedMobile)
 	cacheCode, err := l.svcCtx.Redis.Get(codeRedisKey)
 	if err != nil {
 		if errors.Is(err, redis.Nil) {
-			return errors.Wrapf(xerr.NewErrMsg("验证码已过期"), "验证码过期: %s", mobile)
+			return errors.Wrapf(xerr.NewErrMsg("楠岃瘉鐮佸凡杩囨湡"), "楠岃瘉鐮佽繃鏈? %s", mobile)
 		}
-		return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "读取验证码redis缓存失败, mobile: %s, err: %+v", mobile, err)
+		return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "璇诲彇楠岃瘉鐮乺edis缂撳瓨澶辫触, mobile: %s, err: %+v", mobile, err)
 	}
 	if cacheCode != code {
-		return errors.Wrapf(xerr.NewErrMsg("验证码不正确"), "验证码不正确: %s", mobile)
+		return errors.Wrapf(xerr.NewErrMsg("楠岃瘉鐮佷笉姝ｇ‘"), "楠岃瘉鐮佷笉姝ｇ‘: %s", mobile)
 	}
 	return nil
 }
 
-// 二、三要素验证
+// 浜屻€佷笁瑕佺礌楠岃瘉
 func (l *QueryServiceLogic) Verify(Name string, IDCard string, Mobile string) error {
-	// 开发环境下跳过二/三要素验证
+	// 寮€鍙戠幆澧冧笅璺宠繃浜?涓夎绱犻獙璇?
 	if os.Getenv("ENV") == "development" {
 		return nil
 	}
@@ -653,13 +652,13 @@ func (l *QueryServiceLogic) Verify(Name string, IDCard string, Mobile string) er
 		}
 		verification, err := l.svcCtx.VerificationService.TwoFactorVerification(twoVerification)
 		if err != nil {
-			return errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "二要素验证失败: %v", err)
+			return errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "浜岃绱犻獙璇佸け璐? %v", err)
 		}
 		if !verification.Passed {
-			return errors.Wrapf(xerr.NewErrCodeMsg(xerr.SERVER_COMMON_ERROR, verification.Err.Error()), "二要素验证不通过: %v", err)
+			return errors.Wrapf(xerr.NewErrCodeMsg(xerr.SERVER_COMMON_ERROR, verification.Err.Error()), "浜岃绱犻獙璇佷笉閫氳繃: %v", err)
 		}
 	} else {
-		// 三要素验证
+		// 涓夎绱犻獙璇?
 		threeVerification := service.ThreeFactorVerificationRequest{
 			Name:   Name,
 			IDCard: IDCard,
@@ -667,30 +666,30 @@ func (l *QueryServiceLogic) Verify(Name string, IDCard string, Mobile string) er
 		}
 		verification, err := l.svcCtx.VerificationService.ThreeFactorVerification(threeVerification)
 		if err != nil {
-			return errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "三要素验证失败: %v", err)
+			return errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "涓夎绱犻獙璇佸け璐? %v", err)
 		}
 		if !verification.Passed {
-			return errors.Wrapf(xerr.NewErrCodeMsg(xerr.SERVER_COMMON_ERROR, verification.Err.Error()), "三要素验证不通过: %v", err)
+			return errors.Wrapf(xerr.NewErrCodeMsg(xerr.SERVER_COMMON_ERROR, verification.Err.Error()), "涓夎绱犻獙璇佷笉閫氳繃: %v", err)
 		}
 	}
 	return nil
 }
 
-// 缓存
+// 缂撳瓨
 func (l *QueryServiceLogic) CacheData(params map[string]interface{}, Product string, userID string) (string, error) {
 	agentIdentifier, _ := l.ctx.Value("agentIdentifier").(string)
 	secretKey := l.svcCtx.Config.Encrypt.SecretKey
 	key, decodeErr := hex.DecodeString(secretKey)
 	if decodeErr != nil {
-		return "", errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 获取AES密钥失败: %+v", decodeErr)
+		return "", errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 鑾峰彇AES瀵嗛挜澶辫触: %+v", decodeErr)
 	}
 	paramsMarshal, marshalErr := json.Marshal(params)
 	if marshalErr != nil {
-		return "", errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 序列化参数失败: %+v", marshalErr)
+		return "", errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 搴忓垪鍖栧弬鏁板け璐? %+v", marshalErr)
 	}
 	encryptParams, aesEncryptErr := crypto.AesEncrypt(paramsMarshal, key)
 	if aesEncryptErr != nil {
-		return "", errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 加密参数失败: %+v", aesEncryptErr)
+		return "", errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 鍔犲瘑鍙傛暟澶辫触: %+v", aesEncryptErr)
 	}
 	queryCache := types.QueryCacheLoad{
 		Params:          encryptParams,
@@ -699,7 +698,7 @@ func (l *QueryServiceLogic) CacheData(params map[string]interface{}, Product str
 	}
 	jsonData, marshalErr := json.Marshal(queryCache)
 	if marshalErr != nil {
-		return "", errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 序列化参数失败: %+v", marshalErr)
+		return "", errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 搴忓垪鍖栧弬鏁板け璐? %+v", marshalErr)
 	}
 	outTradeNo := "Q_" + l.svcCtx.AlipayService.GenerateOutTradeNo()
 	redisKey := fmt.Sprintf(types.QueryCacheKey, userID, outTradeNo)
@@ -710,18 +709,18 @@ func (l *QueryServiceLogic) CacheData(params map[string]interface{}, Product str
 	return outTradeNo, nil
 }
 
-// GetOrCreateUser 获取或创建用户
-// 1. 如果上下文中已有用户ID，直接返回
-// 2. 如果是代理查询或APP请求，创建新用户
-// 3. 其他情况返回未登录错误
-func (l *QueryServiceLogic) GetOrCreateUser() (string, int64, error) {
-    claims, err := ctxdata.GetClaimsFromCtx(l.ctx)
-    if err == nil && claims != nil {
-        return claims.UserId, claims.UserType, nil
-    }
-    userID, regErr := l.svcCtx.UserService.RegisterUUIDUser(l.ctx)
-    if regErr != nil {
-        return "", 0, regErr
-    }
-    return userID, model.UserTypeTemp, nil
+// GetOrCreateUser 鑾峰彇鎴栧垱寤虹敤鎴?
+// 1. 濡傛灉涓婁笅鏂囦腑宸叉湁鐢ㄦ埛ID锛岀洿鎺ヨ繑鍥?
+// 2. 濡傛灉鏄唬鐞嗘煡璇㈡垨APP璇锋眰锛屽垱寤烘柊鐢ㄦ埛
+// 3. 鍏朵粬鎯呭喌杩斿洖鏈櫥褰曢敊璇?
+func (l *QueryServiceLogic) GetOrCreateUser() (string, error) {
+	claims, err := ctxdata.GetClaimsFromCtx(l.ctx)
+	if err == nil && claims != nil {
+		return claims.UserId, nil
+	}
+	userID, regErr := l.svcCtx.UserService.RegisterUUIDUser(l.ctx)
+	if regErr != nil {
+		return "", regErr
+	}
+	return userID, nil
 }