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

删除打桩语句

Browse Source
This commit is contained in:
邹宗楠
2022-03-04 16:13:43 +08:00
parent 0f6635a18c
commit da96198616
6 changed files with 1 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxcallback/scheduler/basesch/basesch.go
View File

@@ -177,9 +177,7 @@ func (c *BaseScheduler) CreateWaybill(platformVendorID int, order *model.GoodsOr
if model.DeliveryBrandMarkMap[platformVendorID]&storeDetail.BrandIsOpen != 0 && balance >= model.BrandBalanceLimit {
if c.IsReallyCallPlatformAPI {
// 美团配送订单生成，配送费计算
globals.SugarLogger.Infof("start create meituan order**************************************************")
bill, err = handlerInfo.Handler.CreateWaybill(order, maxDeliveryFee)
globals.SugarLogger.Infof("start create meituan order**************************************************[%d]", bill.DesiredFee)
if err != nil {
globals.SugarLogger.Infof("CreateWaybill failed orderID:%s vendorID:%d with error:%v", order.VendorOrderID, platformVendorID, err)
} else {

1
business/jxcallback/scheduler/basesch/basesch_ext.go
View File

@@ -41,7 +41,6 @@ func (c *BaseScheduler) CreateWaybillOnProviders(ctx *jxcontext.Context, order *
if handler := partner.GetDeliveryPlatformFromVendorID(storeCourier.VendorID); handler != nil && handler.Use4CreateWaybill {
courierVendorID := storeCourier.VendorID
// 创建订单
globals.SugarLogger.Info("美团创建订单(真正创建美团订单开始)***********************")
bill, err2 := c.CreateWaybill(courierVendorID, order, maxDeliveryFee)
if err = err2; err == nil {
globals.SugarLogger.Debugf("CreateWaybillOnProviders orderID:%s userName:%s vendorID:%d bill:%v", order.VendorOrderID, userName, courierVendorID, bill)

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

@@ -116,7 +116,6 @@ func (s *DefScheduler) isPossibleSwitch2SelfDelivery(order *model.GoodsOrder) (e
// 创建订单
func (s *DefScheduler) CreateWaybillOnProviders4SavedOrder(ctx *jxcontext.Context, savedOrderInfo *WatchOrderInfo, courierVendorIDs, excludeCourierVendorIDs []int, forceCreate bool, maxDeliveryFee int64) (bills []*model.Waybill, err error) {
globals.SugarLogger.Info("美团创建订单(发单)**********************")
order := savedOrderInfo.order
// 查看订单状态是否处于可配送状态
if !forceCreate {
@@ -225,12 +224,9 @@ func (s *DefScheduler) CreateWaybillOnProvidersEx(ctx *jxcontext.Context, vendor
order.DeliveryFlag = 0
err = partner.CurOrderManager.UpdateOrderStatusAndDeliveryFlag(order)
// 创建订单
globals.SugarLogger.Info("美团创建订单***********************")
if bills, err = s.CreateWaybillOnProviders4SavedOrder(ctx, savedOrderInfo, courierVendorIDs, nil, forceCreate, maxDeliveryFee); err == nil && len(bills) > 0 {
partner.CurOrderManager.OnOrderMsg(order, "手动创建运单成功", fmt.Sprintf("%s创建%s平台运单,强发:%t,最高限价:%d", ctx.GetUserName(), model.VendorChineseNames[bills[0].WaybillVendorID], forceCreate, maxDeliveryFee))
}
globals.SugarLogger.Info("美团创建订单成功***********************")
}
} else {
err = scheduler.ErrCanNotFindOrder

9
business/partner/delivery/mtps/waybill.go
View File

@@ -191,7 +191,6 @@ func (c *DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInf
// IDeliveryPlatformHandler（美团配送）
func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee int64) (bill *model.Waybill, err error) {
db := dao.GetDB()
globals.SugarLogger.Info("开始美团订单********************CreateWaybill")
// 检查配送平台是否被禁用
vendorOrgCode, err := dao.GetVendorOrgCode(db, model.VendorIDFengNiao, "", model.VendorOrgTypeDelivery)
if err != nil {
@@ -266,14 +265,7 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee
}
// 通知美团订单，获取返回订单配送费
globals.SugarLogger.Info("开始美团订单********************正儿八经的")
result, err := api.MtpsAPI.CreateOrderByShop2(billParams)
globals.SugarLogger.Info("输出美团配送费用:=====================111", utils.Float64TwoInt64(result.DeliveryFee))
globals.SugarLogger.Info("输出美团配送费用:=====================err", err)
globals.SugarLogger.Debugf("输出美团配送费用:=====================111[%d]", utils.Float64TwoInt64(result.DeliveryFee))
globals.SugarLogger.Debugf("输出美团配送费用:=====================err[%s]", err)
globals.SugarLogger.Debug("输出美团配送费用:=====================err[%s]", err)
globals.SugarLogger.Debug("输出美团配送费用:=====================err[%s]", utils.Float64TwoInt64(result.DeliveryFee))
if err != nil {
globals.SugarLogger.Debugf("CreateWaybill failed, orderID:%s, billParams:%v, error:%v", order.VendorOrderID, billParams, err)
return nil, err
@@ -287,7 +279,6 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee
WaybillVendorID: model.VendorIDMTPS,
DesiredFee: utils.Float64TwoInt64(result.DeliveryFee),
}
globals.SugarLogger.Info("输出美团配送费用:=====================222", bill.DesiredFee)
// 当前运单总费大于配送阈值15，日志打印提示
delivery.OnWaybillCreated(bill)

3
business/partner/purchase/jx/localjx/order.go
View File

@@ -945,8 +945,7 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
} else {
outJxOrder.FreightPrice = 0
}
// 京西测试(=================todo=============================)
outJxOrder.FreightPrice = 0
//表示此订单为物料配送订单
if jxOrder.OrderType != model.OrderTypeNormal {
// if fromStoreID != 0 {

10
tests/default_test.go
View File

@@ -10,7 +10,6 @@ import (
beego "github.com/astaxie/beego/server/web"
//. "github.com/smartystreets/goconvey/convey"
"git.rosy.net.cn/jx-callback/globals"
)
func init() {
@@ -38,12 +37,3 @@ func TestGet(t *testing.T) {
// })
//})
}
func TestPrintDebug(t *testing.T) {
globals.SugarLogger.Info("输出美团配送费用:=====================111", 11111)
globals.SugarLogger.Info("输出美团配送费用:=====================err", 2222)
globals.SugarLogger.Debugf("输出美团配送费用:=====================111[%d]", 33333)
globals.SugarLogger.Debugf("输出美团配送费用:=====================err[%s]", 444444)
globals.SugarLogger.Debug("输出美团配送费用:=====================err[%s]", 555555)
globals.SugarLogger.Debug("输出美团配送费用:=====================err[%s]", 66666)
}