From a849ebc34f1c9d83bff59716fe649cd463d38c01 Mon Sep 17 00:00:00 2001
From: liangzai <2440983361@qq.com>
Date: Thu, 7 Aug 2025 01:15:42 +0800
Subject: [PATCH] fix

---
 app/main/api/etc/main.dev.yaml                | 10 +--
 .../api/internal/logic/pay/paymentlogic.go    |  2 +-
 .../internal/logic/query/queryservicelogic.go | 63 ++++++++++++++++++-
 3 files changed, 67 insertions(+), 8 deletions(-)

diff --git a/app/main/api/etc/main.dev.yaml b/app/main/api/etc/main.dev.yaml
index a0570da..3c73d81 100644
--- a/app/main/api/etc/main.dev.yaml
+++ b/app/main/api/etc/main.dev.yaml
@@ -20,9 +20,9 @@ VerifyCode:
 Encrypt:
     SecretKey: "ff83609b2b24fc73196aac3d3dfb874f"
 Alipay:
-    AppID: "2021005113664540"
-    PrivateKey: "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCA1mtTVZmB/7/wWV37Z8hUXEXFs0Gn1/Ie7c6rPQQRUlPHyJGcPAZvDii+ySC1/bplneMENRAjCuoJEM1z4X1FMt8rLggCqnF1xzUN2p9fdXUwcRPmSV4yi9ggMiFXldm0/eyaobV2fj0/VSLED2Qc8xBStM9pqkfszwf2rsAAKL15WQXOUiQw0s25s+Du18H4+YgkQ0HBr0+VPfhL4QoOvsE34ZYP0TuTwxVheYNkvSOPXFXmtE3z/b+75y2n2msa9S4HItNVYpOkB7z3GDB+0/rvX+Q+GvYI9BSBbgJwEuqiMN2SwQyAjH608JBoAUGnk0ygfG8juF77shBxzr/vAgMBAAECggEAQTlL2EJrlm59IxZ7B72Ao4SbJf0b7fba8mF90R7wojxFgcy+OpQAxdQrOHrl/nxXEv6dYRHj+3mZBcHl4RZ0rsWUSW3iTEcxbWjOKRdWu6LhEwcMBfd6oqg9X/9A9fA86O3sDFR1Y2mBZECbexo3mphK2TQEFQBJrU8aPv404V784u0wTh1oLO0Z3NjgvXOAy3ZsM64oZROVCkObXnZGyrY8Hf6W+YLmCoI7eajOQ9QTFy1x24fm8LFdWNizG9/DFa4EC7ZjiYzFhGpfpKb4964QnN3Krlf18Ryhgf3PO6IDO04JOdnHLKhR8+kHIN5m6AMIyKxbZ/vKw4X09Z8XoQKBgQD7jNHzEhIo4IOmRzgdoGxSCLXe1cUbwFL4tU3n7miUCYL/k6wpiNkCGwikaHMiSG0Om2D6+I9gX/rBrTrp2MAmcHA6ymn1GARSYMv7rz+5afGygfBDNr/7xQ2ASCatB65TObH+AUZzdq82B5dpr46AJhilRcHnQEyc/SyIelft2QKBgQCDHeDYt3vTDJ1vIPtXeyO1NHbGQY7cUucx3sZ+QVdF0abstcutT0LrHOgDCWFtnvjia1f0QRPDnTzUtq4GQxj63/9zZr1pMGsd7gjgIvVjM0LqUQXU0TMpO1DuU2zyemRyJTfWDDN+vTvA2+376cW0QxKq2CKOhX45WZRrUBbXBwKBgQCPVFe0ZlGOlQ6uSdpBl0zhGTF3vNpIy7b7G2M+ietwnlLUCXKJX/42YuzzsMgZeqcZMZN6rPIU+dtJS8lLwUMLI/nupbLmAj9EKP9RczOeFC2xhrQ9uA6ACHF+7J2M7dl4dmFi15sq4y9GW+D8SRmrDwnv8eVgPJTqxp7/TKaZUQKBgCMMI4QKV7DsWFDSMh0KL1tKcM1BzNwb1OzBrbEl6hwhlEsFtTHYU/zgtyvIoCBbNA/hvZruokfRiecaBZ5q5Qx6P6ArQEoTxS406G5xKcKgeyyDB9oBKXnF/zYVWrPd/2d7h1dR35nrH0PIBe8mZ9BtdVnxeBs8l6bgyQl+WPyVAoGBAPW7XxyLUAZ4X6JD4b5Iqq4E40xmDO3rUysrH8Zj7MN47ykZI0SlwA9B6hqliRLLJXkzhaAamecWb1RNJFDWfcg4bIyew4ukRbYB07RI+l0DXEgOxxTBcvN6BNUoIiQSEKXkOv+xt7Ez2TBoDm67xD58vwSXT4aPt4qxnd4i7Ves"
-    AlipayPublicKey: "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0kkRL7lgKYs7f8Xi4DNKzp2ggjwy4By7RunwT4Ur4A71HVOqRQed9r45a6/W4JPuVv51tiHMojZifEKX7ixSlDG6be677RiNslMJ5G3mjw/+Ku01tV9Qzw5YyhvxbqmS8Qp9vgL8VPYhxqTxKO6WW+xiyVvxko+mrU+dbSFIVbBjp88NVVcquu+vZT/uwtjriKSwsesAm8DkKT6mTqY5P/JroMzTU7xa3/ErAMte6t2dOsxPS7kqWjJyoLBHRk+AH87X5lNBEjLgYPk1ADU7zFsLdC+nv4fm7nihYre7fCrdCTVKguXmPCEFBjqwSkag7BSIxRQjS3qHxi+DUMst7wIDAQAB"
+    AppID: "2021005180646821"
+    PrivateKey: "MIIEowIBAAKCAQEAn2ieQfPxC/38hmXQvkoqLMVti8iXd6HkFu2nVpQg0DddfNtxV6Ii8pIRxKLKCBdrl43sT+inTAtUz5j9SdLts77qtF9UXQXiCryXVr593nN03MKmVHow9NzbN3tPWsW6XnxpLaPAHAjCloYFMiAvb9f/GvXhK9iwYcUXL6d1IsFSnDelbUruTUc9OLT/EhepMZO/RXQFExEfW0ou9eSJ29XGO3vBnBBzEYwhPi8VstnqpBOJIGNVMkGUqrbkMeGyRzp0eI2UxY46fiwbpYyuxyJKz2uAHowEsE7seu1YoJK3Zr0oG7S01xyX0zufq9JSM3EpmkIasDQVZ6SQmI8/fQIDAQABAoIBAHqmq0XBpRD+DmN2SWNwevzRtxTbdTd2F6JQnvVtqcWrI8JisdWkidEr9IHgYyRQqNcGOvHM55QKD+pfI1u+8GfhmILJ6oZcdWyfaK40iXI0UZFeL05Gag6tM/p/ZTJJerkibmbQXIr1bosUeUD1JKqgfcdHskXjRusjE1D2PplK/uS382M8eAoiJhcQGtZ6VJUU8EFNfLNkzuPQLGkafggvhfNWNqNmcvH6jWhfGi7Rlyrqm1TLwRHrFMy8JAxWMHxq19VXVH7E1DV8MKI0odJy7KQmPtrICmowtxcR4yaDv0Z+XbJJeGKoE9c9YG3MyGQyTxTA6UIsVTz7WgjgM90CgYEA47jl+X6rT268TYFdrcIdXfBwzO/5mqJluerzaFMLOowLA34rM67/S6PTzWpgXHF5VOD/FtgJWBm3vpO97AB0DDyig94LE9bncL1OY/WM+0+9uNDi7GUkvG2O7PWRWASPItOkiluY9WaOIWLWo0xnv7g8+ySphGuKSRtI9pT3748CgYEAszQWXlD7quDJJZ2xHg25WHZZcJVtbd9nMpDPZpIUnem+nb7H8lz+7SeFGu0shpa+4JoyeYZ2Ew9ZO2OVG+lOMDMZmeuoQs+6D1cSnh+h3EdbZV5QWdfMjy2UMZRpj7/EAlhO3xs/QcbkGKxTVyQJUwAfTdgXjHgvaI1HDOrKGjMCgYEA3IB2Vy8bbG/ab+YbMpwq2YJvh1G7TMuBWxQxG0yGK+vc4kXySTpjQ/ffqCEgK4NJLDItbw5DhgZpEGV42qPZutuftbZ03YITWuxDkrD7EYG2QNYrVSHe/4HKipKCaUsI2n067yogo0bpy1QsZ7UdJNyeV8S5TFrhbUa5UOMQbOsCgYBg6YBXTVBs3tepAhiw+hcMIiTIX+coDjMPA4VGISYJKEmvoWccSPKMalzvbOgxeQCNEpbNZcwhDqHhHj+bMpbYNipYNTtvtksW1K362Xx9VhG1RkYJ8Ext+eY00eAsnzZvVjaBLYkOF3NvbHI9o/1u55gGTyCdFLn+vrh34dmeRQKBgAVOB4qVJEu60/QGt7XlsSGks4xaW/aifQpjnCnKNfI5xT9L5XKLceG0T7rcADYGSbQwehqYOLOtAcVxZnJFPpxPVIczLHSk3KPeeKrHjQlUa7eUXOhDiVZG6lS0KIot9bJB2vFPhAynQjq8xM1X6issU6nICYrbUt9EMlBVCky/"
+    AlipayPublicKey: "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzTCyAakFo4JngoXBXjlRxmfXbJnaMUt8DDcL7ypBtlkxPozQ/UIYV6lyDmJXzEitXXEejOcrPytPigMlFFKonEhR+kOk8y1ELHjG1Xq45Z6Uxq40Eu8CRcD9PN49/dvzOORHuOJbwJSPst/JPjg72xLzf6BAe8Q2EK5EhRGaSXS981AQBMOfVfdha48rYv3E5NrwGRW97NEkOrkL/1IuZtqfk4l6yiBj7Rsaz+JMy6NPJZdh30txhDX8A4NhrGlI+pBttJWCvNzOEdsX06z5B+ppzWtwblCfuTWJi+2pXn9NWfL+fBCoqAIAlQtPCYIzlY+r43wgUgz/5xlvCFVaeQIDAQAB"
     AppCertPath: "etc/merchant/appCertPublicKey_2021005113664540.crt"
     AlipayCertPath: "etc/merchant/alipayCertPublicKey_RSA2.crt"
     AlipayRootCertPath: "etc/merchant/alipayRootCert.crt"
@@ -60,7 +60,7 @@ AdminConfig:
     AccessExpire: 604800
     RefreshAfter: 302400
 Tianyuanapi:
-    AccessID: "2974d99ddf0b91a7"
-    Key: "c701a573200f64d4ab38b0aa03ae56d2"
+    AccessID: "3c042bb99b240ccc"
+    Key: "2732f526167c2de9b8dc6aa0f24ba8b7"
     BaseURL: "https://api.tianyuanapi.com"
     Timeout: 60
\ No newline at end of file
diff --git a/app/main/api/internal/logic/pay/paymentlogic.go b/app/main/api/internal/logic/pay/paymentlogic.go
index c06388e..b04c5ec 100644
--- a/app/main/api/internal/logic/pay/paymentlogic.go
+++ b/app/main/api/internal/logic/pay/paymentlogic.go
@@ -100,7 +100,7 @@ func (l *PaymentLogic) QueryOrderPayment(req *types.PaymentReq, session sqlx.Ses
 	if err != nil {
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "生成订单, 获取用户信息失败: %v", err)
 	}
-
+	amount = product.SellPrice
 	if user.Inside == 1 {
 		amount = 0.01
 	}
diff --git a/app/main/api/internal/logic/query/queryservicelogic.go b/app/main/api/internal/logic/query/queryservicelogic.go
index 50bcbc9..3154b13 100644
--- a/app/main/api/internal/logic/query/queryservicelogic.go
+++ b/app/main/api/internal/logic/query/queryservicelogic.go
@@ -51,6 +51,7 @@ var productProcessors = map[string]func(*QueryServiceLogic, *types.QueryServiceR
 	"rentalinfo":                       (*QueryServiceLogic).ProcessRentalInfoLogic,
 	"preloanbackgroundcheck":           (*QueryServiceLogic).ProcessPreLoanBackgroundCheckLogic,
 	"backgroundcheck":                  (*QueryServiceLogic).ProcessBackgroundCheckLogic,
+	"comprehensive":                    (*QueryServiceLogic).ProcessComprehensiveLogic,
 	"toc_Marriage":                     (*QueryServiceLogic).ProcessTocMarriageLogic,
 	"toc_PersonalBadRecord":            (*QueryServiceLogic).ProcessTocPersonalBadRecordLogic,
 	"toc_ShareholderBusinessRelation":  (*QueryServiceLogic).ProcessTocShareholderBusinessRelationLogic,
@@ -501,7 +502,65 @@ func (l *QueryServiceLogic) ProcessBackgroundCheckLogic(req *types.QueryServiceR
 		RefreshAfter: now + l.svcCtx.Config.JwtAuth.RefreshAfter,
 	}, nil
 }
+func (l *QueryServiceLogic) ProcessComprehensiveLogic(req *types.QueryServiceReq) (*types.QueryServiceResp, error) {
 
+	// 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)
+	}
+
+	if validatorErr := validator.Validate(data); validatorErr != nil {
+		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, 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, model.UserTypeNormal)
+	if err != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 生成token失败 : %d", userID)
+	}
+
+	// 获取当前时间戳
+	now := time.Now().Unix()
+	return &types.QueryServiceResp{
+		Id:           cacheNo,
+		AccessToken:  token,
+		AccessExpire: now + l.svcCtx.Config.JwtAuth.AccessExpire,
+		RefreshAfter: now + l.svcCtx.Config.JwtAuth.RefreshAfter,
+	}, nil
+}
 func (l *QueryServiceLogic) ProcessTocMarriageLogic(req *types.QueryServiceReq) (*types.QueryServiceResp, error) {
 	userID, getUidErr := ctxdata.GetUidFromCtx(l.ctx)
 	if getUidErr != nil {
@@ -1363,8 +1422,8 @@ func (l *QueryServiceLogic) CacheData(params map[string]interface{}, Product str
 		return "", errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 加密参数失败: %+v", aesEncryptErr)
 	}
 	queryCache := types.QueryCacheLoad{
-		Params:          encryptParams,
-		Product:         Product,
+		Params:  encryptParams,
+		Product: Product,
 	}
 	jsonData, marshalErr := json.Marshal(queryCache)
 	if marshalErr != nil {