This commit is contained in:
邹宗楠
2023-05-15 10:26:01 +08:00
parent 890a211528
commit 8ba382e33f
2 changed files with 2 additions and 3 deletions

View File

@@ -412,7 +412,7 @@ func CreateUser(user *model.User, creatorName string) (err error) {
} }
//支付宝注册电话需要解密 //支付宝注册电话需要解密
if user.GetMobile() != "" && user.GetName() != "" && user.GetID2() != "" { if user.GetMobile() != "" && user.GetName() != "" && user.GetID2() != "" {
if user.LastLoginType != "" && user.LastLoginType == alipay.AuthType { if user.LastLoginType == alipay.AuthType {
mobile := &alipayapi.KeyMobile{} mobile := &alipayapi.KeyMobile{}
data, _ := base64.StdEncoding.DecodeString(user.GetMobile()) data, _ := base64.StdEncoding.DecodeString(user.GetMobile())
key, _ := base64.StdEncoding.DecodeString(alipay.AuthKey) key, _ := base64.StdEncoding.DecodeString(alipay.AuthKey)

View File

@@ -3,7 +3,6 @@ package dao
import ( import (
"errors" "errors"
"fmt" "fmt"
"git.rosy.net.cn/jx-callback/business/partner"
"sort" "sort"
"strings" "strings"
"time" "time"
@@ -1181,7 +1180,7 @@ func GetStoreAcctExpendLastCreateWayBillFee(db *DaoDB, vendorOrderID string) (ex
AND a.type = ? AND a.type = ?
` `
sqlParams := []interface{}{ sqlParams := []interface{}{
partner.StoreAcctTypeExpendCreateWaybillEx, 20, // partner.StoreAcctTypeExpendCreateWaybillEx 零食运费
} }
if vendorOrderID != "" { if vendorOrderID != "" {
sql += " AND a.vendor_order_id = ?" sql += " AND a.vendor_order_id = ?"