From 949dd96a0ae89dbbb6c1c2b117ff2b38b5b1b44f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Fri, 12 Aug 2022 11:27:21 +0800
Subject: [PATCH] 1

---
 model/app_model/app_user_login.go            | 13 +++++++++++++
 services/print_server/app_server/wx_login.go |  3 +--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/model/app_model/app_user_login.go b/model/app_model/app_user_login.go
index 3fd1d7e..e03fb24 100644
--- a/model/app_model/app_user_login.go
+++ b/model/app_model/app_user_login.go
@@ -33,3 +33,16 @@ type WxLoginReq struct {
 	Phone    string `json:"phone" form:"phone"`       // 微信和电话登录使用
 	Password string `json:"password" form:"password"` // 密码登录
 }
+
+// 微信小程序解密后 用户手机号结构体
+type UserPhone struct {
+	PhoneNumber     string         `json:"phoneNumber,omitempty"`
+	PurePhoneNumber string         `json:"purePhoneNumber,omitempty"`
+	CountryCode     string         `json:"countryCode,omitempty"`
+	Watermark       *watermarkInfo `json:"watermark,omitempty"`
+}
+
+type watermarkInfo struct {
+	Appid     string `json:"appid,omitempty"`
+	Timestamp int    `json:"timestamp,omitempty"`
+}
diff --git a/services/print_server/app_server/wx_login.go b/services/print_server/app_server/wx_login.go
index 4e7ede7..f8688d9 100644
--- a/services/print_server/app_server/wx_login.go
+++ b/services/print_server/app_server/wx_login.go
@@ -8,7 +8,6 @@ import (
 	"errors"
 	"fmt"
 	"git.rosy.net.cn/baseapi/utils"
-	"git.rosy.net.cn/gopay-main/wechat"
 	"git.rosy.net.cn/jx-print/dao"
 	"git.rosy.net.cn/jx-print/globals"
 	"git.rosy.net.cn/jx-print/model"
@@ -43,7 +42,7 @@ func (u *UserLogin) WxLogin(ctx *gin.Context, param *wxLogin.WeChatPhoneNumberPa
 		return nil, errors.New("数据异常，用户电话不唯一，联系管理员")
 	}
 
-	weChatLogin := new(wechat.UserPhone)
+	weChatLogin := new(wxLogin.UserPhone)
 	if err := DecryptOpenDataToStruct(param.EncryptedData, param.IV, openObj.SessionKey, weChatLogin); err != nil {
 		return nil, err
 	}