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

订单计算修改

Browse Source
This commit is contained in:
苏尹岚
2020-08-17 15:00:52 +08:00
parent a4e15bb61c
commit 927c261f0d
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/auth2/auth2.go
View File

@@ -4,7 +4,6 @@ import (
"bytes" "bytes"
"encoding/base64" "encoding/base64"
"errors" "errors"
"fmt"
"regexp" "regexp"
"strings" "strings"
"time" "time"
@@ -296,7 +295,6 @@ func LoginInternal(ctx *Context, authType, authID, authIDType, authSecret string
} else { } else {
err = ErrIllegalAuthType err = ErrIllegalAuthType
} }
fmt.Println("testauthInfo", utils.Format4Output(authInfo, false))
return authInfo, err return authInfo, err
} }

2
business/jxcallback/orderman/order.go
View File

@@ -215,7 +215,7 @@ func (c *OrderManager) OnOrderStatusChanged(vendorOrgCode string, orderStatus *m
// } // }
// } else { // } else {
if order.NewEarningPrice == 0 || order.NewEarningPrice != (order.TotalShopMoney-waybill.DesiredFee)*int64(100-store.PayPercentage/2)/int64(100) { if order.NewEarningPrice == 0 || order.NewEarningPrice != (order.TotalShopMoney-waybill.DesiredFee)*int64(100-store.PayPercentage/2)/int64(100) {
order.NewEarningPrice = (order.TotalShopMoney - waybill.DesiredFee) * int64(100-store.PayPercentage/2) / int64(100) order.NewEarningPrice = order.TotalShopMoney*int64(100-store.PayPercentage/2)/int64(100) - waybill.DesiredFee
} }
// } // }
} }

2
business/jxutils/jxutils.go
View File

@@ -606,7 +606,7 @@ func RefreshOrderEarningPrice3(order *model.GoodsOrder, payPercentage int, bill
// if order.VendorID == model.VendorIDJDShop || order.VendorID == model.VendorIDJX { // if order.VendorID == model.VendorIDJDShop || order.VendorID == model.VendorIDJX {
// order.NewEarningPrice = (order.TotalShopMoney - bill.DesiredFee) * int64((100 - payPercentage)) / 100 // order.NewEarningPrice = (order.TotalShopMoney - bill.DesiredFee) * int64((100 - payPercentage)) / 100
// } else { // } else {
order.NewEarningPrice = (order.TotalShopMoney - bill.DesiredFee) * int64((100 - payPercentage/2)) / 100 order.NewEarningPrice = order.TotalShopMoney*int64((100-payPercentage/2))/100 - bill.DesiredFee
// } // }
} else { } else {
order.NewEarningPrice = order.EarningPrice order.NewEarningPrice = order.EarningPrice

17
business/partner/purchase/jx/localjx/order.go
View File

@@ -1466,14 +1466,17 @@ func GetMatterOrderStatus(ctx *jxcontext.Context, vendorOrderID string) (result
if err != nil { if err != nil {
return nil, err return nil, err
} }
for _, v := range queryOrderStatus.OrderStatusList { if len(queryOrderStatus.OrderStatusList) > 0 {
matter := &MatterOrderStatus{} for _, v := range queryOrderStatus.OrderStatusList {
matter.Time = utils.Str2Time(v.OperateTime) matter := &MatterOrderStatus{}
matter.Status = v.SoStatusName matter.Time = utils.Str2Time(v.OperateTime)
matter.Name = v.SoStatusName matter.Status = v.SoStatusName
matter.Sign = 1 matter.Name = v.SoStatusName
result = append(result, matter) matter.Sign = 1
result = append(result, matter)
}
} }
if len(getTrackMessagePlusByOrderResult.ResultData) > 0 { if len(getTrackMessagePlusByOrderResult.ResultData) > 0 {
for _, vv := range getTrackMessagePlusByOrderResult.ResultData { for _, vv := range getTrackMessagePlusByOrderResult.ResultData {
matter := &MatterOrderStatus{} matter := &MatterOrderStatus{}