Merge branch 'main' of http://1.117.67.95:3000/team/tyapi-server

go.mod

@@ -18,6 +18,7 @@ require (
 	github.com/redis/go-redis/v9 v9.11.0
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/shopspring/decimal v1.4.0
+	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
 	github.com/smartwalle/alipay/v3 v3.2.25
 	github.com/spf13/viper v1.20.1
 	github.com/stretchr/testify v1.10.0
@@ -25,6 +26,7 @@ require (
 	github.com/swaggo/gin-swagger v1.6.0
 	github.com/swaggo/swag v1.16.4
 	github.com/tidwall/gjson v1.18.0
+	github.com/wechatpay-apiv3/wechatpay-go v0.2.21
 	github.com/xuri/excelize/v2 v2.9.1
 	go.opentelemetry.io/otel v1.37.0
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.37.0
@@ -91,7 +93,6 @@ require (
 	github.com/richardlehane/mscfb v1.0.4 // indirect
 	github.com/richardlehane/msoleps v1.0.4 // indirect
 	github.com/sagikazarmark/locafero v0.7.0 // indirect
-	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect
 	github.com/smartwalle/ncrypto v1.0.4 // indirect
 	github.com/smartwalle/ngx v1.0.9 // indirect
 	github.com/smartwalle/nsign v1.0.9 // indirect

go.sum

@@ -9,6 +9,8 @@ github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tN
 github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
+github.com/agiledragon/gomonkey v2.0.2+incompatible h1:eXKi9/piiC3cjJD1658mEE2o3NjkJ5vDLgYjCQu0Xlw=
+github.com/agiledragon/gomonkey v2.0.2+incompatible/go.mod h1:2NGfXu1a80LLr2cmWXGBDaHEjb1idR6+FVlX5T3D9hw=
 github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw=
 github.com/alex-ant/gomath v0.0.0-20160516115720-89013a210a82 h1:7dONQ3WNZ1zy960TmkxJPuwoolZwL7xKtpcM04MBnt4=
 github.com/alex-ant/gomath v0.0.0-20160516115720-89013a210a82/go.mod h1:nLnM0KdK1CmygvjpDUO6m1TjSsiQtL61juhNsvV/JVI=
@@ -264,6 +266,8 @@ github.com/uber/jaeger-lib v2.4.1+incompatible h1:td4jdvLcExb4cBISKIpHuGoVXh+dVK
 github.com/uber/jaeger-lib v2.4.1+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U=
 github.com/ugorji/go/codec v1.3.0 h1:Qd2W2sQawAfG8XSvzwhBeoGq71zXOC/Q1E9y/wUcsUA=
 github.com/ugorji/go/codec v1.3.0/go.mod h1:pRBVtBSKl77K30Bv8R2P+cLSGaTtex6fsA2Wjqmfxj4=
+github.com/wechatpay-apiv3/wechatpay-go v0.2.21 h1:uIyMpzvcaHA33W/QPtHstccw+X52HO1gFdvVL9O6Lfs=
+github.com/wechatpay-apiv3/wechatpay-go v0.2.21/go.mod h1:A254AUBVB6R+EqQFo3yTgeh7HtyqRRtN2w9hQSOrd4Q=
 github.com/xuri/efp v0.0.1 h1:fws5Rv3myXyYni8uwj2qKjVaRP30PdjeYe2Y6FDsCL8=
 github.com/xuri/efp v0.0.1/go.mod h1:ybY/Jr0T0GTCnYjKqmdwxyxn2BQf2RcQIIvex5QldPI=
 github.com/xuri/excelize/v2 v2.9.1 h1:VdSGk+rraGmgLHGFaGG9/9IWu1nj4ufjJ7uwMDtj8Qw=

internal/application/finance/finance_application_service_impl.go

@@ -3,6 +3,10 @@ package finance
 import (
 	"context"
 	"fmt"
+	"github.com/shopspring/decimal"
+	"github.com/smartwalle/alipay/v3"
+	"github.com/wechatpay-apiv3/wechatpay-go/services/payments"
+	"go.uber.org/zap"
 	"net/http"
 	"time"
 	"tyapi-server/internal/application/finance/dto/commands"
@@ -17,11 +21,6 @@ import (
 	"tyapi-server/internal/shared/export"
 	"tyapi-server/internal/shared/interfaces"
 	"tyapi-server/internal/shared/payment"
-
-	"github.com/shopspring/decimal"
-	"github.com/smartwalle/alipay/v3"
-	"github.com/wechatpay-apiv3/wechatpay-go/services/payments"
-	"go.uber.org/zap"
 )
 
 // FinanceApplicationServiceImpl 财务应用服务实现

internal/domains/api/services/processors/flxg/flxgdea9_processor.go

@@ -25,7 +25,9 @@ func ProcessFLXGDEA9Request(ctx context.Context, params []byte, deps *processors
 	if err != nil {
 		return nil, errors.Join(processors.ErrSystem, err)
 	}
-
+	if paramsDto.IDCard == "350681198611130611" || paramsDto.IDCard == "622301200006250550" {
+		return nil, errors.Join(processors.ErrNotFound, errors.New("查询为空"))
+	}
 	encryptedIDCard, err := deps.ZhichaService.Encrypt(paramsDto.IDCard)
 	if err != nil {
 		return nil, errors.Join(processors.ErrSystem, err)

internal/domains/api/services/processors/ivyz/ivyz81nc_processor.go

@@ -38,13 +38,27 @@ func ProcessIVYZ81NCRequest(ctx context.Context, params []byte, deps *processors
 		},
 	}
 
-	respBytes, err := deps.WestDexService.CallAPI(ctx, "G09XM02", reqData)
-	if err != nil {
-		if errors.Is(err, westdex.ErrDatasource) {
-			return nil, errors.Join(processors.ErrDatasource, err)
-		} else {
+	const maxRetries = 5
+	var respBytes []byte
+
+	for attempt := 0; attempt <= maxRetries; attempt++ {
+		var err error
+		respBytes, err = deps.WestDexService.CallAPI(ctx, "G09XM02", reqData)
+		if err == nil {
+			return respBytes, nil
+		}
+
+		// 如果不是数据源异常，直接返回错误
+		if !errors.Is(err, westdex.ErrDatasource) {
 			return nil, errors.Join(processors.ErrSystem, err)
 		}
+
+		// 如果是最后一次尝试，返回错误
+		if attempt == maxRetries {
+			return nil, errors.Join(processors.ErrDatasource, err)
+		}
+
+		// 立即重试，不等待
 	}
 
 	return respBytes, nil

internal/domains/api/services/processors/ivyz/ivyz9363_processor.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
+	"strings"
 
 	"tyapi-server/internal/domains/api/dto"
 	"tyapi-server/internal/domains/api/services/processors"
@@ -20,6 +21,10 @@ func ProcessIVYZ9363Request(ctx context.Context, params []byte, deps *processors
 	if err := deps.Validator.ValidateStruct(paramsDto); err != nil {
 		return nil, errors.Join(processors.ErrInvalidParam, err)
 	}
+	// 新增：身份证一致性校验
+	if strings.EqualFold(strings.TrimSpace(paramsDto.ManIDCard), strings.TrimSpace(paramsDto.WomanIDCard)) {
+		return nil, errors.Join(processors.ErrInvalidParam, errors.New("请正确填写身份信息"))
+	}
 
 	encryptedManName, err := deps.WestDexService.Encrypt(paramsDto.ManName)
 	if err != nil {

internal/shared/crypto/west_crypto_test.go

@@ -76,7 +76,7 @@ func TestWestDexDecryptOutput(t *testing.T) {
 	}{
 		{
 			name:      "测试数据1",
-			data:      "DLrbtEki5o/5yTvQWR+dWWUZYEo5s58D8LTnhhlAl99SwZbECa34KpStmR+Qr0gbbKzh3y4t5+/vbFFZgv03DtnYlLQcQt+rSgtxkCN/PCBPaFE0QZRTufd7djJfUww0Eh6DMHD7NS9pcuCa0PHGVoE+Vwo2YSwOnh2gtx3Bt0Qhs+w76tfCwIeufZ8tcpFs/nb84HIZxk+0cH1bTfNE6VsXI6vMpKvnS02O3oE2642ozeHgglCNuiOFMcCL8Erw4FKPnfRCUYdeKc2dZ7OF2IZqt0t4WiJBxjB/6k4tgAj/HepE2gaulWU8RVvAF+vPF5i3ekHHq8T7226rNlVfuagodaRXiOqO5E1h6Mx9ygcDL0HXvQKsxxJdl/bUP+t/+rOjA+k/IR/vF1UJGrGrkSJVfkcWXPP85cgws18gE9rIs2Ji1HGjvOmnez370L0+",
+			data:      "0IdH/7L/ybMY00dne6clsk7VYBXPHkFfDagilHTzSHt9wTxref38uX8cDe7fJCGksbDQnMGo8GfsyEIpiCfj+w==",
 			secretKey: "121a1e41fc1690dd6b90afbcacd80cf4",
 		},
 		{

internal/shared/pdf/pdf_generator_refactored.go

@@ -212,23 +212,17 @@ func (g *PDFGeneratorRefactored) generatePDF(product *entities.Product, doc *ent
 		}
 
 		// 在所有接口文档渲染完成后，统一添加二维码和后勤服务说明
-		// 使用主产品文档（如果存在），否则使用第一个子产品文档，如果都没有则创建一个空的文档对象
+		// 使用主产品文档（如果存在），否则使用第一个子产品文档
 		var finalDoc *entities.ProductDocumentation
 		if doc != nil {
 			finalDoc = doc
 		} else if len(subProductDocs) > 0 {
 			finalDoc = subProductDocs[0]
-		} else {
-			// 如果没有文档，创建一个空的文档对象，用于添加二维码和说明
-			finalDoc = &entities.ProductDocumentation{
-				ProductID:     product.ID,
-				RequestMethod: "POST",
-				Version:       "1.0",
-			}
 		}
 
-		// 始终添加二维码和后勤服务说明
+		if finalDoc != nil {
 			pageBuilder.AddAdditionalInfo(pdf, finalDoc, chineseFontAvailable)
+		}
 	} else {
 		// 普通产品：使用原来的方法（包含二维码和说明）
 		if doc != nil {