Merge remote-tracking branch 'origin/mark' into yonghui

This commit is contained in:
苏尹岚
2019-12-10 17:52:48 +08:00

View File

@@ -532,9 +532,10 @@ func (a *ActManager) CreateActFromVendor(ctx *jxcontext.Context, act2 *model.Act
func createActFromVendor(ctx *jxcontext.Context, db *dao.DaoDB, act2 *model.Act2, actStoreSku []*model.ActStoreSku2) (actID int, err error) { func createActFromVendor(ctx *jxcontext.Context, db *dao.DaoDB, act2 *model.Act2, actStoreSku []*model.ActStoreSku2) (actID int, err error) {
actMap := &model.ActMap{ actMap := &model.ActMap{
VendorID: act2.VendorID, VendorID: act2.VendorID,
VendorActID: act2.VendorActID, VendorOrgCode: act2.VendorOrgCode,
SyncStatus: 0, VendorActID: act2.VendorActID,
SyncStatus: 0,
} }
dao.WrapAddIDCULDEntity(actMap, ctx.GetUserName()) dao.WrapAddIDCULDEntity(actMap, ctx.GetUserName())
if actMap.VendorActID != "" { if actMap.VendorActID != "" {