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

Merge remote-tracking branch 'origin/mark' into don

Browse Source
This commit is contained in:
Rosy-zhudan
2019-09-12 17:58:31 +08:00
parent 00603a0a34 3de6498de4
commit 91b05593e4
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/jxstore/act/act.go
View File

@@ -2,6 +2,7 @@ package act
import ( import (
"fmt" "fmt"
"math"
"time" "time"
"git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/baseapi/utils"
@@ -142,6 +143,9 @@ func ActStoreSkuParam2Model(ctx *jxcontext.Context, db *dao.DaoDB, act *model.Ac
percentage = v.PricePercentage percentage = v.PricePercentage
} }
actSkuMap.ActualActPrice = int64(jxutils.CaculateSkuVendorPrice(int(actSkuMap.VendorPrice), percentage, 0)) actSkuMap.ActualActPrice = int64(jxutils.CaculateSkuVendorPrice(int(actSkuMap.VendorPrice), percentage, 0))
if actSkuMap.ActualActPrice > 10 {
actSkuMap.ActualActPrice = int64(math.Round(float64(actSkuMap.ActualActPrice)/10) * 10)
}
} }
if actSkuMap.ActualActPrice <= 0 { if actSkuMap.ActualActPrice <= 0 {
actSkuMap.ActualActPrice = 1 actSkuMap.ActualActPrice = 1

6
business/jxutils/tasksch/sequence_task.go
View File

@@ -19,10 +19,14 @@ type SeqTask struct {
} }
func NewSeqTask(taskName string, ctx *jxcontext.Context, worker SeqWorkFunc, stepCount int, params ...interface{}) *SeqTask { func NewSeqTask(taskName string, ctx *jxcontext.Context, worker SeqWorkFunc, stepCount int, params ...interface{}) *SeqTask {
return NewSeqTask2(taskName, ctx, false, worker, stepCount, params...)
}
func NewSeqTask2(taskName string, ctx *jxcontext.Context, isContinueWhenError bool, worker SeqWorkFunc, stepCount int, params ...interface{}) *SeqTask {
task := &SeqTask{ task := &SeqTask{
worker: worker, worker: worker,
} }
task.Init(1, 1, false, params, taskName, ctx, stepCount, stepCount) task.Init(1, 1, isContinueWhenError, params, taskName, ctx, stepCount, stepCount)
return task return task
} }

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

@@ -184,7 +184,7 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
ExpectedDeliveredTime: getTimeFromInterface(orderMap["send_time"]), ExpectedDeliveredTime: getTimeFromInterface(orderMap["send_time"]),
PickDeadline: utils.DefaultTimeValue, PickDeadline: utils.DefaultTimeValue,
VendorStatus: utils.Int64ToStr(utils.MustInterface2Int64(orderMap["status"])), VendorStatus: utils.Int64ToStr(utils.MustInterface2Int64(orderMap["status"])),
OrderSeq: int(utils.Str2Int64(utils.Interface2String(orderMap["order_index"]))), OrderSeq: int(utils.ForceInterface2Int64(orderMap["order_index"])),
StatusTime: getTimeFromInterface(orderMap["create_time"]), StatusTime: getTimeFromInterface(orderMap["create_time"]),
OrderCreatedAt: getTimeFromInterface(orderMap["create_time"]), OrderCreatedAt: getTimeFromInterface(orderMap["create_time"]),
OriginalData: string(utils.MustMarshal(result)), OriginalData: string(utils.MustMarshal(result)),