Merge branch 'master' into jxstore

2018-09-05 23:20:41 +08:00
parent 0faaa6b366 f44f947629
commit 88e1ba29e7
4 changed files with 11 additions and 10 deletions
--- a/business/jxcallback/orderman/order_legacy.go
+++ b/business/jxcallback/orderman/order_legacy.go
@@ -170,7 +170,7 @@ func (c *OrderManager) legacyWriteJxOrder(order *model.GoodsOrder, db orm.Ormer,
 		OrderTotalMoney:        int(order.SalePrice),
 		OrderDiscountMoney:     int(order.SalePrice - order.ActualPayPrice),
 		OrderBuyerPayableMoney: int(order.ActualPayPrice),
-		// DeliveryPackageWeight: float64(order.Weight) / 1000,
+		// DeliveryPackageWeight: float64(jxutils.IntWeight2Float(order.Weight)),
 	}
 	if order.VendorID == model.VendorIDELM {
 		jxorder.OrderStatus = JX_ORDER_STATUS_WAIT_FOR_DELIVERY