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

aa

Browse Source
This commit is contained in:
suyl
2021-09-13 09:09:17 +08:00
parent bbb3a27ca6
commit f07752806d
5 changed files with 86 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
business/jxstore/cms/store.go
View File

@@ -1486,19 +1486,19 @@ func UpdateStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor
delete(payload, "bussinessStatus")
var vendorOrgCode = ""
if payload["vendorOrgCode"].(string) == "" {
return 0, fmt.Errorf("平台账号不能为空")
} else {
vendorOrgCode = payload["vendorOrgCode"].(string)
}
//var vendorOrgCode = ""
//if payload["vendorOrgCode"].(string) == "" {
// return 0, fmt.Errorf("平台账号不能为空")
//} else {
// vendorOrgCode = payload["vendorOrgCode"].(string)
//}
if db == nil {
db = dao.GetDB()
}
storeMap := &model.StoreMap{
StoreID: storeID,
VendorID: vendorID,
VendorOrgCode: vendorOrgCode,
StoreID: storeID,
VendorID: vendorID,
//VendorOrgCode: vendorOrgCode,
}
storeMap.DeletedAt = utils.DefaultTimeValue
if err = dao.GetEntity(db, storeMap, model.FieldStoreID, model.FieldVendorID, "VendorOrgCode", model.FieldDeletedAt); err != nil {
@@ -1564,13 +1564,13 @@ func UpdateStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor
num, err = dao.UpdateEntityLogicallyAndUpdateSyncStatus(db, storeMap, valid, userName, map[string]interface{}{
model.FieldStoreID: storeID,
model.FieldVendorID: vendorID,
"VendorOrgCode": vendorOrgCode,
//"VendorOrgCode": vendorOrgCode,
}, model.FieldSyncStatus, syncStatus)
} else {
num, err = dao.UpdateEntityLogically(db, storeMap, valid, userName, map[string]interface{}{
model.FieldStoreID: storeID,
model.FieldVendorID: vendorID,
"VendorOrgCode": vendorOrgCode,
//"VendorOrgCode": vendorOrgCode,
})
}
if err != nil {