add wxmini

app/main/api/Dockerfile

@@ -15,6 +15,7 @@ ADD go.sum .
 RUN go mod download
 COPY . .
 COPY app/main/api/etc /app/etc
+COPY app/main/api/static /app/static
 RUN go build -ldflags="-s -w" -o /app/main app/main/api/main.go
 
 
@@ -27,5 +28,6 @@ ENV TZ Asia/Shanghai
 WORKDIR /app
 COPY --from=builder /app/main /app/main
 COPY --from=builder /app/etc /app/etc
+COPY --from=builder /app/static /app/static
 
 CMD ["./main", "-f", "etc/main.yaml"]

app/main/api/desc/front/agent.api

@@ -7,7 +7,23 @@ info (
 	email:   "2440983361@qq.com"
 	version: "v1"
 )
+@server (
+	prefix: api/v1/agent
+	group:  agent
+)
+service main {
+	// 获取推广二维码海报
+	@handler GetAgentPromotionQrcode
+	get /promotion/qrcode (GetAgentPromotionQrcodeReq)
 
+}
+
+type (
+	GetAgentPromotionQrcodeReq{
+		QrcodeType string `form:"qrcode_type"`
+		QrcodeUrl string `form:"qrcode_url"`
+	}
+)
 // 代理服务基本类型定义
 type AgentProductConfig {
 	ProductID         int64   `json:"product_id"`

app/main/api/desc/front/user.api

@@ -50,9 +50,7 @@ type (
 
 type (
 	WXMiniAuthReq {
-		Code          string `json:"code"`
-		IV            string `json:"iv"`
-		EncryptedData string `json:"encryptedData"`
+		Code string `json:"code"`
 	}
 	WXMiniAuthResp {
 		AccessToken  string `json:"accessToken"`

app/main/api/etc/main.dev.yaml

@@ -64,6 +64,9 @@ SystemConfig:
 WechatH5:
     AppID: "wxa581992dc74d860e"
     AppSecret: "4de1fbf521712247542d49907fcd5dbf"
+WechatMini:
+    AppID: "wx781abb66b3368963" # 小程序的AppID
+    AppSecret: "c7d02cdb0fc23c35c93187af9243b00d" # 小程序的AppSecret
 Query:
     ShareLinkExpire: 604800 # 7天 = 7 * 24 * 60 * 60 = 604800秒
 AdminConfig:

app/main/api/etc/main.yaml

@@ -65,6 +65,9 @@ SystemConfig:
 WechatH5:
     AppID: "wxa581992dc74d860e"
     AppSecret: "4de1fbf521712247542d49907fcd5dbf"
+WechatMini:
+    AppID: "wx781abb66b3368963" # 小程序的AppID
+    AppSecret: "c7d02cdb0fc23c35c93187af9243b00d" # 小程序的AppSecret
 Query:
     ShareLinkExpire: 604800 # 7天 = 7 * 24 * 60 * 60 = 604800秒
 AdminConfig:

app/main/api/internal/config/config.go

@@ -20,6 +20,7 @@ type Config struct {
 	YushanConfig   YushanConfig
 	SystemConfig   SystemConfig
 	WechatH5       WechatH5Config
+	WechatMini     WechatMiniConfig
 	Query          QueryConfig
 	AdminConfig    AdminConfig
 	AdminPromotion AdminPromotion
@@ -96,6 +97,10 @@ type WechatH5Config struct {
 	AppID     string
 	AppSecret string
 }
+type WechatMiniConfig struct {
+	AppID     string
+	AppSecret string
+}
 type QueryConfig struct {
 	ShareLinkExpire int64
 }

app/main/api/internal/handler/agent/getagentpromotionqrcodehandler.go

@@ -0,0 +1,36 @@
+package agent
+
+import (
+	"net/http"
+
+	"tydata-server/app/main/api/internal/logic/agent"
+	"tydata-server/app/main/api/internal/svc"
+	"tydata-server/app/main/api/internal/types"
+	"tydata-server/common/result"
+	"tydata-server/pkg/lzkit/validator"
+
+	"github.com/zeromicro/go-zero/rest/httpx"
+)
+
+func GetAgentPromotionQrcodeHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.GetAgentPromotionQrcodeReq
+		if err := httpx.Parse(r, &req); err != nil {
+			result.ParamErrorResult(r, w, err)
+			return
+		}
+		if err := validator.Validate(req); err != nil {
+			result.ParamValidateErrorResult(r, w, err)
+			return
+		}
+
+		// 注意：这里传入了 ResponseWriter，用于直接写入图片数据
+		l := agent.NewGetAgentPromotionQrcodeLogic(r.Context(), svcCtx, w)
+		err := l.GetAgentPromotionQrcode(&req)
+		if err != nil {
+			// 如果处理过程中出错，返回JSON错误响应
+			result.HttpResult(r, w, nil, err)
+		}
+		// 成功时，图片数据已经通过logic直接写入ResponseWriter，不需要额外处理
+	}
+}

app/main/api/internal/handler/routes.go

@@ -514,6 +514,17 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 		rest.WithPrefix("/api/v1/admin/user"),
 	)
 
+	server.AddRoutes(
+		[]rest.Route{
+			{
+				Method:  http.MethodGet,
+				Path:    "/promotion/qrcode",
+				Handler: agent.GetAgentPromotionQrcodeHandler(serverCtx),
+			},
+		},
+		rest.WithPrefix("/api/v1/agent"),
+	)
+
 	server.AddRoutes(
 		[]rest.Route{
 			{

app/main/api/internal/logic/agent/getagentpromotionqrcodelogic.go

@@ -0,0 +1,72 @@
+package agent
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+
+	"tydata-server/app/main/api/internal/svc"
+	"tydata-server/app/main/api/internal/types"
+	"tydata-server/common/xerr"
+
+	"github.com/pkg/errors"
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type GetAgentPromotionQrcodeLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	writer http.ResponseWriter
+}
+
+func NewGetAgentPromotionQrcodeLogic(ctx context.Context, svcCtx *svc.ServiceContext, writer http.ResponseWriter) *GetAgentPromotionQrcodeLogic {
+	return &GetAgentPromotionQrcodeLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		writer: writer,
+	}
+}
+
+func (l *GetAgentPromotionQrcodeLogic) GetAgentPromotionQrcode(req *types.GetAgentPromotionQrcodeReq) error {
+	// 1. 参数验证
+	if req.QrcodeUrl == "" {
+		return errors.Wrapf(xerr.NewErrMsg("二维码URL不能为空"), "二维码URL为空")
+	}
+
+	if req.QrcodeType == "" {
+		req.QrcodeType = "promote" // 设置默认类型
+	}
+
+	// 3. 检查指定类型的背景图是否存在
+	if !l.svcCtx.ImageService.CheckImageExists(req.QrcodeType) {
+		l.Errorf("指定的二维码类型对应的背景图不存在: %s", req.QrcodeType)
+		return errors.Wrapf(xerr.NewErrMsg("指定的二维码类型不支持"), "二维码类型: %s", req.QrcodeType)
+	}
+
+	// 4. 处理图片，添加二维码
+	imageData, contentType, err := l.svcCtx.ImageService.ProcessImageWithQRCode(req.QrcodeType, req.QrcodeUrl)
+	if err != nil {
+		l.Errorf("处理图片失败: %v, 类型: %s, URL: %s", err, req.QrcodeType, req.QrcodeUrl)
+		return errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "生成推广二维码图片失败: %v", err)
+	}
+
+	// 5. 设置响应头
+	l.writer.Header().Set("Content-Type", contentType)
+	l.writer.Header().Set("Content-Length", fmt.Sprintf("%d", len(imageData)))
+	l.writer.Header().Set("Cache-Control", "public, max-age=3600") // 缓存1小时
+	l.writer.Header().Set("Content-Disposition", fmt.Sprintf("inline; filename=\"qrcode_%s.png\"", req.QrcodeType))
+
+	// 6. 写入图片数据
+	_, err = l.writer.Write(imageData)
+	if err != nil {
+		l.Errorf("写入图片数据失败: %v", err)
+		return errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "输出图片数据失败: %v", err)
+	}
+
+	l.Infof("成功生成代理推广二维码图片，类型: %s, URL: %s, 图片大小: %d bytes",
+		req.QrcodeType, req.QrcodeUrl, len(imageData))
+
+	return nil
+}

app/main/api/internal/logic/user/wxminiauthlogic.go

@@ -2,10 +2,18 @@ package user
 
 import (
 	"context"
+	"encoding/json"
+	"fmt"
+	"io"
+	"net/http"
+	"time"
 
 	"tydata-server/app/main/api/internal/svc"
 	"tydata-server/app/main/api/internal/types"
+	"tydata-server/app/main/model"
+	"tydata-server/common/xerr"
 
+	"github.com/pkg/errors"
 	"github.com/zeromicro/go-zero/core/logx"
 )
 
@@ -24,7 +32,113 @@ func NewWxMiniAuthLogic(ctx context.Context, svcCtx *svc.ServiceContext) *WxMini
 }
 
 func (l *WxMiniAuthLogic) WxMiniAuth(req *types.WXMiniAuthReq) (resp *types.WXMiniAuthResp, err error) {
-	// todo: add your logic here and delete this line
+	// 1. 获取session_key和openid
+	sessionKeyResp, err := l.GetSessionKey(req.Code)
+	if err != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "获取session_key失败: %v", err)
+	}
 
-	return
+	// 2. 查找用户授权信息
+	userAuth, err := l.svcCtx.UserAuthModel.FindOneByAuthTypeAuthKey(l.ctx, model.UserAuthTypeWxMiniOpenID, sessionKeyResp.Openid)
+	if err != nil && !errors.Is(err, model.ErrNotFound) {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "查询用户授权失败: %v", err)
+	}
+
+	// 3. 处理用户信息
+	var userID int64
+	var userType int64
+	if userAuth != nil {
+		// 已存在用户，直接登录
+		userID = userAuth.UserId
+		userType = model.UserTypeNormal
+	} else {
+		// 注册临时用户
+		userTemp, err := l.svcCtx.UserTempModel.FindOneByAuthTypeAuthKey(l.ctx, model.UserAuthTypeWxMiniOpenID, sessionKeyResp.Openid)
+		if err != nil && !errors.Is(err, model.ErrNotFound) {
+			return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "查询用户临时信息失败: %v", err)
+		}
+		if userTemp == nil {
+			// 创建新的临时用户
+			userTemp = &model.UserTemp{}
+			userTemp.AuthType = model.UserAuthTypeWxMiniOpenID
+			userTemp.AuthKey = sessionKeyResp.Openid
+			result, err := l.svcCtx.UserTempModel.Insert(l.ctx, nil, userTemp)
+			if err != nil {
+				return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "创建临时用户信息失败: %v", err)
+			}
+			// 获取新创建的临时用户ID
+			userID, err = result.LastInsertId()
+			if err != nil {
+				return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "获取新创建的临时用户ID失败: %v", err)
+			}
+		} else {
+			// 使用已存在的临时用户ID
+			userID = userTemp.Id
+		}
+		userType = model.UserTypeTemp
+	}
+
+	// 4. 生成JWT Token
+	token, err := l.svcCtx.UserService.GeneralUserToken(l.ctx, userID, userType)
+	if err != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "生成JWT Token失败: %v", err)
+	}
+
+	// 5. 返回登录结果
+	now := time.Now().Unix()
+	return &types.WXMiniAuthResp{
+		AccessToken:  token,
+		AccessExpire: now + l.svcCtx.Config.JwtAuth.AccessExpire,
+		RefreshAfter: now + l.svcCtx.Config.JwtAuth.RefreshAfter,
+	}, nil
+}
+
+// SessionKeyResp 小程序登录返回结构
+type SessionKeyResp struct {
+	Openid     string `json:"openid"`
+	SessionKey string `json:"session_key"`
+	Unionid    string `json:"unionid,omitempty"`
+	ErrCode    int    `json:"errcode,omitempty"`
+	ErrMsg     string `json:"errmsg,omitempty"`
+}
+
+// GetSessionKey 通过code获取小程序的session_key和openid
+func (l *WxMiniAuthLogic) GetSessionKey(code string) (*SessionKeyResp, error) {
+	appID := l.svcCtx.Config.WechatMini.AppID
+	appSecret := l.svcCtx.Config.WechatMini.AppSecret
+
+	url := fmt.Sprintf("https://api.weixin.qq.com/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code",
+		appID, appSecret, code)
+
+	resp, err := http.Get(url)
+	if err != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "获取session_key失败: %v", err)
+	}
+	defer resp.Body.Close()
+
+	body, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "读取响应失败: %v", err)
+	}
+
+	var sessionKeyResp SessionKeyResp
+	if err = json.Unmarshal(body, &sessionKeyResp); err != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "解析响应失败: %v", err)
+	}
+
+	// 检查微信返回的错误码
+	if sessionKeyResp.ErrCode != 0 {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR),
+			"微信接口返回错误: errcode=%d, errmsg=%s",
+			sessionKeyResp.ErrCode, sessionKeyResp.ErrMsg)
+	}
+
+	// 验证必要字段
+	if sessionKeyResp.Openid == "" || sessionKeyResp.SessionKey == "" {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR),
+			"微信接口返回数据不完整: openid=%s, session_key=%s",
+			sessionKeyResp.Openid, sessionKeyResp.SessionKey)
+	}
+
+	return &sessionKeyResp, nil
 }

app/main/api/internal/service/imageService.go

@@ -0,0 +1,173 @@
+package service
+
+import (
+	"bytes"
+	"fmt"
+	"image"
+	"image/jpeg"
+	"image/png"
+	"os"
+	"path/filepath"
+
+	"github.com/fogleman/gg"
+	"github.com/skip2/go-qrcode"
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type ImageService struct {
+	baseImagePath string
+}
+
+func NewImageService() *ImageService {
+	return &ImageService{
+		baseImagePath: "static/images", // 原图存放目录
+	}
+}
+
+// ProcessImageWithQRCode 处理图片，在中间添加二维码
+func (s *ImageService) ProcessImageWithQRCode(qrcodeType, qrcodeUrl string) ([]byte, string, error) {
+	// 1. 根据qrcodeType确定使用哪张背景图
+	var backgroundImageName string
+	switch qrcodeType {
+	case "promote":
+		backgroundImageName = "tg_qrcode_1.png"
+	case "invitation":
+		backgroundImageName = "yq_qrcode_1.png"
+	default:
+		backgroundImageName = "tg_qrcode_1.png" // 默认使用第一张图片
+	}
+
+	// 2. 读取原图
+	originalImagePath := filepath.Join(s.baseImagePath, backgroundImageName)
+	originalImage, err := s.loadImage(originalImagePath)
+	if err != nil {
+		logx.Errorf("加载原图失败: %v, 图片路径: %s", err, originalImagePath)
+		return nil, "", fmt.Errorf("加载原图失败: %v", err)
+	}
+
+	// 3. 获取原图尺寸
+	bounds := originalImage.Bounds()
+	imgWidth := bounds.Dx()
+	imgHeight := bounds.Dy()
+
+	// 4. 创建绘图上下文
+	dc := gg.NewContext(imgWidth, imgHeight)
+
+	// 5. 绘制原图作为背景
+	dc.DrawImageAnchored(originalImage, imgWidth/2, imgHeight/2, 0.5, 0.5)
+
+	// 6. 生成二维码（去掉白边）
+	qrCode, err := qrcode.New(qrcodeUrl, qrcode.Medium)
+	if err != nil {
+		logx.Errorf("生成二维码失败: %v, 二维码内容: %s", err, qrcodeUrl)
+		return nil, "", fmt.Errorf("生成二维码失败: %v", err)
+	}
+	// 禁用二维码边框，去掉白边
+	qrCode.DisableBorder = true
+
+	// 7. 根据二维码类型设置不同的尺寸和位置
+	var qrSize int
+	var qrX, qrY int
+
+	switch qrcodeType {
+	case "promote":
+		// promote类型：精确设置二维码尺寸
+		qrSize = 280 // 固定尺寸280px
+		// 左下角位置：距左边和底边留一些边距
+		qrX = 192                      // 距左边180px
+		qrY = imgHeight - qrSize - 190 // 距底边100px
+
+	case "invitation":
+		// invitation类型：精确设置二维码尺寸
+		qrSize = 360 // 固定尺寸320px
+		// 中间偏上位置
+		qrX = (imgWidth - qrSize) / 2 // 水平居中
+		qrY = 555                     // 垂直位置200px
+
+	default:
+		// 默认（promote样式）
+		qrSize = 280                   // 固定尺寸280px
+		qrX = 200                      // 距左边180px
+		qrY = imgHeight - qrSize - 200 // 距底边100px
+	}
+
+	// 8. 生成指定尺寸的二维码图片
+	qrCodeImage := qrCode.Image(qrSize)
+
+	// 9. 直接绘制二维码（不添加背景）
+	dc.DrawImageAnchored(qrCodeImage, qrX+qrSize/2, qrY+qrSize/2, 0.5, 0.5)
+
+	// 11. 输出为字节数组
+	var buf bytes.Buffer
+	err = png.Encode(&buf, dc.Image())
+	if err != nil {
+		logx.Errorf("编码图片失败: %v", err)
+		return nil, "", fmt.Errorf("编码图片失败: %v", err)
+	}
+
+	logx.Infof("成功生成带二维码的图片，类型: %s, 二维码内容: %s, 图片尺寸: %dx%d, 二维码尺寸: %dx%d, 位置: (%d,%d)",
+		qrcodeType, qrcodeUrl, imgWidth, imgHeight, qrSize, qrSize, qrX, qrY)
+
+	return buf.Bytes(), "image/png", nil
+}
+
+// loadImage 加载图片文件
+func (s *ImageService) loadImage(path string) (image.Image, error) {
+	file, err := os.Open(path)
+	if err != nil {
+		return nil, err
+	}
+	defer file.Close()
+
+	// 尝试解码PNG
+	img, err := png.Decode(file)
+	if err != nil {
+		// 如果PNG解码失败，重新打开文件尝试JPEG
+		file.Close()
+		file, err = os.Open(path)
+		if err != nil {
+			return nil, err
+		}
+		defer file.Close()
+
+		img, err = jpeg.Decode(file)
+		if err != nil {
+			// 如果还是失败，使用通用解码器
+			file.Close()
+			file, err = os.Open(path)
+			if err != nil {
+				return nil, err
+			}
+			defer file.Close()
+
+			img, _, err = image.Decode(file)
+			if err != nil {
+				return nil, err
+			}
+		}
+	}
+
+	return img, nil
+}
+
+// GetSupportedImageTypes 获取支持的图片类型列表
+func (s *ImageService) GetSupportedImageTypes() []string {
+	return []string{"promote", "invitation"}
+}
+
+// CheckImageExists 检查指定类型的背景图是否存在
+func (s *ImageService) CheckImageExists(qrcodeType string) bool {
+	var backgroundImageName string
+	switch qrcodeType {
+	case "promote":
+		backgroundImageName = "tg_qrcode_1.png"
+	case "invitation":
+		backgroundImageName = "yq_qrcode_1.png"
+	default:
+		backgroundImageName = "tg_qrcode_1.png"
+	}
+
+	imagePath := filepath.Join(s.baseImagePath, backgroundImageName)
+	_, err := os.Stat(imagePath)
+	return err == nil
+}

app/main/api/internal/service/wechatpayService.go

@@ -43,7 +43,7 @@ const (
 )
 
 type WechatPayService struct {
-	config        config.WxpayConfig
+	config        config.Config
 	wechatClient  *core.Client
 	notifyHandler *notify.Handler
 	userAuthModel model.UserAuthModel
@@ -96,7 +96,7 @@ func newWechatPayServiceWithPlatformCert(c config.Config, userAuthModel model.Us
 
 	logx.Infof("微信支付客户端初始化成功(平台证书方式)")
 	return &WechatPayService{
-		config:        c.Wxpay,
+		config:        c,
 		wechatClient:  client,
 		notifyHandler: notifyHandler,
 		userAuthModel: userAuthModel,
@@ -144,7 +144,7 @@ func newWechatPayServiceWithWxPayPubKey(c config.Config, userAuthModel model.Use
 
 	logx.Infof("微信支付客户端初始化成功(微信支付公钥方式)")
 	return &WechatPayService{
-		config:        c.Wxpay,
+		config:        c,
 		wechatClient:  client,
 		notifyHandler: notifyHandler,
 		userAuthModel: userAuthModel,
@@ -157,11 +157,11 @@ func (w *WechatPayService) CreateWechatAppOrder(ctx context.Context, amount floa
 
 	// 构建支付请求参数
 	payRequest := app.PrepayRequest{
-		Appid:       core.String(w.config.AppID),
-		Mchid:       core.String(w.config.MchID),
+		Appid:       core.String(w.config.Wxpay.AppID),
+		Mchid:       core.String(w.config.Wxpay.MchID),
 		Description: core.String(description),
 		OutTradeNo:  core.String(outTradeNo),
-		NotifyUrl:   core.String(w.config.NotifyUrl),
+		NotifyUrl:   core.String(w.config.Wxpay.NotifyUrl),
 		Amount: &app.Amount{
 			Total: core.Int64(totalAmount),
 		},
@@ -186,11 +186,41 @@ func (w *WechatPayService) CreateWechatMiniProgramOrder(ctx context.Context, amo
 
 	// 构建支付请求参数
 	payRequest := jsapi.PrepayRequest{
-		Appid:       core.String(w.config.AppID),
-		Mchid:       core.String(w.config.MchID),
+		Appid:       core.String(w.config.WechatMini.AppID),
+		Mchid:       core.String(w.config.Wxpay.MchID),
 		Description: core.String(description),
 		OutTradeNo:  core.String(outTradeNo),
-		NotifyUrl:   core.String(w.config.NotifyUrl),
+		NotifyUrl:   core.String(w.config.Wxpay.NotifyUrl),
+		Amount: &jsapi.Amount{
+			Total: core.Int64(totalAmount),
+		},
+		Payer: &jsapi.Payer{
+			Openid: core.String(openid), // 用户的 OpenID，通过前端传入
+		}}
+
+	// 初始化 AppApiService
+	svc := jsapi.JsapiApiService{Client: w.wechatClient}
+
+	// 发起预支付请求
+	resp, result, err := svc.PrepayWithRequestPayment(ctx, payRequest)
+	if err != nil {
+		return "", fmt.Errorf("微信支付订单创建失败: %v, 状态码: %d", err, result.Response.StatusCode)
+	}
+	// 返回预支付交易会话标识
+	return resp, nil
+}
+
+// CreateWechatH5Order 创建微信H5支付订单
+func (w *WechatPayService) CreateWechatH5Order(ctx context.Context, amount float64, description string, outTradeNo string, openid string) (interface{}, error) {
+	totalAmount := lzUtils.ToWechatAmount(amount)
+
+	// 构建支付请求参数
+	payRequest := jsapi.PrepayRequest{
+		Appid:       core.String(w.config.WechatH5.AppID),
+		Mchid:       core.String(w.config.Wxpay.MchID),
+		Description: core.String(description),
+		OutTradeNo:  core.String(outTradeNo),
+		NotifyUrl:   core.String(w.config.Wxpay.NotifyUrl),
 		Amount: &jsapi.Amount{
 			Total: core.Int64(totalAmount),
 		},
@@ -242,7 +272,7 @@ func (w *WechatPayService) CreateWechatOrder(ctx context.Context, amount float64
 		if findAuthModelErr != nil {
 			return "", findAuthModelErr
 		}
-		prepayData, err = w.CreateWechatMiniProgramOrder(ctx, amount, description, outTradeNo, userAuthModel.AuthKey)
+		prepayData, err = w.CreateWechatH5Order(ctx, amount, description, outTradeNo, userAuthModel.AuthKey)
 		if err != nil {
 			return "", err
 		}
@@ -290,7 +320,7 @@ func (w *WechatPayService) QueryOrderStatus(ctx context.Context, transactionID s
 	// 调用 QueryOrderById 方法查询订单状态
 	resp, result, err := svc.QueryOrderById(ctx, jsapi.QueryOrderByIdRequest{
 		TransactionId: core.String(transactionID),
-		Mchid:         core.String(w.config.MchID),
+		Mchid:         core.String(w.config.Wxpay.MchID),
 	})
 	if err != nil {
 		return nil, fmt.Errorf("订单查询失败: %v, 状态码: %d", err, result.Response.StatusCode)
@@ -312,7 +342,7 @@ func (w *WechatPayService) WeChatRefund(ctx context.Context, outTradeNo string,
 	resp, result, err := svc.Create(ctx, refunddomestic.CreateRequest{
 		OutTradeNo:  core.String(outTradeNo),
 		OutRefundNo: core.String(outRefundNo),
-		NotifyUrl:   core.String(w.config.RefundNotifyUrl),
+		NotifyUrl:   core.String(w.config.Wxpay.RefundNotifyUrl),
 		Amount: &refunddomestic.AmountReq{
 			Currency: core.String("CNY"),
 			Refund:   core.Int64(lzUtils.ToWechatAmount(refundAmount)),

app/main/api/internal/svc/servicecontext.go

@@ -94,6 +94,7 @@ type ServiceContext struct {
 	UserService                    *service.UserService
 	DictService                    *service.DictService
 	AdminPromotionLinkStatsService *service.AdminPromotionLinkStatsService
+	ImageService                   *service.ImageService
 }
 
 // NewServiceContext 创建服务上下文
@@ -187,7 +188,7 @@ func NewServiceContext(c config.Config) *ServiceContext {
 	dictService := service.NewDictService(adminDictTypeModel, adminDictDataModel)
 	adminPromotionLinkStatsService := service.NewAdminPromotionLinkStatsService(adminPromotionLinkModel,
 		adminPromotionLinkStatsTotalModel, adminPromotionLinkStatsHistoryModel)
-
+	imageService := service.NewImageService()
 	// ============================== 异步任务服务 ==============================
 	asynqServer := asynq.NewServer(
 		asynq.RedisClientOpt{Addr: c.CacheRedis[0].Host, Password: c.CacheRedis[0].Pass},
@@ -279,6 +280,7 @@ func NewServiceContext(c config.Config) *ServiceContext {
 		UserService:                    userService,
 		DictService:                    dictService,
 		AdminPromotionLinkStatsService: adminPromotionLinkStatsService,
+		ImageService:                   imageService,
 	}
 }
 

app/main/api/internal/types/types.go

@@ -1057,6 +1057,11 @@ type FeatureListItem struct {
 	UpdateTime string `json:"update_time"` // 更新时间
 }
 
+type GetAgentPromotionQrcodeReq struct {
+	QrcodeType string `form:"qrcode_type"`
+	QrcodeUrl  string `form:"qrcode_url"`
+}
+
 type GetAgentRevenueInfoReq struct {
 }
 
@@ -1700,9 +1705,7 @@ type WXH5AuthResp struct {
 }
 
 type WXMiniAuthReq struct {
-	Code          string `json:"code"`
-	IV            string `json:"iv"`
-	EncryptedData string `json:"encryptedData"`
+	Code string `json:"code"`
 }
 
 type WXMiniAuthResp struct {