temp

apps/api/internal/logic/QYGL/qygl6f2dlogic.go

@@ -29,25 +29,25 @@ func NewQYGL6F2DLogic(ctx context.Context, svcCtx *svc.ServiceContext) *QYGL6F2D
 	}
 }
 
-func (l *QYGL6F2DLogic) QYGL6F2D(req *types.Request) (resp *types.Response, err *errs.AppError) {
+func (l *QYGL6F2DLogic) QYGL6F2D(req *types.Request) (resp string, err *errs.AppError) {
 	var status string
 	var charges bool
 	var remark = ""
 	secretKey, ok := l.ctx.Value("secretKey").(string)
 	if !ok {
-		return &types.Response{}, errs.ErrSystem
+		return "", errs.ErrSystem
 	}
 	transactionID, ok := l.ctx.Value("transactionID").(string)
 	if !ok {
-		return &types.Response{}, errs.ErrSystem
+		return "", errs.ErrSystem
 	}
 	userId, userIdOk := l.ctx.Value("userId").(int64)
 	if !userIdOk {
-		return &types.Response{}, errs.ErrSystem
+		return "", errs.ErrSystem
 	}
 	productCode, productCodeOk := l.ctx.Value("productCode").(string)
 	if !productCodeOk || productCode == "" {
-		return &types.Response{}, errs.ErrSystem
+		return "", errs.ErrSystem
 	}
 	defer func() {
 		if err != nil {
@@ -65,17 +65,17 @@ func (l *QYGL6F2DLogic) QYGL6F2D(req *types.Request) (resp *types.Response, err
 	// 1、解密
 	key, decodeErr := hex.DecodeString(secretKey)
 	if decodeErr != nil {
-		return nil, errs.ErrSystem
+		return "", errs.ErrSystem
 	}
 	decryptData, aesDecryptErr := crypto.AesDecrypt(req.Data, key)
 	if aesDecryptErr != nil || len(decryptData) == 0 {
-		return nil, errs.ErrParamDecryption
+		return "", errs.ErrParamDecryption
 	}
 
 	// 2、校验
 	var data validator.QYGL6F2DRequest
 	if validatorErr := validator.ValidateAndParse(decryptData, &data); validatorErr != nil {
-		return nil, errs.ErrParamValidation
+		return "", errs.ErrParamValidation
 	}
 
 	// 3、西部加密
@@ -83,7 +83,7 @@ func (l *QYGL6F2DLogic) QYGL6F2D(req *types.Request) (resp *types.Response, err
 	encryptedFields, encryptStructFieldsErr := common.EncryptStructFields(data, westConfig.Key)
 	if encryptStructFieldsErr != nil {
 		logx.Errorf("西部加密错误：%v", encryptStructFieldsErr)
-		return nil, errs.ErrSystem
+		return "", errs.ErrSystem
 	}
 
 	// 4、发送请求到西部
@@ -92,26 +92,24 @@ func (l *QYGL6F2DLogic) QYGL6F2D(req *types.Request) (resp *types.Response, err
 
 	westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G05XM02", apiRequest)
 	if callAPIErr != nil {
-		return nil, errs.ErrSystem
+		return "", errs.ErrSystem
 	}
 
 	// 5、响应解析
 	//var respData westmodel.G32BJ05Response
 	//unmarshalErr := json.Unmarshal(westResp, &respData)
 	//if unmarshalErr != nil {
-	//	return nil, errs.ErrSystem
+	//	return "", errs.ErrSystem
 	//}
 	//
 	//if respData.Data.Code == "00" || respData.Data.Code == "100002" {
 	//	l.ctx = context.WithValue(l.ctx, "Charges", true)
 	//} else {
-	//	return nil, errs.ErrSystem
+	//	return "", errs.ErrSystem
 	//}
 	//encryptData, aesEncrypt := crypto.AesEncrypt(westResp, key)
 	//if aesEncrypt != nil {
-	//	return nil, errs.ErrSystem
+	//	return "", errs.ErrSystem
 	//}
-	return &types.Response{
-		Data: string(westResp),
-	}, nil
+	return string(westResp), nil
 }