diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index 95884c92d..490fc3262 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -1180,7 +1180,6 @@ func GetStoresSkusNew(ctx *jxcontext.Context, storeIDs, skuIDs []int, upcs []str dao.Rollback(db, txDB) return nil, err } - globals.SugarLogger.Debugf("-----tmpList := %s", utils.Format4Output(tmpList, false)) if isBySku { skuNamesInfo.TotalCount = dao.GetLastTotalRowCount2(db, txDB) } @@ -2067,6 +2066,9 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs if inSkuBind != nil && inSkuBind.Stock != nil { skuBind.Stock = *inSkuBind.Stock } + if inSkuBind != nil && inSkuBind.LocationCode != "" { + skuBind.LocationCode = inSkuBind.LocationCode + } if globals.IsAddEvent { err = AddEventDetail(db, ctx, model.OperateAdd, v.RealSkuID, model.ThingTypeSku, storeID, "", utils.Int2Str(skuBind.UnitPrice)) } diff --git a/business/partner/delivery/mtps/waybill.go b/business/partner/delivery/mtps/waybill.go index 3b1933c6f..5a3e7a698 100644 --- a/business/partner/delivery/mtps/waybill.go +++ b/business/partner/delivery/mtps/waybill.go @@ -199,7 +199,6 @@ func pushMTPSToTiktok(msgStatus int, order *model.Waybill, lng, lat, vendorOrgCo } func (c *DeliveryHandler) pushToGy(msg *mtpsapi.CallbackOrderMsg, serverType string) { - cl := http.Client{} params := make(map[string]interface{}) params["mt_peisong_id"] = msg.MtPeisongID params["courier_name"] = msg.CourierName @@ -215,6 +214,7 @@ func (c *DeliveryHandler) pushToGy(msg *mtpsapi.CallbackOrderMsg, serverType str sign := signParams(urls) params["sign"] = sign + cl := http.Client{} var request *http.Request var err error switch serverType { diff --git a/business/partner/purchase/ebai/order.go b/business/partner/purchase/ebai/order.go index 6fd1cd13a..95d80a83e 100644 --- a/business/partner/purchase/ebai/order.go +++ b/business/partner/purchase/ebai/order.go @@ -401,7 +401,7 @@ func (p *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI func (p *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bool, userName string) (err error) { if globals.EnableEbaiStoreWrite { - // err = api.EbaiAPI.OrderPickComplete(order.VendorOrderID) + err = api.EbaiAPI.OrderPickComplete(order.VendorOrderID) } if err == nil { p.postFakeMsg(order.VendorOrderID, ebaiapi.OrderStatusAccepted) diff --git a/controllers/ebai_callback.go b/controllers/ebai_callback.go index e6d32a7cd..210bfc213 100644 --- a/controllers/ebai_callback.go +++ b/controllers/ebai_callback.go @@ -7,6 +7,7 @@ import ( "git.rosy.net.cn/jx-callback/business/jxutils/ddmsg" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model/dao" + "git.rosy.net.cn/jx-callback/globals" "net/http" "strings" @@ -29,6 +30,7 @@ func (c *EbaiController) Msg() { if vendorStoreId != "" { storeDetail, _ := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), vendorStoreId, model.VendorIDEBAI, "") if storeDetail == nil { + globals.SugarLogger.Debugf("-----饿百订单非菜市消息推送-%s", utils.Format4Output(obj, false)) switch beego.BConfig.RunMode { case model.ServerTypeVegetable: callbackResponse = c.EBaiMsgPush2FruitsOrPet(model.ServerTypeFruits, utils.Struct2Map(obj, "", false)) diff --git a/controllers/mtwm_callback.go b/controllers/mtwm_callback.go index f3315e559..d7370395b 100644 --- a/controllers/mtwm_callback.go +++ b/controllers/mtwm_callback.go @@ -5,10 +5,12 @@ import ( "fmt" "git.rosy.net.cn/baseapi/platformapi/dingdingapi" "git.rosy.net.cn/baseapi/platformapi/mtwmapi" + "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/jxutils/ddmsg" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/business/partner/purchase/mtwm" + "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" "github.com/astaxie/beego/server/web" "net/http" @@ -34,6 +36,7 @@ func (c *MtwmController) onCallbackMsg(msgType string) { vendorStoreId = finishedPickup.AppPoiCode } if vendorStoreId != "" { + globals.SugarLogger.Debugf("-----饿百订单非菜市消息推送-%s", utils.Format4Output(msg, false)) storeDetail, _ := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), vendorStoreId, model.VendorIDMTWM, "") if storeDetail == nil { switch web.BConfig.RunMode {