From 2d06499663c84122dd4223bd8ffe07f262be9a49 Mon Sep 17 00:00:00 2001 From: gazebo Date: Fri, 6 Sep 2019 14:24:39 +0800 Subject: [PATCH] =?UTF-8?q?-=20CreateConsumerFromOrders=E5=9C=A8=E9=99=90?= =?UTF-8?q?=E5=88=B6=E5=B9=B6=E5=8F=91=E6=95=B0=E4=B8=BA1=EF=BC=8C?= =?UTF-8?q?=E4=BB=A5=E5=85=8D=E5=87=BA=E7=8E=B0=E4=B8=BB=E9=94=AE=E9=87=8D?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/user2.go | 3 +-- business/jxstore/tempop/tempop.go | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/business/jxstore/cms/user2.go b/business/jxstore/cms/user2.go index b7bd9b455..2d5684644 100644 --- a/business/jxstore/cms/user2.go +++ b/business/jxstore/cms/user2.go @@ -182,7 +182,7 @@ func HandleOrder4Consignee(order *model.GoodsOrder) (err error) { } vendorUserID := order.VendorUserID - if err == nil && vendorUserID != "" { + if vendorUserID != "" { authInfo, err2 := dao.GetAuthBind(db, "", model.AuthBindTypeID, authType, vendorUserID) if err = err2; err != nil && !dao.IsNoRowsError(err) { return err @@ -219,7 +219,6 @@ func HandleOrder4Consignee(order *model.GoodsOrder) (err error) { user.Type = model.UserTypeConsumer err = CreateUser(user, oeratorName) - globals.SugarLogger.Debug(err) } else { if user.GetMobile() == "" && mobileNumber != "" { user.Mobile = &mobileNumber diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go index 0f0060648..85bcfe920 100644 --- a/business/jxstore/tempop/tempop.go +++ b/business/jxstore/tempop/tempop.go @@ -1028,7 +1028,7 @@ func CreateConsumerFromOrders(ctx *jxcontext.Context, vendorIDs []int, fromDate, } db := dao.GetDB() - rootTask := tasksch.NewParallelTask("RefreshMtpsWaybillFee", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError), ctx, + rootTask := tasksch.NewParallelTask("从订单中创建消费都账户", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError), ctx, func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { curDate := batchItemList[0].(time.Time) sql := ` @@ -1050,7 +1050,8 @@ func CreateConsumerFromOrders(ctx *jxcontext.Context, vendorIDs []int, fromDate, var orderList []*GoodsOrderWithOriginal if err = dao.GetRows(db, &orderList, sql, sqlParams...); err == nil { if len(orderList) > 0 { - subTask := tasksch.NewParallelTask("RefreshMtpsWaybillFee", tasksch.NewParallelConfig().SetIsContinueWhenError(isContinueWhenError), ctx, + // 并发必须是1，否则在HandleOrder4Consignee中可能导致主键重，错误 + subTask := tasksch.NewParallelTask("RefreshMtpsWaybillFee", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError), ctx, func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { order := batchItemList[0].(*GoodsOrderWithOriginal) if isForce || order.VendorUserID == "" {