Merge remote-tracking branch 'origin/jdshop' into jxact

2020-08-19 16:03:34 +08:00
parent a3bc20820c 1372895cec
commit ad4e2712f5
3 changed files with 20 additions and 5 deletions
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -803,6 +803,9 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
 				outJxOrder.FreightPrice = 0
 			}
 		}
+		if IsDeliverySelf {
+			outJxOrder.FreightPrice = 0
+		}
 	}
 	if err == nil {
 		outJxOrder.TotalPrice = outJxOrder.OrderPrice + outJxOrder.FreightPrice