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

- 去掉order相关的无用的一些字段

Browse Source
This commit is contained in:
gazebo
2019-05-08 09:48:04 +08:00
parent 427338aacf
commit b21846f0d3
5 changed files with 0 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
business/model/order.go
View File

@@ -50,13 +50,6 @@ type GoodsOrder struct {
OriginalData string `orm:"-" json:"-"` // 只是用于传递数据
Skus []*OrderSku `orm:"-" json:"-"`
Flag int8 `json:"flag"` //非运单调整相关的其它状态
SkuPmFee int64 `json:"-"` //门店商品活动总支出
OrderPmFee int64 `json:"-"` //门店订单活动支出
SkuPmSubsidy int64 `json:"-"` //平台商品活动总补贴
OrderPmSubsidy int64 `json:"-"` //平台订单活动补贴
BoxFee int64 `json:"-"` //餐盒费
PlatformFeeRate int16 `json:"-"` //平台费
BillStoreFreightFee int64 `json:"-"` //需要回调，门店所承担的运费
}
func (o *GoodsOrder) TableUnique() [][]string {
@@ -98,8 +91,6 @@ type OrderSku struct {
SkuType int `json:"skuType"` // 当前如果为gift就为1，否则缺省为0
PromotionType int `json:"promotionType"` // todo 当前是用于记录京东的PromotionType(生成jxorder用)，没有做转换
OrderCreatedAt time.Time `orm:"type(datetime);index" json:"-"` // 分区考虑
SkuPmSubsidy int64 `json:"-"` //平台商品活动补贴
SkuPmFee int64 `json:"-"` //门店商品活动支出
}
// 同样商品在一个订单中可能重复出现（比如搞活动时，相同商品价格不一样，第一个有优惠）

1
business/partner/purchase/ebai/order.go
View File

@@ -214,7 +214,6 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
order.Skus = append(order.Skus, sku)
}
jxutils.RefreshOrderSkuRelated(order)
// setOrederDetailFee(result, order)
return order
}

21
business/partner/purchase/elm/order.go
View File

@@ -193,30 +193,9 @@ func (c *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
}
}
jxutils.RefreshOrderSkuRelated(order)
setOrederDetailFee(result, order)
return order
}
func setOrederDetailFee(result map[string]interface{}, order *model.GoodsOrder) {
orderActivities, ok := result["orderActivities"].([]interface{})
if ok {
for _, value := range orderActivities {
activity := value.(map[string]interface{})
categoryId := utils.MustInterface2Int64(activity["categoryId"])
restaurantPart := -jxutils.StandardPrice2Int(utils.MustInterface2Float64(activity["restaurantPart"]))
elemePart := -jxutils.StandardPrice2Int(utils.MustInterface2Float64(activity["elemePart"]))
if _, ok := model.ElmSkuPromotion[int(categoryId)]; ok {
order.SkuPmFee += restaurantPart
order.SkuPmSubsidy += elemePart
} else {
order.OrderPmFee += restaurantPart
order.OrderPmSubsidy += elemePart
}
}
}
order.PlatformFeeRate = int16(utils.MustInterface2Float64(result["serviceRate"]))
}
//
func (c *PurchaseHandler) onOrderNew(msg map[string]interface{}) (response *elmapi.CallbackResponse) {
// todo 这里应该可以直接用msg里的内容，而不用再次去查

7
business/partner/purchase/jd/order.go
View File

@@ -155,16 +155,9 @@ func (c *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
order.Skus = append(order.Skus, sku)
}
jxutils.RefreshOrderSkuRelated(order)
setOrederDetailFee(result, order)
return order
}
func setOrederDetailFee(result map[string]interface{}, order *model.GoodsOrder) {
order.BoxFee = utils.Interface2Int64WithDefault(result["packagingMoney"], 0)
order.PlatformFeeRate = model.JdPlatformFeeRate
order.BillStoreFreightFee = utils.Interface2Int64WithDefault(result["merchantPaymentDistanceFreightMoney"], 0) + utils.Interface2Int64WithDefault(result["tips"], 0)
}
//
func (c *PurchaseHandler) onOrderNew(msg *jdapi.CallbackOrderMsg) (response *jdapi.CallbackResponse) {
order, orderMap, err := c.getOrder(msg.BillID)

1
business/partner/purchase/mtwm/order.go
View File

@@ -148,7 +148,6 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
order.Skus = append(order.Skus, sku)
}
jxutils.RefreshOrderSkuRelated(order)
// setOrederDetailFee(result, order)
return order
}