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

- DeleteStoreAllCategories中的任务改为可错误继续的

Browse Source
This commit is contained in:
gazebo
2019-09-19 09:28:46 +08:00
parent e6af1d9ebe
commit 103ab3c755
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -585,8 +585,9 @@ func (c *OrderManager) UpdateOrderFields(order *model.GoodsOrder, fieldList []st
order2 := *order order2 := *order
if err = dao.GetEntity(db, &order2, model.FieldVendorOrderID, model.FieldVendorID); err == nil { if err = dao.GetEntity(db, &order2, model.FieldVendorOrderID, model.FieldVendorID); err == nil {
order.ID = order2.ID order.ID = order2.ID
} else if dao.IsNoRowsError(err) {
err = nil // 强制忽略订单不存在错误
} }
err = nil // 强制忽略订单不存在错误
} }
if err == nil && order.ID != 0 { if err == nil && order.ID != 0 {
_, err = db.Db.Update(order, fieldList...) _, err = db.Db.Update(order, fieldList...)

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

@@ -564,7 +564,7 @@ func DeleteWrongSpu(ctx *jxcontext.Context, isAsync, isContinueWhenError bool) (
if err = dao.GetRows(db, &skuNameList, sql, utils.DefaultTimeValue); err != nil { if err = dao.GetRows(db, &skuNameList, sql, utils.DefaultTimeValue); err != nil {
return "", err return "", err
} }
rootTask := tasksch.NewSeqTask("DeleteWrongSpu", ctx, rootTask := tasksch.NewSeqTask2("DeleteWrongSpu", ctx, true,
func(task *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) { func(task *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) {
mapData := map[string]interface{}{ mapData := map[string]interface{}{
"name": skuNameList[step].Name, "name": skuNameList[step].Name,
@@ -572,7 +572,6 @@ func DeleteWrongSpu(ctx *jxcontext.Context, isAsync, isContinueWhenError bool) (
_, err = cms.UpdateSkuName(ctx, skuNameList[step].ID, mapData, ctx.GetUserName()) _, err = cms.UpdateSkuName(ctx, skuNameList[step].ID, mapData, ctx.GetUserName())
if err != nil { if err != nil {
globals.SugarLogger.Debugf("DeleteWrongSpu failed nameid:%d, name:%s, with error:%v", skuNameList[step].ID, skuNameList[step].Name, err) globals.SugarLogger.Debugf("DeleteWrongSpu failed nameid:%d, name:%s, with error:%v", skuNameList[step].ID, skuNameList[step].Name, err)
err = nil // 强制忽略错误
} }
return nil, err return nil, err
}, len(skuNameList)) }, len(skuNameList))

2
business/jxutils/smsmsg/smsmsg.go
View File

@@ -35,7 +35,7 @@ func SendSMSMsg(mobileList []string, signName, templateCode string, templatePara
globals.SugarLogger.Warnf("SendSMSMsg mobileNum:%s failed with error:%v", mobileNum, err) globals.SugarLogger.Warnf("SendSMSMsg mobileNum:%s failed with error:%v", mobileNum, err)
errList.AddErr(err) errList.AddErr(err)
} else if response.Code != aliyunsmsclient.ResponseCodeOk { } else if response.Code != aliyunsmsclient.ResponseCodeOk {
errMsg := fmt.Sprintf("SendSMSMsg mobileNum:%s failed with response:%s", mobileNum, utils.Format4Output(response, false)) errMsg := fmt.Sprintf("SendSMSMsg mobileNum:%s failed with response:%s", mobileNum, utils.Format4Output(response, true))
errList.AddErr(fmt.Errorf(errMsg)) errList.AddErr(fmt.Errorf(errMsg))
if warningMap[response.Code] == 1 { if warningMap[response.Code] == 1 {
globals.SugarLogger.Warnf(errMsg) globals.SugarLogger.Warnf(errMsg)

4
business/model/order.go
View File

@@ -101,8 +101,8 @@ type OrderSku struct {
StoreSubName string `orm:"size(64)" json:"storeSubName"` // 当前这个字段被用作vendorActType StoreSubName string `orm:"size(64)" json:"storeSubName"` // 当前这个字段被用作vendorActType
Count int `json:"count"` Count int `json:"count"`
VendorSkuID string `orm:"column(vendor_sku_id);size(48)" json:"vendorSkuID"` VendorSkuID string `orm:"column(vendor_sku_id);size(48)" json:"vendorSkuID"`
SkuID int `orm:"column(sku_id)" json:"skuID"` // 外部系统里记录的 jxskuid SkuID int `orm:"column(sku_id)" json:"skuID"` // 外部系统里记录的 jxskuid
JxSkuID int `orm:"column(jx_sku_id)" json:"jxSkuID"` // 根据VendorSkuID在本地系统里查询出来的 jxskuid JxSkuID int `orm:"column(jx_sku_id);index" json:"jxSkuID"` // 根据VendorSkuID在本地系统里查询出来的 jxskuid
SkuName string `orm:"size(255)" json:"skuName"` SkuName string `orm:"size(255)" json:"skuName"`
ShopPrice int64 `json:"shopPrice"` // 京西价 ShopPrice int64 `json:"shopPrice"` // 京西价
VendorPrice int64 `json:"vendorPrice"` // 平台价 VendorPrice int64 `json:"vendorPrice"` // 平台价

2
business/partner/putils/store_sku.go
View File

@@ -51,7 +51,7 @@ func (p *DefSingleStorePlatform) DeleteStoreAllCategories(ctx *jxcontext.Context
levelList = append(levelList, k) levelList = append(levelList, k)
} }
sort.Sort(sort.Reverse(sort.IntSlice(levelList))) sort.Sort(sort.Reverse(sort.IntSlice(levelList)))
task1 := tasksch.NewSeqTask(fmt.Sprintf("DeleteStoreAllCategories1, vendorStoreID:%s", vendorStoreID), ctx, task1 := tasksch.NewSeqTask2(fmt.Sprintf("DeleteStoreAllCategories1, vendorStoreID:%s", vendorStoreID), ctx, true,
func(task *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) { func(task *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) {
vendorCatIDs := make([]string, len(catListMap[levelList[step]])) vendorCatIDs := make([]string, len(catListMap[levelList[step]]))
for k, v := range catListMap[levelList[step]] { for k, v := range catListMap[levelList[step]] {