From d9ec93d4936ed4989a498db326233d4415d8b900 Mon Sep 17 00:00:00 2001 From: gazebo Date: Thu, 12 Sep 2019 16:31:14 +0800 Subject: [PATCH 1/3] =?UTF-8?q?-=20=E9=A5=BF=E7=99=BE=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E7=9A=84order=5Findex=E5=8F=AF=E8=83=BD=E4=B8=BAint=E6=88=96st?= =?UTF-8?q?ring...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/ebai/order.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/partner/purchase/ebai/order.go b/business/partner/purchase/ebai/order.go index 03a58d993..5bb422226 100644 --- a/business/partner/purchase/ebai/order.go +++ b/business/partner/purchase/ebai/order.go @@ -184,7 +184,7 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo ExpectedDeliveredTime: getTimeFromInterface(orderMap["send_time"]), PickDeadline: utils.DefaultTimeValue, 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"]), OrderCreatedAt: getTimeFromInterface(orderMap["create_time"]), OriginalData: string(utils.MustMarshal(result)), From 54a55dcac09d2517bcf749d1c719e4d2c72ffb40 Mon Sep 17 00:00:00 2001 From: gazebo Date: Thu, 12 Sep 2019 16:55:11 +0800 Subject: [PATCH 2/3] =?UTF-8?q?-=20=E6=B4=BB=E5=8A=A8=E4=BB=B7=E4=BF=9D?= =?UTF-8?q?=E7=95=99=E5=88=B0=E5=88=B0=E8=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/act/act.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/business/jxstore/act/act.go b/business/jxstore/act/act.go index 349890b60..bb0b24dcd 100644 --- a/business/jxstore/act/act.go +++ b/business/jxstore/act/act.go @@ -2,6 +2,7 @@ package act import ( "fmt" + "math" "time" "git.rosy.net.cn/baseapi/utils" @@ -142,6 +143,9 @@ func ActStoreSkuParam2Model(ctx *jxcontext.Context, db *dao.DaoDB, act *model.Ac percentage = v.PricePercentage } 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 { actSkuMap.ActualActPrice = 1 From 3de6498de481d5343b8826b9c5d9738ba32d8444 Mon Sep 17 00:00:00 2001 From: gazebo Date: Thu, 12 Sep 2019 17:35:43 +0800 Subject: [PATCH 3/3] + NewSeqTask2 --- business/jxutils/tasksch/sequence_task.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/business/jxutils/tasksch/sequence_task.go b/business/jxutils/tasksch/sequence_task.go index 7bcd3faac..1ab500466 100644 --- a/business/jxutils/tasksch/sequence_task.go +++ b/business/jxutils/tasksch/sequence_task.go @@ -19,10 +19,14 @@ type SeqTask struct { } 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{ worker: worker, } - task.Init(1, 1, false, params, taskName, ctx, stepCount, stepCount) + task.Init(1, 1, isContinueWhenError, params, taskName, ctx, stepCount, stepCount) return task }