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

重修代码

Browse Source
This commit is contained in:
lyb
2018-08-10 10:17:21 +08:00
parent a873eb5a06
commit c45858e4e9
3 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
business/controller/jd/order.go
View File

@@ -91,7 +91,6 @@ func (c *OrderController) GetOrder(orderID string) (order *model.GoodsOrder, err
ActualPayPrice: utils.MustInterface2Int64(result["orderBuyerPayableMoney"]), ActualPayPrice: utils.MustInterface2Int64(result["orderBuyerPayableMoney"]),
Skus: []*model.OrderSku{}, Skus: []*model.OrderSku{},
} }
order.Status = c.GetStatusFromVendorStatus(order.VendorStatus) order.Status = c.GetStatusFromVendorStatus(order.VendorStatus)
businessTage := utils.Interface2String(result["businessTag"]) businessTage := utils.Interface2String(result["businessTag"])
if strings.Index(businessTage, "dj_aging_immediately") >= 0 { if strings.Index(businessTage, "dj_aging_immediately") >= 0 {
@@ -145,14 +144,7 @@ func (c *OrderController) GetOrder(orderID string) (order *model.GoodsOrder, err
func setOrederDetailFee(result map[string]interface{}, order *model.GoodsOrder) { func setOrederDetailFee(result map[string]interface{}, order *model.GoodsOrder) {
order.BoxFee = utils.MustInterface2Int64(result["packagingMoney"]) order.BoxFee = utils.MustInterface2Int64(result["packagingMoney"])
order.PlatformFeeRate = model.JdPlatformFeeRate order.PlatformFeeRate = model.JdPlatformFeeRate
var StoreFreightFee int64 order.BillStoreFreightFee = utils.MustInterface2Int64(result["merchantPaymentDistanceFreightMoney"]) + utils.MustInterface2Int64(result["tips"])
if utils.Interface2String(result["deliveryCarrierNo"]) == model.NoJdDeliveryCarrierNo {
StoreFreightFee = 0
} else {
StoreFreightFee = utils.MustInterface2Int64(result["merchantPaymentDistanceFreightMoney"]) + utils.MustInterface2Int64(result["tips"])
}
order.BillStoreFreightFee = StoreFreightFee
} }
func setSkuDetailFee(skuPmFee int64, skuPmSubsidy int64, order *model.GoodsOrder, skuId int64) { func setSkuDetailFee(skuPmFee int64, skuPmSubsidy int64, order *model.GoodsOrder, skuId int64) {

2
business/model/const.go
View File

@@ -126,8 +126,6 @@ const (
var ( var (
JdSkuPromotion = [10]int64{2, 3, 4, 1203, 6, 9998, 9997, 9996, 8, 8001} JdSkuPromotion = [10]int64{2, 3, 4, 1203, 6, 9998, 9997, 9996, 8, 8001}
//京东众包编号
NoJdDeliveryCarrierNo string = "2938"
) )
const ( const (

4
business/model/order.go
View File

@@ -46,9 +46,9 @@ type GoodsOrder struct {
ModelTimeInfo ModelTimeInfo
OriginalData string `orm:"type(text)"` OriginalData string `orm:"type(text)"`
Skus []*OrderSku `orm:"-"` Skus []*OrderSku `orm:"-"`
SkuTotalPmFee int64 //门店商品促销总支出 SkuPmFee int64 //门店商品促销总支出
OrderPmFee int64 //门店订单促销支出 OrderPmFee int64 //门店订单促销支出
SkuTotalPmSubsidy int64 //平台商品促销总补贴 SkuPmSubsidy int64 //平台商品促销总补贴
OrderPmSubsidy int64 //平台订单促销补贴 OrderPmSubsidy int64 //平台订单促销补贴
BoxFee int64 //餐盒费 BoxFee int64 //餐盒费
PlatformFeeRate int16 //平台费 PlatformFeeRate int16 //平台费