diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index e5a997698..866fbb651 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -140,7 +140,8 @@ func (c *OrderManager) GetOrderSkuInfo(ctx *jxcontext.Context, vendorOrderID str t1.vendor_price, %s full_sku_name, t2.name_id, - t3.img image + t3.img image, + t3.upc FROM order_sku t1 LEFT JOIN goods_order t6 ON t6.vendor_order_id = t1.vendor_order_id AND t6.vendor_id = t1.vendor_id LEFT JOIN store t5 ON t5.id = IF(t6.jx_store_id <> 0, t6.jx_store_id, t6.store_id) diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go index 548fa2480..909f87a04 100644 --- a/business/jxstore/tempop/tempop.go +++ b/business/jxstore/tempop/tempop.go @@ -1885,20 +1885,20 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) { //tasksch.HandleTask(task, nil, true).Run() //_, err = task.GetResult(0) //京东账号更新 - // var ( - // db = dao.GetDB() - // ) - // if configs, err := dao.QueryConfigs(dao.GetDB(), "jdConfigCookie", model.ConfigTypeCookie, ""); err == nil { - // api.JdAPI.SetCookieWithStr(configs[0].Value) - // result, _ := api.JdAPI.GetJdAppInfo() - // if result != nil { - // if vocs, _ := dao.GetVendorOrgCode(db, model.VendorIDJD, result.OrgCode, model.VendorOrgTypePlatform); len(vocs) > 0 { - // vocs[0].AppKey = result.AppKey - // vocs[0].AppSecret = result.AppSecret - // dao.UpdateEntity(db, vocs[0], "AppKey", "AppSecret") - // } - // } - // } + var ( + db = dao.GetDB() + ) + if configs, err := dao.QueryConfigs(dao.GetDB(), "jdConfigCookie", model.ConfigTypeCookie, ""); err == nil { + api.JdAPI.SetCookieWithStr(configs[0].Value) + result, _ := api.JdAPI.GetJdAppInfo() + if result != nil { + if vocs, _ := dao.GetVendorOrgCode(db, model.VendorIDJD, result.OrgCode, model.VendorOrgTypePlatform); len(vocs) > 0 { + vocs[0].AppKey = result.AppKey + vocs[0].AppSecret = result.AppSecret + dao.UpdateEntity(db, vocs[0], "AppKey", "AppSecret") + } + } + } //刷新京东真实订单号 //var ( // db = dao.GetDB() @@ -1934,20 +1934,6 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) { // } // } //} - //var ( - // storeID = 100002 - // data string - //) - //data = ` - //{"address":"甬旺农贸市场蔬菜摊","cityName": "苏州市","id": 100002,"name": "斜塘顺达广场店","payeeName": "李川川","status": 1,"tel1": "13812641804","tel2": ""} - //` - //weixinmsg.SmartMessageTemplateSend("oYN_usv1RPvrSxCvo1WsbwI8lZa0", weixinmsg.WX_NEWORDER_TEMPLATE_ID, "", weixinmsg.WX_MINI_TO_ORDER_PAGE_URL+fmt.Sprintf("?jxStoreId=%v&data=%v", storeID, data), nil) - // - //storeID = 100118 - //data = ` - //{"address":"成都市金牛区抚琴综合市场博力多超市旁边扶手楼梯上","cityName": "成都市","id": 100002,"name": "抚琴店-下单送盐","payeeName": "李川川","status": 1,"tel1": "13812641804","tel2": ""} - //` - //weixinmsg.SmartMessageTemplateSend("oYN_usv1RPvrSxCvo1WsbwI8lZa0", weixinmsg.WX_NEWORDER_TEMPLATE_ID, "", weixinmsg.WX_MINI_TO_ORDER_PAGE_URL+fmt.Sprintf("?jxStoreId=%v&data=%v", storeID, data), nil) //加门店账号 //var ( // db = dao.GetDB() @@ -1984,7 +1970,6 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) { // } // } //} - cms.CurVendorSync.SyncStoresSkus2(jxcontext.AdminCtx, nil, 0, dao.GetDB(), []int{1, 3}, nil, false, nil, nil, model.SyncFlagSaleMask, true, true) return err } diff --git a/business/model/api.go b/business/model/api.go index c42036730..424443541 100644 --- a/business/model/api.go +++ b/business/model/api.go @@ -72,6 +72,7 @@ type OrderSkuExt struct { NameID int `orm:"column(name_id)" json:"nameID"` FullSkuName string `json:"fullSkuName"` Image string `json:"image"` + Upc string `json:"upc"` // RealEarningPrice int64 `json:"realEarningPrice"` // 实际单品结算给门店老板钱 }