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

- remove fuck

Browse Source
This commit is contained in:
gazebo
2019-09-06 15:11:36 +08:00
parent 2d06499663
commit a89928a366
3 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
business/jxstore/tempop/tempop.go
View File

@@ -1028,7 +1028,7 @@ func CreateConsumerFromOrders(ctx *jxcontext.Context, vendorIDs []int, fromDate,
}
db := dao.GetDB()
rootTask := tasksch.NewParallelTask("从订单中创建消费都账户", 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 := `
@@ -1051,13 +1051,12 @@ func CreateConsumerFromOrders(ctx *jxcontext.Context, vendorIDs []int, fromDate,
if err = dao.GetRows(db, &orderList, sql, sqlParams...); err == nil {
if len(orderList) > 0 {
// 并发必须是1，否则在HandleOrder4Consignee中可能导致主键重，错误
subTask := tasksch.NewParallelTask("RefreshMtpsWaybillFee", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError), ctx,
subTask := tasksch.NewParallelTask(fmt.Sprintf("处理日期:%s的订单", utils.Time2DateStr(curDate)), 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 == "" {
if handler := partner.GetPurchasePlatformFromVendorID(order.VendorID); handler != nil {
var order2 *model.GoodsOrder
// globals.SugarLogger.Debugf("fuck:%s", order.OriginalData)
if order.OriginalData != "" {
var orderData map[string]interface{}
if utils.UnmarshalUseNumber([]byte(order.OriginalData), &orderData) == nil {
@@ -1071,12 +1070,17 @@ func CreateConsumerFromOrders(ctx *jxcontext.Context, vendorIDs []int, fromDate,
order2, err = handler.GetOrder(order.VendorOrderID)
}
if order2 != nil {
isNeedUpdateOrder := order.VendorUserID != order2.VendorUserID
order.VendorUserID = order2.VendorUserID
if isNeedUpdateOrder {
dao.UpdateEntity(db, &order.GoodsOrder, "VendorUserID")
var updateFields []string
if order2.VendorUserID != "" && order.VendorUserID != order2.VendorUserID {
updateFields = append(updateFields, "VendorUserID")
order.VendorUserID = order2.VendorUserID
}
if err = cms.HandleOrder4Consignee(&order.GoodsOrder); err == nil {
updateFields = append(updateFields, "UserID")
}
if len(updateFields) > 0 {
dao.UpdateEntity(db, &order.GoodsOrder, updateFields...)
}
err = cms.HandleOrder4Consignee(&order.GoodsOrder)
}
}
}