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-10 15:34:27 +08:00
parent 3bc83381f3
commit 338fac6086
3 changed files with 81 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -251,7 +251,9 @@ func CreateOrUpdateAll(vendorOrgCode string, storeID, vendorStoreID, deliveryFee
//6.同步进数据库
if err := dao.ReplaceInsertFreight(FreightTemplate); err != nil {
globals.SugarLogger.Debug("同步数据库错误信息:%v", err)
if err1 := dao.InsertItemFreight(FreightTemplate); err1 != nil {
globals.SugarLogger.Debug("同步数据库错误信息:%v", err1)
}
}
//if err := dao.CreateEntity(db, FreightTemplate); dao.IsDuplicateError(err) || err != nil {
// if _, err1 := dao.UpdateEntity(db, FreightTemplate, "TemplateID", "WarehouseID", "FenceID", "TradeLimitID", "StoreID", "VendorStoreID"); err1 != nil {
@@ -378,16 +380,18 @@ func (P *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
//同步进数据库
FreightTemplate.FenceID = tempFenceID
FreightTemplate.VendorStoreID = storeInfo.VendorStoreID
//if err := dao.ReplaceInsertFreight(FreightTemplate); err != nil {
// 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.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 {
// 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 {
globals.SugarLogger.Debugf("DouDian UpdateStore wrong information:%v", endErr)
}
@@ -560,9 +564,10 @@ func UpdateFreightTemplate(storeCode int) error {
// /freightTemplate/create 批量创建绑定 满x包邮 运费模板
func CreateBindFreeShipTemplate(vendorOrgCode string, storeID int, shipFee int64) error {
var (
db = dao.GetDB()
errList = errlist.New()
FreightTemplate = &model.FreightTemplate{}
FreightTemplate = &model.FreightTemplate{
StoreID: storeID,
}
)
if shipFee == 0 {
return errors.New("包邮金额必传,请检查")
@@ -593,20 +598,26 @@ func CreateBindFreeShipTemplate(vendorOrgCode string, storeID int, shipFee int64
} else {
param.Template.ProductCity = int64(storeDetail.CityCode)
}
globals.SugarLogger.Debugf("CreateBindFreeShipTemplate param====%s", utils.Format4Output(param, false))
if resp, err := getAPI(vendorOrgCode, 0, "").FreightTemplateCreate(param); err != nil {
return errors.New(fmt.Sprintf("平台门店(%s) 京西门店(%d) 创建包邮模板失败:%v,根据提示处理", storeDetail.VendorStoreID, storeID, err))
} else {
if err := ShopBindStoreFreight(vendorOrgCode, utils.Str2Int64(storeDetail.VendorStoreID), resp.TemplateId); err != nil {
return errors.New(fmt.Sprintf("平台门店(%s) 京西门店(%d) 绑定包邮模板失败:%v,根据提示处理", storeDetail.VendorStoreID, storeID, err))
} else {
if err := dao.CreateEntity(db, FreightTemplate); dao.IsDuplicateError(err) || err != nil {
if _, err1 := dao.UpdateEntity(db, FreightTemplate, "TemplateID"); err1 != nil {
errList.AddErr(fmt.Errorf("包邮模板:更新操作，同步进数据库错误信息:%v", err1))
} else {
errList.AddErr(fmt.Errorf("包邮模板:创建操作，同步进数据库错误信息:%v", err))
FreightTemplate.VendorStoreID = storeDetail.VendorStoreID
FreightTemplate.TemplateID = resp.TemplateId
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 {
// if _, err1 := dao.UpdateEntity(db, FreightTemplate, "TemplateID"); err1 != nil {
// errList.AddErr(fmt.Errorf("包邮模板:更新操作，同步进数据库错误信息:%v", err1))
// } else {
// errList.AddErr(fmt.Errorf("包邮模板:创建操作，同步进数据库错误信息:%v", err))
// }
//}
}
}
if errList.GetErrListAsOne() != nil {

21
business/partner/purchase/tiktok_store/warehouse.go
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
}