From b49200b69bf0d78b06448373345d8326ea3de887 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 22 Aug 2022 10:20:47 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=B4=B9=E5=87=8F=E5=85=8D=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/jx/localjx/order.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go index 345108783..c4768d014 100644 --- a/business/partner/purchase/jx/localjx/order.go +++ b/business/partner/purchase/jx/localjx/order.go @@ -1019,7 +1019,11 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64 // 订单超过一千配送费优惠(门店运费) discountPrice, err := cms.GetStoreVendorMaps(ctx, nil, jxOrder.StoreID, -1) if len(discountPrice) == 1 && outJxOrder.OrderPrice >= int64(discountPrice[0].DeliveryFeeDeductionSill) { - outJxOrder.FreightPrice = outJxOrder.FreightPrice - int64(discountPrice[0].DeliveryFeeDeductionFee) + if outJxOrder.FreightPrice-int64(discountPrice[0].DeliveryFeeDeductionFee) >= 0 { + outJxOrder.FreightPrice = outJxOrder.FreightPrice - int64(discountPrice[0].DeliveryFeeDeductionFee) + } else { + outJxOrder.FreightPrice = 0 + } } // ?????????????????????? 测试 if storeDetail.ID == 668470 || storeDetail.ID == 668469 { @@ -1720,7 +1724,7 @@ func CancelPayTimeOutOrder(ctx *jxcontext.Context) (err error) { AND vendor_id = ? ` sqlParams := []interface{}{ - time.Now().Add(-time.Minute * 1), + time.Now().Add(-time.Minute * 30), model.OrderStatusWait4Pay, model.VendorIDJX, }