liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- fixed some price bug.

Browse Source
This commit is contained in:
gazebo
2018-07-26 16:49:21 +08:00
parent 11db08e4c3
commit 5f4af9ced0
3 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/controller/elm/order.go
View File

@@ -181,7 +181,7 @@ func (c *OrderController) GetOrder(orderID string) (order *model.GoodsOrder, err
SkuID: int(utils.Str2Int64WithDefault(utils.Interface2String(product["extendCode"]), 0)), SkuID: int(utils.Str2Int64WithDefault(utils.Interface2String(product["extendCode"]), 0)),
VendorSkuID: utils.Int64ToStr(utils.MustInterface2Int64(product["skuId"])), VendorSkuID: utils.Int64ToStr(utils.MustInterface2Int64(product["skuId"])),
SkuName: product["name"].(string), SkuName: product["name"].(string),
SalePrice: jxutils.StandardPrice2Int(utils.MustInterface2Float64(product["userPrice"])), SalePrice: jxutils.StandardPrice2Int(utils.MustInterface2Float64(product["price"])), // todo 这个其实不是用户实付价，但之前用的userPrice取出来是空，暂时先用到
Weight: int(math.Round(utils.Interface2FloatWithDefault(product["weight"], 0.0))), Weight: int(math.Round(utils.Interface2FloatWithDefault(product["weight"], 0.0))),
} }
order.Skus = append(order.Skus, sku) order.Skus = append(order.Skus, sku)

2
business/controller/mtps/waybill.go
View File

@@ -158,7 +158,7 @@ func (c *WaybillController) CreateWaybill(order *model.GoodsOrder) (err error) {
ReceiverLat: jxutils.StandardCoordinate2Int(latFloat), ReceiverLat: jxutils.StandardCoordinate2Int(latFloat),
GoodsValue: jxutils.IntPrice2Standard(order.SalePrice), // todo 超价处理 GoodsValue: jxutils.IntPrice2Standard(order.SalePrice), // todo 超价处理
GoodsWeight: float64(order.Weight) / 1000, GoodsWeight: float64(order.Weight) / 1000,
ExpectedDeliveryTime: order.ExpectedDeliveredTime.Unix(), // ExpectedDeliveryTime: order.ExpectedDeliveredTime.Unix(),
OrderType: mtpsapi.OrderTypeASAP, OrderType: mtpsapi.OrderTypeASAP,
} }
if billParams.DeliveryID, err = c.getDeliveryID(order, db); err == nil { if billParams.DeliveryID, err = c.getDeliveryID(order, db); err == nil {

1
business/controller/order_legacy.go
View File

@@ -169,6 +169,7 @@ func (c *OrderController) legacyWriteJxOrder(order *model.GoodsOrder, db orm.Orm
JdStoreId: order.VendorStoreID, JdStoreId: order.VendorStoreID,
OrderTotalMoney: int(order.SalePrice), OrderTotalMoney: int(order.SalePrice),
OrderDiscountMoney: int(order.SalePrice - order.ActualPayPrice), OrderDiscountMoney: int(order.SalePrice - order.ActualPayPrice),
OrderBuyerPayableMoney: int(order.ActualPayPrice),
// DeliveryPackageWeight: float64(order.Weight) / 1000, // DeliveryPackageWeight: float64(order.Weight) / 1000,
} }
if order.VendorID == model.VendorIDELM { if order.VendorID == model.VendorIDELM {