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:
richboo111
2023-03-08 17:22:17 +08:00
parent 9722278068
commit 0e95eea7ac
3 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,8 @@ SELECT ?,?,?,?,?,? FROM DUAL WHERE NOT EXISTS(SELECT COUNT(store_id) FROM freigh
_, err := ExecuteSQL(GetDB(), sqlStr, sqlParam) _, err := ExecuteSQL(GetDB(), sqlStr, sqlParam)
return err return err
} }
// 全参数更新插入
func ReplaceInsertFreight(tem *model.FreightTemplate) error { func ReplaceInsertFreight(tem *model.FreightTemplate) error {
if tem.StoreID == 0 || len(tem.VendorStoreID) == 0 { if tem.StoreID == 0 || len(tem.VendorStoreID) == 0 {
return fmt.Errorf("storeID或vendorStoreID不允许为空") return fmt.Errorf("storeID或vendorStoreID不允许为空")

18
business/partner/purchase/tiktok_store/store.go
View File

@@ -378,16 +378,16 @@ func (P *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
//同步进数据库 //同步进数据库
FreightTemplate.FenceID = tempFenceID FreightTemplate.FenceID = tempFenceID
FreightTemplate.VendorStoreID = storeInfo.VendorStoreID FreightTemplate.VendorStoreID = storeInfo.VendorStoreID
if err := dao.ReplaceInsertFreight(FreightTemplate); err != nil { //if err := dao.ReplaceInsertFreight(FreightTemplate); err != nil {
globals.SugarLogger.Debug("同步数据库错误信息:%v", err) // globals.SugarLogger.Debug("同步数据库错误信息:%v", err)
}
//if err = dao.CreateEntity(db, FreightTemplate); dao.IsDuplicateError(err) || err != nil {
// if _, err1 := dao.UpdateEntity(db, FreightTemplate, "FenceID", "StoreID", "VendorStoreID"); err1 != nil {
// errList.AddErr(fmt.Errorf("更新操作，同步进数据库错误信息:%v", err1))
// } else {
// errList.AddErr(fmt.Errorf("创建操作，同步进数据库错误信息:%v", err))
// }
//} //}
if err = dao.CreateEntity(db, FreightTemplate); dao.IsDuplicateError(err) || err != nil {
if _, err1 := dao.UpdateEntity(db, FreightTemplate, "FenceID", "StoreID", "VendorStoreID"); err1 != nil {
errList.AddErr(fmt.Errorf("更新操作，同步进数据库错误信息:%v", err1))
} else {
errList.AddErr(fmt.Errorf("创建操作，同步进数据库错误信息:%v", err))
}
}
if endErr := errList.GetErrListAsOne(); endErr != nil { if endErr := errList.GetErrListAsOne(); endErr != nil {
globals.SugarLogger.Debugf("DouDian UpdateStore wrong information:%v", endErr) globals.SugarLogger.Debugf("DouDian UpdateStore wrong information:%v", endErr)
} }

16
business/partner/purchase/tiktok_store/warehouse.go
View File

@@ -264,13 +264,12 @@ func SpecialTreat(vendorOrgCode string, vendorStoreID, storeID, deliveryFeeDeduc
} }
) )
//1.运费模板 //1.运费模板
//bindFreightIDs, err := GetStoreFreight(vendorOrgCode, vendorStoreID) bindFreightIDs, err := GetStoreFreight(vendorOrgCode, vendorStoreID)
//if err != nil { if err != nil {
// globals.SugarLogger.Debug("获取门店(%d) 绑定运费模板出错:", vendorStoreID, err) globals.SugarLogger.Debug("获取门店(%d) 绑定运费模板出错:", vendorStoreID, err)
// //errList.AddErr(fmt.Errorf("获取门店(%d) 绑定运费模板出错:%v", vendorStoreID, err)) //errList.AddErr(fmt.Errorf("获取门店(%d) 绑定运费模板出错:%v", vendorStoreID, err))
//} }
if true { if bindFreightIDs == 0 { //（1）未查询到绑定信息，不算错误
//if bindFreightIDs == 0 { //（1）未查询到绑定信息，不算错误
if freightTemplateID, err := CreateFreightTemplate(int(storeID), int(deliveryFeeDeductionSill)); err != nil || freightTemplateID == 0 { if freightTemplateID, err := CreateFreightTemplate(int(storeID), int(deliveryFeeDeductionSill)); err != nil || freightTemplateID == 0 {
errList.AddErr(fmt.Errorf("创建运费模板失败:%v", err)) errList.AddErr(fmt.Errorf("创建运费模板失败:%v", err))
} else { //绑定 } else { //绑定
@@ -320,6 +319,9 @@ 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 { if err := dao.CreateEntity(db, FreightTemplate); dao.IsDuplicateError(err) || err != nil {
_, err1 := dao.UpdateEntity(db, FreightTemplate, "TemplateID", "TradeLimitID") _, err1 := dao.UpdateEntity(db, FreightTemplate, "TemplateID", "TradeLimitID")
if err1 != nil { if err1 != nil {