From 9cb720e3ce9fb605edf3eb9058852fedddd547c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sat, 20 Jan 2024 11:18:10 +0800 Subject: [PATCH] 1 --- business/jxstore/act/act.go | 2 +- business/partner/delivery/mtps/waybill.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/business/jxstore/act/act.go b/business/jxstore/act/act.go index f033d77d7..99aaa627e 100644 --- a/business/jxstore/act/act.go +++ b/business/jxstore/act/act.go @@ -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 { diff --git a/business/partner/delivery/mtps/waybill.go b/business/partner/delivery/mtps/waybill.go index e7795bbcb..6c1286b2c 100644 --- a/business/partner/delivery/mtps/waybill.go +++ b/business/partner/delivery/mtps/waybill.go @@ -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 {