fix: authorize

master
howell 4 years ago
parent d03f478d24
commit d538e30fdc

@ -445,23 +445,13 @@ func SyncPageData(page, size uint, brand string, categories []RecookJCookCategor
if len(skuEntries.Entries) == 0 {
return empty
}
//gs := make([]goods.RecookGoodsInfoModel, 0)
//gsk := make([]goods.RecookGoodsSkuModel, 0)
skuMap := make(map[uint]jcook.SkuInfo)
//skuDetailMap := make(map[uint]*jcook.SkuDetailResp)
//mp := make([]goods.RecookGoodsMainPhotoModel, 0)
//dp := make([]goods.RecookGoodsDetailPhotoModel, 0)
//attr := make([]goods.RecookGoodsAttributeModel, 0)
//invoice := make([]goods.RecookSkuInvoiceModel, 0)
//attrMap := make(map[uint]goods.RecookGoodsAttributeModel)
//do := downloader.New(nil, "/jcook", 10)
//do.Start()
ids := make([]uint, 0)
if e := mysql2.Db.Transaction(func(tx *gorm.DB) error {
for _, v := range skuEntries.Entries {
var t goods.RecookGoodsSkuModel
if v.BrandName == "" {
continue
v.BrandName = "京东优选"
}
rCate := ""
for _, cate := range categories {
@ -489,7 +479,7 @@ func SyncPageData(page, size uint, brand string, categories []RecookJCookCategor
continue
}
skuMap[v.SkuID] = v
ids = append(ids, v.SkuID)
var bt goods.RecookGoodsBrandModel
tx.First(&bt, "name = ?", v.BrandName)
if bt.Id == 0 {
@ -500,16 +490,7 @@ func SyncPageData(page, size uint, brand string, categories []RecookJCookCategor
}
}
}
if len(skuMap) == 0 {
return nil
}
ids := make([]uint, 0)
for k, _ := range skuMap {
ids = append(ids, k)
}
rq := jcook.SkuBrotherReq{
SkuIDSet: ids,
}

@ -66,6 +66,10 @@ func (o logic) Sure(args ApplySure) error {
var mu user.RecookUserInfoModel
mysql.Db.First(&mu, "mobile=?", ae.Mobile)
if mu.Level > 2 {
return nil
}
mobile := ae.Mobile
if len(mobile) != 11 || !strings.HasPrefix(mobile, "1") {
return fmt.Errorf("手机格式不正确")

@ -56,7 +56,7 @@ type ApplyEntry struct {
Reason string `json:"reason"`
ApplyUser user.RecookUserInfoModel `json:"-" gorm:"foreignKey:apply_user_id"`
ProcessUser manage.UserInfo `json:"-" gorm:"foreignKey:process_user_id"`
ProcessUserName string `json:"prcess_user_name" gorm:"-"`
ProcessUserName string `json:"process_user_name" gorm:"-"`
ApplyUserName string `json:"apply_user_name" gorm:"-"`
ApplyUserMobile string `json:"apply_user_mobile" gorm:"-"`
ParentID uint `json:"-"`
@ -74,7 +74,7 @@ func (o *ApplyEntry) TableName() string {
func (o *ApplyEntry) AfterFind(tx *gorm.DB) error {
o.StateStr = o.State.str()
o.KindStr = o.Kind.str()
o.ProcessUserName = o.ProcessUser.UserName
o.ProcessUserName = o.ProcessUser.Name
o.ApplyUserName = o.ApplyUser.Nickname
o.ApplyUserMobile = o.ApplyUser.Mobile
o.Nickname = o.UserInfo.Nickname

@ -761,7 +761,7 @@ func routerManage(manageRouter *gin.RouterGroup) {
}
{
upgradeRouter := manageRouter.Group("apply")
upgradeRouter := manageRouter.Group("apply", authorize)
{
proxy := upgrade.Proxy{}
upgradeRouter.POST("list", proxy.List)

Loading…
Cancel
Save