Merge remote-tracking branch 'origin/jdshop' into qidongsheng

This commit is contained in:
qidongsheng
2020-07-02 17:25:35 +08:00

View File

@@ -38,13 +38,15 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v
result, err = api.YinBaoAPI.AddProductInfo(buildProductInfoParam(storeSku))
}
if err != nil {
if strings.Contains(err.Error(), addErr1) {
queryProductByBarcodeResult, err := api.YinBaoAPI.QueryProductByBarcodes([]string{storeSku.YbBarCode})
if err != nil && len(queryProductByBarcodeResult) > 0 {
if queryProductByBarcodeResult[0].Enable == model.SkuStatusDeleted {
if errExt, ok := err.(*utils.ErrorWithCode); ok {
if strings.Contains(errExt.ErrMsg(), addErr1) {
queryProductByBarcodeResult, _ := api.YinBaoAPI.QueryProductByBarcodes([]string{storeSku.YbBarCode})
if len(queryProductByBarcodeResult) > 0 {
api.YinBaoAPI.BatchUpdateProductEnable(vendorStoreID, utils.Int64ToStr(queryProductByBarcodeResult[0].UID), model.SkuStatusNormal)
storeSku.VendorSkuID = utils.Int64ToStr(queryProductByBarcodeResult[0].UID)
}
} else {
failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDYB], "创建商品")
}
} else {
failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDYB], "创建商品")