This commit is contained in:
richboo111
2023-03-10 15:34:27 +08:00
parent 3bc83381f3
commit 338fac6086
3 changed files with 81 additions and 49 deletions

View File

@@ -261,7 +261,6 @@ func GetFence(appOrgCode string, outFenceID []string) ([]warehouse_getFences_res
//特殊处理
func SpecialTreat(vendorOrgCode string, vendorStoreID, storeID, deliveryFeeDeductionFee, deliveryFeeDeductionSill, minPrice int64, autoCall string) error {
var (
db *dao.DaoDB
errList = errlist.New()
FreightTemplate = &model.FreightTemplate{
VendorStoreID: utils.Int64ToStr(vendorStoreID),
@@ -324,17 +323,19 @@ func SpecialTreat(vendorOrgCode string, vendorStoreID, storeID, deliveryFeeDeduc
}
}
//多次同步数据库,兜底处理
//if err := dao.ReplaceInsertFreight(FreightTemplate); err != nil {
// globals.SugarLogger.Debug("同步数据库错误信息:%v", err)
//}
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)
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
}