This commit is contained in:
苏尹岚
2021-03-31 14:52:00 +08:00
parent 90f16f87f2
commit ebb7424282
3 changed files with 33 additions and 8 deletions

View File

@@ -8,6 +8,8 @@ import (
"sync"
"time"
"git.rosy.net.cn/jx-callback/business/jxstore/permission"
"git.rosy.net.cn/jx-callback/business/partner/purchase/jd"
"git.rosy.net.cn/jx-callback/globals/api/apimanager"
@@ -626,7 +628,7 @@ func AddUserDeliveryAddress(ctx *jxcontext.Context, address *model.UserDeliveryA
address.AutoAddress, address.DistrictCode, address.CityCode, err = getAddressInfoFromCoord(db, lng, lat)
if err == nil {
globals.SugarLogger.Debugf("AddUserDeliveryAddress2 address:%s", utils.Format4Output(address, true))
txDB , _ := dao.Begin(db)
txDB, _ := dao.Begin(db)
defer func() {
if r := recover(); r != nil {
dao.Rollback(db, txDB)
@@ -699,7 +701,7 @@ func UpdateUserDeliveryAddress(ctx *jxcontext.Context, userID string, addressID
return err
}
}
txDB , _ := dao.Begin(db)
txDB, _ := dao.Begin(db)
defer func() {
if r := recover(); r != nil {
dao.Rollback(db, txDB)
@@ -754,7 +756,7 @@ func SaveUserCart(ctx *jxcontext.Context, userID string, storeID int, cartItems
dao.WrapAddIDCULEntity(v, userID)
}
db := dao.GetDB()
txDB , _ := dao.Begin(db)
txDB, _ := dao.Begin(db)
defer func() {
if r := recover(); r != nil || err != nil {
dao.Rollback(db, txDB)
@@ -1006,7 +1008,7 @@ func UpdateUserWxNoAndPercent(user *model.User, isReceiver bool) (num int64, err
if len(auth) == 0 {
return 0, fmt.Errorf("未找到此用户的微信验证方式用户ID[%v]\n", user.UserID)
}
txDB , _ := dao.Begin(db)
txDB, _ := dao.Begin(db)
defer func() {
if r := recover(); r != nil || err != nil {
dao.Rollback(db, txDB)
@@ -1177,3 +1179,13 @@ func UpdateUserLastInfo(ctx *jxcontext.Context, storeID, brandID int) (err error
}
return err
}
func GetUserStoreAuth(ctx *jxcontext.Context, storeID int) (outStoreID int, err error) {
storeMap, _ := permission.GetUserStoresResultMap(ctx.GetUserID())
if storeMap[storeID] != 0 {
return storeID, err
} else {
return 0, err
}
return outStoreID, err
}