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

- 禁用达达发单

Browse Source
This commit is contained in:
gazebo
2019-05-06 17:07:40 +08:00
parent afd391f25f
commit 4b5fd5925d
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,18 +23,20 @@ func (c *BaseScheduler) CreateWaybillOnProviders(ctx *jxcontext.Context, order *
var errList []string var errList []string
for _, storeCourier := range storeCourierList { for _, storeCourier := range storeCourierList {
courierVendorID := storeCourier.VendorID if handler := partner.GetDeliveryPlatformFromVendorID(storeCourier.VendorID); handler != nil && handler.Use4CreateWaybill {
if order.VendorID != model.VendorIDWSC || courierVendorID != model.VendorIDDada { // 达达作为微商城的自有配送，不参与配送竞争 courierVendorID := storeCourier.VendorID
bill, err2 := c.CreateWaybill(courierVendorID, order, policyHandler) if order.VendorID != model.VendorIDWSC || courierVendorID != model.VendorIDDada { // 达达作为微商城的自有配送，不参与配送竞争
if err = err2; err == nil { bill, err2 := c.CreateWaybill(courierVendorID, order, policyHandler)
globals.SugarLogger.Debugf("CreateWaybillOnProviders orderID:%s userName:%s vendorID:%d bill:%v", order.VendorOrderID, userName, courierVendorID, bill) if err = err2; err == nil {
bills = append(bills, bill) globals.SugarLogger.Debugf("CreateWaybillOnProviders orderID:%s userName:%s vendorID:%d bill:%v", order.VendorOrderID, userName, courierVendorID, bill)
if createOnlyOne { bills = append(bills, bill)
break if createOnlyOne {
break
}
} else {
globals.SugarLogger.Debugf("CreateWaybillOnProviders orderID:%s userName:%s vendorID:%d failed with error:%v", order.VendorOrderID, userName, courierVendorID, err)
errList = append(errList, fmt.Sprintf("平台:%s,%s", jxutils.GetVendorName(courierVendorID), err.Error()))
} }
} else {
globals.SugarLogger.Debugf("CreateWaybillOnProviders orderID:%s userName:%s vendorID:%d failed with error:%v", order.VendorOrderID, userName, courierVendorID, err)
errList = append(errList, fmt.Sprintf("平台:%s,%s", jxutils.GetVendorName(courierVendorID), err.Error()))
} }
} }
} }

2
business/partner/delivery/dada/waybill.go
View File

@@ -36,7 +36,7 @@ type DeliveryHandler struct {
func init() { func init() {
CurDeliveryHandler = new(DeliveryHandler) CurDeliveryHandler = new(DeliveryHandler)
partner.RegisterDeliveryPlatform(CurDeliveryHandler, true) partner.RegisterDeliveryPlatform(CurDeliveryHandler, false)
} }
func OnWaybillMsg(msg *dadaapi.CallbackMsg) (retVal *dadaapi.CallbackResponse) { func OnWaybillMsg(msg *dadaapi.CallbackMsg) (retVal *dadaapi.CallbackResponse) {