From dfd4289bdb228c5d266bf82bd498794b1487cdac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Wed, 29 Apr 2020 13:49:07 +0800 Subject: [PATCH] =?UTF-8?q?=E9=93=B6=E8=B1=B9=E5=88=B0=E4=BA=AC=E8=A5=BF?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/orderman/order.go | 3 ++- business/partner/purchase/yb/store_sku.go | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index 3b0ed141f..9b2c33b79 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -196,7 +196,8 @@ func (c *OrderManager) OnOrderStatusChanged(vendorOrgCode string, orderStatus *m } func (c *OrderManager) ChangeOrderInfo(order *model.GoodsOrder, valid map[string]interface{}) (err error) { - + db := dao.GetDB() + dao.UpdateEntityLogically(db, order, valid, "jxadmin", nil) return err } diff --git a/business/partner/purchase/yb/store_sku.go b/business/partner/purchase/yb/store_sku.go index 82551f5fd..0e7a3db4d 100644 --- a/business/partner/purchase/yb/store_sku.go +++ b/business/partner/purchase/yb/store_sku.go @@ -403,21 +403,21 @@ func loopPages(parameterType, parameterValue string, skuNameList *[]*partner.Sku return err } for _, v := range resultPages.Result { - resultp, err := api.YinBaoAPI.QueryProductImagesByBarcode(v.Barcode) + // resultp, err := api.YinBaoAPI.QueryProductImagesByBarcode(v.Barcode) // resultp, err := getProductImages(vendorStoreID, v.Barcode) if err != nil { return err } - // var resultp []*yinbaoapi.QueryProductImagesByBarcodeResult + var resultp []*yinbaoapi.QueryProductImagesByBarcodeResult vv := &yinbaoapi.QueryProductByBarcodeResult{} err = utils.Map2StructByJson(utils.Struct2MapByJson(v), vv, false) if skuName := vendorSku2Jx(vv, resultp); skuName != nil { *skuNameList = append(*skuNameList, skuName) } } - if len(resultPages.Result) >= resultPages.PageSize { - err = loopPages(resultPages.PostBackParameter.ParameterType, resultPages.PostBackParameter.ParameterValue, skuNameList, vendorStoreID) - } + // if len(resultPages.Result) >= resultPages.PageSize { + // err = loopPages(resultPages.PostBackParameter.ParameterType, resultPages.PostBackParameter.ParameterValue, skuNameList, vendorStoreID) + // } return err }