This commit is contained in:
邹宗楠
2024-01-20 11:18:10 +08:00
parent 2ca961f30e
commit 9cb720e3ce
2 changed files with 2 additions and 2 deletions

View File

@@ -818,7 +818,7 @@ func CreateActForMtByOrder(ctx *jxcontext.Context, act *model.Act, vendorIDs []i
actIdResult[v.AppFoodCode] = v.ActID
}
// RetailDiscountBatchSave2 创建时无法使用排序,只能更时排序生效所以这样写
// RetailDiscountBatchSave2 创建时无法使用排序,只能更时排序生效所以这样写,美团恢复可以删除
actData2 := make([]*mtwmapi.RetailDiscountActData, 0, 0)
if len(actIdResult) != model.NO {
for _, v := range actData {

View File

@@ -316,6 +316,7 @@ func (c *DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInf
deliveryFeeInfo.RefDeliveryFee, deliveryFeeInfo.RefAddFee, err = api.MtpsAPI.PreCreateByShop(param)
deliveryFeeInfo.DeliveryFee = deliveryFeeInfo.RefDeliveryFee
globals.SugarLogger.Debugf("=============deliveryFeeInfo := %s", utils.Format4Output(deliveryFeeInfo, false))
return deliveryFeeInfo, err
}
@@ -331,7 +332,6 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee
return nil, fmt.Errorf("此平台配送已被系统关闭,暂不发配送 [%v]", vendorOrgCode[0].Comment)
}
globals.SugarLogger.Debugf("===================maxDeliveryFee := %d", maxDeliveryFee)
if maxDeliveryFee == model.NO {
fee, err := c.GetWaybillFee(order)
if err != nil {