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

暂时屏蔽敏感词的错误

Browse Source
This commit is contained in:
苏尹岚
2020-07-21 15:19:49 +08:00
parent 7086e57615
commit 0a9dcec883
6 changed files with 52 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1200,7 +1200,7 @@ func TransferJdsOrder(ctx *jxcontext.Context, vendorOrderID string, storeID int)
if order.VendorID != model.VendorIDJDShop {
return "", fmt.Errorf("暂不支持非京狗的订单进行转移！")
}
skus, err := dao.GetSimpleOrderSkus(db, vendorOrderID)
skus, err := dao.GetSimpleOrderSkus(db, vendorOrderID, nil)
if err != nil || order == nil {
return "", fmt.Errorf("未查询到该订单商品！订单号：[%v]", vendorOrderID)
}
@@ -1401,3 +1401,15 @@ func SendJdwlForJdsOrder(ctx *jxcontext.Context, vendorOrderID string) (err erro
jdshop.CurPurchaseHandler.OrderExport(ctx, vendorOrderID, vendorWaybillID, false)
return err
}
func AdjustJdsOrderSimple(ctx *jxcontext.Context, vendorOrderID string, skuID int) (err error) {
var (
db = dao.GetDB()
)
orderSkus, err := dao.GetSimpleOrderSkus(db, vendorOrderID, []int{skuID})
if len(orderSkus) == 0 {
return fmt.Errorf("未查询到该订单商品！")
}
return err
}

8
business/jxstore/cms/sync_store_sku.go
View File

@@ -679,10 +679,10 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
//handle error for sensitive words, if find, then insert to table sensitive_words
if sensitiveWord := GetSensitiveWord(singleStoreHandler, err.Error()); sensitiveWord != "" {
dao.InsertSensitiveWord(sensitiveWord, vendorID, ctx.GetUserName())
words, _ := dao.GetSensitiveWordList(vendorID)
word := words[0]
word.Word = word.Word + "," + sensitiveWord
dao.UpdateSensitiveWord(word, vendorID, 0, ctx.GetUserName())
// words, _ := dao.GetSensitiveWordList(vendorID)
// word := words[0]
// word.Word = word.Word + "," + sensitiveWord
// dao.UpdateSensitiveWord(word, vendorID, 0, ctx.GetUserName())
}
}
successList := putils.UnselectStoreSkuSyncListByVendorSkuIDs(batchedStoreSkuList, GetVendorSkuIDList(failedList))

6
business/model/dao/dao_order.go
View File

@@ -1286,13 +1286,17 @@ func GetSimpleOrder(db *DaoDB, vendorOrderID string) (goods *model.GoodsOrder, e
return goods, err
}
func GetSimpleOrderSkus(db *DaoDB, vendorOrderID string) (skus []*model.OrderSku, err error) {
func GetSimpleOrderSkus(db *DaoDB, vendorOrderID string, skuIDs []int) (skus []*model.OrderSku, err error) {
sql := `
SELECT *
FROM order_sku
WHERE vendor_order_id = ?
`
sqlParams := []interface{}{vendorOrderID}
if len(skuIDs) > 0 {
sql += " AND sku_id IN (" + GenQuestionMarks(len(skuIDs)) + ")"
sqlParams = append(sqlParams, skuIDs)
}
err = GetRows(db, &skus, sql, sqlParams)
return skus, err
}

13
business/partner/delivery/mtps/waybill.go
View File

@@ -61,13 +61,6 @@ func OnWaybillExcept(msg *mtpsapi.CallbackOrderExceptionMsg) (retVal *mtpsapi.Ca
}
func (c *DeliveryHandler) OnWaybillMsg(msg *mtpsapi.CallbackOrderMsg) (retVal *mtpsapi.CallbackResponse) {
vendorOrderID, _ := jxutils.SplitUniversalOrderID(msg.OrderID)
order, _ := dao.GetSimpleOrder(dao.GetDB(), vendorOrderID)
//查不到订单可能就是果园的订单
if order == nil {
c.pushToGy(msg)
return mtpsapi.SuccessResponse
}
jxutils.CallMsgHandler(func() {
retVal = c.onWaybillMsg(msg)
}, jxutils.ComposeUniversalOrderID(msg.OrderID, model.VendorIDMTPS))
@@ -111,6 +104,12 @@ func (c *DeliveryHandler) onWaybillMsg(msg *mtpsapi.CallbackOrderMsg) (retVal *m
globals.SugarLogger.Warnf("onWaybillMsg unknown msg:%v", msg)
return mtpsapi.SuccessResponse
}
order2, _ := dao.GetSimpleOrder(dao.GetDB(), order.VendorOrderID)
//查不到订单可能就是果园的订单
if order2 == nil {
c.pushToGy(msg)
return mtpsapi.SuccessResponse
}
return mtpsapi.Err2CallbackResponse(partner.CurOrderManager.OnWaybillStatusChanged(order), order.VendorStatus)
}