liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

饿鲜达商品库合并修改，每日订单打款增加日志，一些bug

Browse Source
This commit is contained in:
苏尹岚
2020-02-13 16:25:54 +08:00
parent e46e86396c
commit e46245f7e2
7 changed files with 82 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
business/jxstore/cms/sku.go
View File

@@ -1459,10 +1459,10 @@ func SumExianDaDepot(ctx *jxcontext.Context) (err error) {
panic(r)
}
}()
prefix, name, _, specUnit, unit, specQuality := jxutils.SplitSkuName(v.GoodsName)
prefix, _, _, specUnit, unit, specQuality := jxutils.SplitSkuName(v.GoodsName)
skuName := &model.SkuName{
Prefix: prefix,
Name: name,
Name: v.GoodsName,
CategoryID: skus.CategoryIDThird,
IsGlobal: 1,
Unit: unit,
@@ -1474,7 +1474,7 @@ func SumExianDaDepot(ctx *jxcontext.Context) (err error) {
Status: model.SkuStatusNormal,
}
dao.WrapAddIDCULDEntity(skuName, ctx.GetUserName())
err = dao.CreateEntity(db, &skuName)
err = dao.CreateEntity(db, skuName)
if err != nil {
dao.Rollback(db)
return err
@@ -1486,18 +1486,15 @@ func SumExianDaDepot(ctx *jxcontext.Context) (err error) {
Weight: int(utils.Str2Int64(skus.Weight)),
Status: model.SkuStatusNormal,
ExdSkuID: v.ElemeGoodsID,
ExdSkuName: v.GoodsName,
ExdUpc: int(utils.Str2Int64(v.UpcID)),
ExdCategoryThirdID: skus.CategoryIDThird,
}
dao.WrapAddIDCULDEntity(sku, ctx.GetUserName())
err = dao.CreateEntity(db, &sku)
err = dao.CreateEntity(db, sku)
if err != nil {
dao.Rollback(db)
return err
}
dao.Commit(db)
break
}
return err
}

4
business/jxstore/cms/store_sku.go
View File

@@ -1204,7 +1204,9 @@ func getSkuSaleStatus(inSkuBind *StoreSkuBindSkuInfo, skuNameBindInfo *StoreSkuB
}
func AddEventDetail(db *dao.DaoDB, ctx *jxcontext.Context, operateType, thingID, thingType, storeID int, beforeData, afterData string) (err error) {
if ctx.GetUserName() == "jxadmin" {
url := ctx.GetRequest().URL.Path
apiFunction := url[strings.LastIndex(url, "/")+1 : len(url)]
if ctx.GetUserName() == "jxadmin" && !strings.Contains(apiFunction, "AutoPayForPopluarMan") {
return err
}
operateEventDetail := &model.OperateEventDetail{