diff --git a/business/jxcallback/scheduler/basesch/basesch.go b/business/jxcallback/scheduler/basesch/basesch.go index 0f146e910..613460de7 100644 --- a/business/jxcallback/scheduler/basesch/basesch.go +++ b/business/jxcallback/scheduler/basesch/basesch.go @@ -181,6 +181,7 @@ func (c *BaseScheduler) CreateWaybill(platformVendorID int, order *model.GoodsOr } var balance int + // 门店发单,如果是京西门店,直接使用京西余额,非京西门店使用门店余额,余额不足使用品牌余额! if order.CreateDeliveryType == model.YES { if storeDetail.BrandID == scheduler.JXC4B_SHOP || storeDetail.BrandID == scheduler.JXC4B_RAND_JXGY { // 京西品牌,扣门店 balance = storeAcct.AccountBalance @@ -193,13 +194,15 @@ func (c *BaseScheduler) CreateWaybill(platformVendorID int, order *model.GoodsOr balance = 0 } } - }else { + } else { balance, _ = partner.CurStoreAcctManager.GetBrandBalance(storeDetail.BrandID) } + globals.SugarLogger.Debugf("lilei_______________当前支付门店id%d,当前门店余额%d,发送方式%d,品牌id%d", storeDetail.Store.ID, balance, platformVendorID, storeDetail.BrandID) handlerInfo := partner.GetDeliveryPlatformFromVendorID(platformVendorID) if handlerInfo != nil && handlerInfo.Use4CreateWaybill { - if model.DeliveryBrandMarkMap[platformVendorID]&storeDetail.BrandIsOpen != 0 && balance >= model.BrandBalanceLimit { + //if model.DeliveryBrandMarkMap[platformVendorID]&storeDetail.BrandIsOpen != 0 && balance >= model.BrandBalanceLimit { + if _, ok := model.DeliveryBrandMarkMap[platformVendorID]; ok && storeDetail.BrandIsOpen != 0 && balance >= model.BrandBalanceLimit { if c.IsReallyCallPlatformAPI { // 美团配送订单生成,配送费计算 bill, err = handlerInfo.Handler.CreateWaybill(order, maxDeliveryFee) @@ -225,7 +228,6 @@ func (c *BaseScheduler) CancelWaybill(bill *model.Waybill, cancelReasonID int, c if c.IsReallyCallPlatformAPI && bill.OrderVendorID != bill.WaybillVendorID && bill.Status != model.WaybillStatusCanceled { if handlerInfo := partner.GetDeliveryPlatformFromVendorID(bill.WaybillVendorID); handlerInfo != nil { if err = utils.CallFuncLogErrorWithInfo(func() error { - fmt.Println("cancale ==================111", 22) return handlerInfo.Handler.CancelWaybill(bill, cancelReasonID, cancelReason) }, "CancelWaybill bill:%v", bill); err == nil { bill.Status = model.WaybillStatusCanceled