Merge remote-tracking branch 'origin/mark' into su

2020-02-21 14:05:06 +08:00
parent fcb37966e9 fb8bce878f
commit 5ee6af40d2
10 changed files with 31 additions and 21 deletions
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -466,6 +466,12 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
 	} else {
 		outJxOrder.FreightPrice = 0
 	}
+	if outJxOrder.OrderPrice >= int64(storeDetail.DeliveryFeeDeductionSill) {
+		outJxOrder.FreightPrice -= int64(storeDetail.DeliveryFeeDeductionFee)
+		if outJxOrder.FreightPrice < 0 {
+			outJxOrder.FreightPrice = 0
+		}
+	}
 	if err == nil {
 		outJxOrder.TotalPrice = outJxOrder.OrderPrice + outJxOrder.FreightPrice
 		outJxOrder.ActualPayPrice = outJxOrder.TotalPrice