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 17:36:09 +08:00
parent aac9881f6a
commit 1a647ea5f2
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -203,7 +203,7 @@ func setOrederDetailFee(result map[string]interface{}, order *model.GoodsOrder)
categoryId := utils.MustInterface2Int64(activity["categoryId"]) categoryId := utils.MustInterface2Int64(activity["categoryId"])
restaurantPart := -jxutils.StandardPrice2Int(utils.MustInterface2Float64(activity["restaurantPart"])) restaurantPart := -jxutils.StandardPrice2Int(utils.MustInterface2Float64(activity["restaurantPart"]))
elemePart := -jxutils.StandardPrice2Int(utils.MustInterface2Float64(activity["elemePart"])) elemePart := -jxutils.StandardPrice2Int(utils.MustInterface2Float64(activity["elemePart"]))
if _, isHave := model.ElmSkuPromotion[int(categoryId)]; isHave { if _, ok := model.ElmSkuPromotion[int(categoryId)]; ok {
order.SkuPmFee += restaurantPart order.SkuPmFee += restaurantPart
order.SkuPmSubsidy += elemePart order.SkuPmSubsidy += elemePart
} else { } else {

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

@@ -20,7 +20,7 @@ func init() {
api.Init() api.Init()
} }
func Test_GetOrder(t *testing.T) { func TestGetOrder(t *testing.T) {
orderID := "3025427524410871880" orderID := "3025427524410871880"
order, err := new(OrderController).GetOrder(orderID) order, err := new(OrderController).GetOrder(orderID)
if err != nil { if err != nil {

6
business/model/const.go
View File

@@ -125,9 +125,9 @@ const (
) )
var ( var (
ElmSkuPromotion = map[int]string{ ElmSkuPromotion = map[int]int{
11: "1", 11: 1,
200: "1", 200: 1,
} }
) )