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

business/jxcallback/scheduler/basesch/basesch.go

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

business/jxstore/cms/cms.go

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

business/model/dao/dao.go

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