liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

waybill

Browse Source
This commit is contained in:
richboo111
2022-11-14 16:26:31 +08:00
parent 91f07e2904
commit 92c250e512
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/jxcallback/scheduler/defsch/defsch_ext.go
View File

@@ -442,6 +442,7 @@ func (s *DefScheduler) QueryOrderWaybillFeeInfoEx(ctx *jxcontext.Context, vendor
deliveryFeeMap, err = func() (deliveryFeeMap map[int]*partner.WaybillFeeInfo, err error) {
db := dao.GetDB()
order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, vendorID)
globals.SugarLogger.Debugf("检测 order 数据 %s %d", order.VendorWaybillID, order.WaybillVendorID)
if err != nil {
return nil, err
}
@@ -456,6 +457,7 @@ func (s *DefScheduler) QueryOrderWaybillFeeInfoEx(ctx *jxcontext.Context, vendor
}
// 美团配送订单兑现
waybillList, err := partner.CurOrderManager.GetOrderWaybillInfo(ctx, vendorOrderID, vendorID, true, false)
globals.SugarLogger.Debugf("检测数据 waybillList %d %s", waybillList[0].Waybill.WaybillVendorID, waybillList[0].Waybill.VendorWaybillID)
if err != nil {
return nil, err
}
@@ -463,6 +465,7 @@ func (s *DefScheduler) QueryOrderWaybillFeeInfoEx(ctx *jxcontext.Context, vendor
for _, bill := range waybillList {
waybillMap[bill.WaybillVendorID] = &bill.Waybill
}
globals.SugarLogger.Debugf("waybillMap[waybillList[0].WaybillVendorID].WaybillVendorID===========%d", waybillMap[waybillList[0].WaybillVendorID].WaybillVendorID)
deliveryFeeMap = make(map[int]*partner.WaybillFeeInfo)
var timeoutSecond int
@@ -475,6 +478,7 @@ func (s *DefScheduler) QueryOrderWaybillFeeInfoEx(ctx *jxcontext.Context, vendor
feeInfo = &partner.WaybillFeeInfo{
Waybill: waybillMap[storeCourier.VendorID],
}
globals.SugarLogger.Debugf("feeInfo===========%s", feeInfo.Waybill.VendorWaybillID)
} else {
if storeCourier.Status != model.StoreStatusOpened {
feeInfo = &partner.WaybillFeeInfo{

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

@@ -373,9 +373,9 @@ func CreateAndBindAllV2(vendorOrgCode string, storeID, vendorStoreID, deliveryFe
if err := dao.CreateEntity(db, FreightTemplate); err != nil {
_, err1 := dao.UpdateEntity(db, FreightTemplate, "TemplateID", "WarehouseID", "FenceID", "TradeLimitID")
if err1 == nil {
errList.AddErr(fmt.Errorf("同步进数据库错误信息:%v", err))
errList.AddErr(fmt.Errorf("同步Step1进数据库错误信息:%v", err))
} else {
errList.AddErr(fmt.Errorf("同步进数据库错误信息:%v", err1))
errList.AddErr(fmt.Errorf("同步Step2进数据库错误信息:%v", err1))
}
}
endErr := errList.GetErrListAsOne()
@@ -495,10 +495,11 @@ func (P *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
dao.WrapAddIDCULDEntity(FreightTemplate, userName)
if err = dao.CreateEntity(db, FreightTemplate); err != nil {
if _, err1 := dao.UpdateEntity(db, FreightTemplate, "FenceID"); err1 != nil {
globals.SugarLogger.Debug("db update storeID,vendorStoreID defeat on :%v", err1)
errList.AddErr(fmt.Errorf("同步进数据库错误信息:%v", err1))
globals.SugarLogger.Debugf("db update storeID,vendorStoreID defeat on :%v", err1)
errList.AddErr(fmt.Errorf("同步Step1进数据库错误信息:%v", err1))
} else {
errList.AddErr(fmt.Errorf("同步进数据库错误信息:%v", err))
globals.SugarLogger.Debugf("检测数据打印 err===========%v", err)
errList.AddErr(fmt.Errorf("同步Step2进数据库错误信息:%v", err))
}
}
}