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

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

Browse Source
This commit is contained in:
苏尹岚
2019-11-04 09:48:55 +08:00
parent f344d711bf 5230fa664d
commit 3c0017c338
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -179,7 +179,7 @@ func (c *BaseScheduler) CancelWaybill(bill *model.Waybill, cancelReasonID int, c
// 部分快递平台在取消成功后有时会不发运单取消消息过来（比如达达，904200512000442），为避免二次取消报错，添加状态判断 // 部分快递平台在取消成功后有时会不发运单取消消息过来（比如达达，904200512000442），为避免二次取消报错，添加状态判断
if c.IsReallyCallPlatformAPI && bill.OrderVendorID != bill.WaybillVendorID && bill.Status != model.WaybillStatusCanceled { if c.IsReallyCallPlatformAPI && bill.OrderVendorID != bill.WaybillVendorID && bill.Status != model.WaybillStatusCanceled {
if handlerInfo := partner.GetDeliveryPlatformFromVendorID(bill.WaybillVendorID); handlerInfo != nil { if handlerInfo := partner.GetDeliveryPlatformFromVendorID(bill.WaybillVendorID); handlerInfo != nil {
if err = utils.CallFuncLogError(func() error { if err = utils.CallFuncLogErrorWithInfo(func() error {
return handlerInfo.Handler.CancelWaybill(bill, cancelReasonID, cancelReason) return handlerInfo.Handler.CancelWaybill(bill, cancelReasonID, cancelReason)
}, "CancelWaybill bill:%v", bill); err == nil { }, "CancelWaybill bill:%v", bill); err == nil {
bill.Status = model.WaybillStatusCanceled bill.Status = model.WaybillStatusCanceled

3
business/jxstore/cms/cms.go
View File

@@ -336,15 +336,14 @@ func UpdateConfig(ctx *jxcontext.Context, key, configType, value string) (hint s
dao.Rollback(db) dao.Rollback(db)
return "", err return "", err
} }
dao.Commit(db)
for _, v := range storeMapList { for _, v := range storeMapList {
if _, err = dao.UpdateEntityLogicallyAndUpdateSyncStatus(db, &model.StoreSkuBind{}, nil, ctx.GetUserName(), map[string]interface{}{ if _, err = dao.UpdateEntityLogicallyAndUpdateSyncStatus(db, &model.StoreSkuBind{}, nil, ctx.GetUserName(), map[string]interface{}{
model.FieldStoreID: v.StoreID, model.FieldStoreID: v.StoreID,
}, dao.GetSyncStatusStructField(model.VendorNames[v.VendorID]), model.SyncFlagPriceMask); err != nil { }, dao.GetSyncStatusStructField(model.VendorNames[v.VendorID]), model.SyncFlagPriceMask); err != nil {
dao.Rollback(db)
return "", err return "", err
} }
} }
dao.Commit(db)
case model.ConfigTypeFreightPack: case model.ConfigTypeFreightPack:
dao.Commit(db) dao.Commit(db)
storeMapList, err := dao.GetStoresMapList(db, nil, nil, model.StoreStatusAll, model.StoreIsSyncYes, "") storeMapList, err := dao.GetStoresMapList(db, nil, nil, model.StoreStatusAll, model.StoreIsSyncYes, "")

2
business/model/dao/dao.go
View File

@@ -13,7 +13,7 @@ import (
const ( const (
useGetRowsWhenGetRow = true useGetRowsWhenGetRow = true
transactionWarningSeconds = 2 * 60 // 5分钟 transactionWarningSeconds = 10 * 60 // 5分钟
) )
type DaoDB struct { type DaoDB struct {