1
This commit is contained in:
@@ -272,10 +272,12 @@ func SpecialTreat(vendorOrgCode string, vendorStoreID, storeID, deliveryFeeDeduc
|
||||
bindFreightIDs, err := GetStoreFreight(vendorOrgCode, vendorStoreID)
|
||||
if err != nil {
|
||||
globals.SugarLogger.Debug("获取门店(%d) 绑定运费模板出错:", vendorStoreID, err)
|
||||
//errList.AddErr(fmt.Errorf("获取门店(%d) 绑定运费模板出错:%v", vendorStoreID, err))
|
||||
}
|
||||
if bindFreightIDs == 0 { //(1)未查询到绑定信息,不算错误
|
||||
if freightTemplateID, err := CreateFreightTemplate(int(storeID), int(deliveryFeeDeductionSill)); err != nil || freightTemplateID == 0 {
|
||||
|
||||
//(1)未查询到绑定信息,不算错误
|
||||
if bindFreightIDs == 0 {
|
||||
freightTemplateID, err := CreateFreightTemplate(int(storeID), int(deliveryFeeDeductionSill))
|
||||
if err != nil || freightTemplateID == 0 {
|
||||
errList.AddErr(fmt.Errorf("创建运费模板失败:%v", err))
|
||||
} else { //绑定
|
||||
if err = ShopBindStoreFreight(vendorOrgCode, vendorStoreID, freightTemplateID); err != nil {
|
||||
@@ -285,15 +287,17 @@ func SpecialTreat(vendorOrgCode string, vendorStoreID, storeID, deliveryFeeDeduc
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if err := UpdateFreightTemplate(int(storeID)); err != nil {
|
||||
if err := UpdateFreightTemplate(int(storeID), bindFreightIDs); err != nil {
|
||||
globals.SugarLogger.Debug("更新运费模板失败:", err)
|
||||
errList.AddErr(fmt.Errorf("更新运费模板失败:%v", err))
|
||||
}
|
||||
}
|
||||
|
||||
//2.设置门店打包费 默认为0
|
||||
if err := SetStorePackageFee(vendorOrgCode, vendorStoreID, deliveryFeeDeductionFee); err != nil {
|
||||
errList.AddErr(fmt.Errorf("设置门店打包费失败:%v", err))
|
||||
}
|
||||
|
||||
//3.设置门店起送价 默认为0
|
||||
if bindSaleLimitID, err := GetStoreSaleLimit(vendorOrgCode, vendorStoreID); err != nil {
|
||||
globals.SugarLogger.Debugf("获取门店限售模板失败:%v", err)
|
||||
@@ -322,20 +326,13 @@ func SpecialTreat(vendorOrgCode string, vendorStoreID, storeID, deliveryFeeDeduc
|
||||
errList.AddErr(fmt.Errorf("关闭门店自动运力失败:%v", err))
|
||||
}
|
||||
}
|
||||
|
||||
//多次同步数据库,兜底处理
|
||||
if err := dao.ReplaceInsertFreight(FreightTemplate); err != nil {
|
||||
if err = dao.ReplaceInsertFreight(FreightTemplate); err != nil {
|
||||
if err1 := dao.InsertItemFreight(FreightTemplate); err1 != nil {
|
||||
globals.SugarLogger.Debug("同步数据库错误信息:%v", err1)
|
||||
}
|
||||
}
|
||||
//if err := dao.CreateEntity(db, FreightTemplate); dao.IsDuplicateError(err) || err != nil {
|
||||
// _, err1 := dao.UpdateEntity(db, FreightTemplate, "TemplateID", "TradeLimitID")
|
||||
// if err1 != nil {
|
||||
// globals.SugarLogger.Debugf("更新起送价限售模板,更新进数据库错误信息:%v", err1)
|
||||
// } else {
|
||||
// globals.SugarLogger.Debugf("更新起送价限售模板,创建进数据库错误信息:%v", err)
|
||||
// }
|
||||
//}
|
||||
endErr := errList.GetErrListAsOne()
|
||||
return endErr
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user