This commit is contained in:
苏尹岚
2021-04-06 18:25:44 +08:00
parent a66e7bc13d
commit d1bf1cc6b3
7 changed files with 26 additions and 5 deletions

View File

@@ -12,7 +12,6 @@ import (
"strconv"
"strings"
"time"
"unicode/utf8"
"git.rosy.net.cn/jx-callback/business/auth2"
"git.rosy.net.cn/jx-callback/business/auth2/authprovider/weixin"
@@ -85,6 +84,7 @@ type StoreExt struct {
// CourierMaps []map[string]interface{} `orm:"-"`
StoreMaps []*model.StoreMap `json:"StoreMaps"`
CourierMaps []*model.StoreCourierMap `json:"CourierMaps"`
// BussinessStatus int `json:"bussinessStatus"` //上下线状态,-1下线1上线
OrderCount int `json:"orderCount"`
}
@@ -1376,10 +1376,10 @@ func UpdateStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor
if valid["isSysCat"] != nil {
SetStoreCategorySyncStatus2(db, []int{storeID}, nil, model.SyncFlagModifiedMask)
}
if vendorStoreName, ok := valid["vendorStoreName"].(string); ok {
if utf8.RuneCountInString(vendorStoreName) > jdapi.MaxStoreNameLen && vendorID == model.VendorIDJD {
return 0, fmt.Errorf("门店名称不允许超过13位")
}
if _, ok := valid["vendorStoreName"]; ok {
// if utf8.RuneCountInString(vendorStoreName) > jdapi.MaxStoreNameLen && vendorID == model.VendorIDJD {
// return 0, fmt.Errorf("门店名称不允许超过13位")
// }
syncStatus |= model.SyncFlagStoreName
}
for _, v := range [][]string{