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

1

Browse Source
This commit is contained in:
邹宗楠
2023-11-10 08:58:42 +08:00
parent f697f6a6ff
commit 0a3cb8b526
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxcallback/scheduler/basesch/basesch.go
View File

@@ -151,7 +151,7 @@ func (c *BaseScheduler) SelfDeliverDelivering(order *model.GoodsOrder, userName
if err := partner.GetPurchaseOrderHandlerFromVendorID(order.VendorID).SelfDeliverDelivering(order, userName); err != nil { if err := partner.GetPurchaseOrderHandlerFromVendorID(order.VendorID).SelfDeliverDelivering(order, userName); err != nil {
partner.CurOrderManager.OnOrderMsg(order, "抖音转自送,平台无运力", "tiktokWayBillStatus = -1") partner.CurOrderManager.OnOrderMsg(order, "抖音转自送,平台无运力", "tiktokWayBillStatus = -1")
} }
} else if err2 != nil && strings.Contains(err.Error(), "当前状态获取不到运力信息") || tiktokWayBillStatus.LogisticsStatus == tiktokShop.ShipmentStatusCanceled { } else if (err2 != nil && strings.Contains(err.Error(), "当前状态获取不到运力信息")) || (tiktokWayBillStatus != nil && tiktokWayBillStatus.LogisticsStatus == tiktokShop.ShipmentStatusCanceled) {
partner.GetPurchasePlatformFromVendorID(order.VendorID).SelfDeliverDelivering(order, "") partner.GetPurchasePlatformFromVendorID(order.VendorID).SelfDeliverDelivering(order, "")
} else if err = partner.GetPurchasePlatformFromVendorID(order.VendorID).CancelLogisticsByWmOrderId(order, "", "", order.VendorStoreID, order.VendorOrderID); err != nil { } else if err = partner.GetPurchasePlatformFromVendorID(order.VendorID).CancelLogisticsByWmOrderId(order, "", "", order.VendorStoreID, order.VendorOrderID); err != nil {
partner.CurOrderManager.OnOrderMsg(order, "取消抖音配送异常:", err.Error()) partner.CurOrderManager.OnOrderMsg(order, "取消抖音配送异常:", err.Error())

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

@@ -949,6 +949,11 @@ func UpdateStore(ctx *jxcontext.Context, storeID int, payload map[string]interfa
valid["name"] = jxutils.FormalizeName(valid["name"].(string)) valid["name"] = jxutils.FormalizeName(valid["name"].(string))
store.Name = valid["name"].(string) store.Name = valid["name"].(string)
syncStatus |= model.SyncFlagStoreName syncStatus |= model.SyncFlagStoreName
courierList, _ := dao.GetStoreCourierList2(db, []int{storeID}, nil, 0, nil)
for _, v := range courierList {
v.VendorStoreName = store.Name
dao.UpdateEntity(db, v, "VendorStoreName")
}
} }
printerVendorID := int(utils.Interface2Int64WithDefault(valid["printerVendorID"], 0)) printerVendorID := int(utils.Interface2Int64WithDefault(valid["printerVendorID"], 0))
if printerVendorID == 0 { if printerVendorID == 0 {
@@ -1143,7 +1148,7 @@ func UpdateStore(ctx *jxcontext.Context, storeID int, payload map[string]interfa
TryAddStoreBossRole4StoreByMobile(ctx, store.ID, []string{utils.Interface2String(valid["tel1"]), utils.Interface2String(valid["tel2"])}) TryAddStoreBossRole4StoreByMobile(ctx, store.ID, []string{utils.Interface2String(valid["tel1"]), utils.Interface2String(valid["tel2"])})
} }
if syncStatus&model.SyncFlagStoreAddress != 0 || valid["tel1"] != nil || valid["payeeName"] != nil { if syncStatus&model.SyncFlagStoreAddress != 0 || valid["tel1"] != nil || valid["payeeName"] != nil {
// 修改门店信息(第三方平台同步) // 修改门店信息(第三方配送平台同步)
updateCourierStores(ctx, storeID) updateCourierStores(ctx, storeID)
} }
} }