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:
邹宗楠
2022-04-11 10:48:19 +08:00
parent 0f5ddd135b
commit 5ca707fc30
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -181,6 +181,7 @@ func (c *BaseScheduler) CreateWaybill(platformVendorID int, order *model.GoodsOr
} }
var balance int var balance int
// 门店发单,如果是京西门店,直接使用京西余额,非京西门店使用门店余额,余额不足使用品牌余额!
if order.CreateDeliveryType == model.YES { if order.CreateDeliveryType == model.YES {
if storeDetail.BrandID == scheduler.JXC4B_SHOP || storeDetail.BrandID == scheduler.JXC4B_RAND_JXGY { // 京西品牌,扣门店 if storeDetail.BrandID == scheduler.JXC4B_SHOP || storeDetail.BrandID == scheduler.JXC4B_RAND_JXGY { // 京西品牌,扣门店
balance = storeAcct.AccountBalance balance = storeAcct.AccountBalance
@@ -193,13 +194,15 @@ func (c *BaseScheduler) CreateWaybill(platformVendorID int, order *model.GoodsOr
balance = 0 balance = 0
} }
} }
}else { } else {
balance, _ = partner.CurStoreAcctManager.GetBrandBalance(storeDetail.BrandID) 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) handlerInfo := partner.GetDeliveryPlatformFromVendorID(platformVendorID)
if handlerInfo != nil && handlerInfo.Use4CreateWaybill { 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 { if c.IsReallyCallPlatformAPI {
// 美团配送订单生成，配送费计算 // 美团配送订单生成，配送费计算
bill, err = handlerInfo.Handler.CreateWaybill(order, maxDeliveryFee) 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 c.IsReallyCallPlatformAPI && bill.OrderVendorID != bill.WaybillVendorID && bill.Status != model.WaybillStatusCanceled {
if handlerInfo := partner.GetDeliveryPlatformFromVendorID(bill.WaybillVendorID); handlerInfo != nil { if handlerInfo := partner.GetDeliveryPlatformFromVendorID(bill.WaybillVendorID); handlerInfo != nil {
if err = utils.CallFuncLogErrorWithInfo(func() error { if err = utils.CallFuncLogErrorWithInfo(func() error {
fmt.Println("cancale ==================111", 22)
return handlerInfo.Handler.CancelWaybill(bill, cancelReasonID, cancelReason) return handlerInfo.Handler.CancelWaybill(bill, cancelReasonID, cancelReason)
}, "CancelWaybill bill:%v", bill); err == nil { }, "CancelWaybill bill:%v", bill); err == nil {
bill.Status = model.WaybillStatusCanceled bill.Status = model.WaybillStatusCanceled