Merge branch '20230223_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20230223_xt_api_new_branch

controllers/base_api_controller.go

 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
 		var userAdmin models.AdminUser
-		userAdmin.Id = 4522
+		userAdmin.Id = 3207
 		userAdmin.Mobile = "13318599895"
 
-		userAdmin.Id = 4522 //4，809
+		userAdmin.Id = 3207 //4，809
 		userAdmin.Mobile = "12222222222"
 		userAdmin.IsSuperAdmin = true
 		userAdmin.Status = 1
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10028 //机构id
+		subscibe.OrgId = 10721 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10028 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 12123 //4
+		adminUserInfo.CurrentOrgId = 10721 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 14655 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
 		var userAdmin models.AdminUser
-		userAdmin.Id = 4522
+		userAdmin.Id = 3207
 		userAdmin.Mobile = "13318599895"
 
-		userAdmin.Id = 4522 //4，809
+		userAdmin.Id = 3207 //4，809
 		userAdmin.Mobile = "12222222222"
 		userAdmin.IsSuperAdmin = false
 		userAdmin.Status = 1
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10028 //机构id小英9675或4
+		subscibe.OrgId = 10721 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10028 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 12123 //4
+		adminUserInfo.CurrentOrgId = 10721 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 14655 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)

controllers/fapiao_controller.go

 package controllers
 
 import (
-	"XT_New/common"
-	"XT_New/enums"
-	"XT_New/invoice"
-	"XT_New/models"
-	"XT_New/models/bwfapiao"
-	"XT_New/service"
-	"XT_New/service/fapiao"
-	"XT_New/utils"
 	"bytes"
 	"crypto/md5"
 	"crypto/sha1"
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/astaxie/beego"
-	"github.com/shopspring/decimal"
 	"io/ioutil"
 	"math"
 	"net/http"
 	"strconv"
 	"strings"
 	"time"
+
+	"XT_New/common"
+	"XT_New/enums"
+	"XT_New/invoice"
+	"XT_New/models"
+	"XT_New/models/bwfapiao"
+	"XT_New/service"
+	"XT_New/service/fapiao"
+	"XT_New/utils"
+	"github.com/astaxie/beego"
+	"github.com/shopspring/decimal"
 )
 
 func FaPiaoApiRegistRouters() {
 // GetAccessToken 获取登录授权的 access_token
 func GetAccessToken(apiURL, plainPassword, salt, clientID, clientSecret, username, orgAuthCode string) (AuthResponse, error) {
 	// 当前时间戳（毫秒级）
-	timestamp := fmt.Sprintf("%d", time.Now().UnixMilli())
+	timestamp := ""
 
 	// 密码加密：MD5 + SHA1
 	encryptedPassword := md5AndSha1(plainPassword + salt)