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

Commit Graph

  • 334c012818 获取京东门店等级 苏尹岚 2019-12-13 16:38:18 +08:00
  • 5a37a9cf28 up gazebo 2019-12-13 16:22:22 +08:00
  • e0263c619c Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-12-13 15:21:09 +08:00
  • d20d98816e +GenFakeUPC gazebo 2019-12-13 15:18:06 +08:00
  • a6925cfb70 修复getStoreDetail没有得到vendorOrgCode的bug gazebo 2019-12-13 12:04:18 +08:00
  • 5240bbe47f Accept Merge Request #82: (yonghui -> mark) Merge Request: 推荐商品分类sql修改，门店价格统计等修改 Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/82 苏尹岚 2019-12-13 11:34:38 +08:00
  • 44653932ae 推荐商品，分类sql修改 苏尹岚 2019-12-13 11:33:13 +08:00
  • 91e5bf3939 fk gazebo 2019-12-13 11:09:28 +08:00
  • c8f53121e0 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-12-13 11:02:04 +08:00
  • 00c565777a up gazebo 2019-12-13 11:01:44 +08:00
  • b7ca827ca7 去除getAPI("")调用，没有vendorOrgCode时报警 gazebo 2019-12-13 10:59:21 +08:00
  • 147a683177 门店价格修改 苏尹岚 2019-12-13 10:49:29 +08:00
  • 2ddd16460a GetSkusWithVendor中取商品城市的bug修复 gazebo 2019-12-13 10:47:58 +08:00
  • 8278de023d 同步错误返回冲突解决 苏尹岚 2019-12-12 18:32:46 +08:00
  • 9717defad6 修改结算信息权限增加 苏尹岚 2019-12-12 18:26:59 +08:00
  • a3cbbd46c6 同步错误返回冲突解决 苏尹岚 2019-12-12 18:21:47 +08:00
  • 23249077cf 同步错误返回解决冲突 苏尹岚 2019-12-12 18:10:13 +08:00
  • f6baae63ee Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-12-12 18:02:30 +08:00
  • 2915c41fc3 去除BaseTask.run中的recover gazebo 2019-12-12 18:02:10 +08:00
  • 2116d5d812 Accept Merge Request #80: (yonghui -> mark) Merge Request: 根据Excel修改京西价修改 Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/80 苏尹岚 2019-12-12 17:44:30 +08:00
  • 2a090b473d 根据Excel更新京西价修改 苏尹岚 2019-12-12 17:43:09 +08:00
  • 67a48b515e Accept Merge Request #79: (yonghui -> mark) Merge Request: 刷新历史订单结算价返回值修改 Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/79 苏尹岚 2019-12-12 17:35:38 +08:00
  • 4bf7105cab 刷新历史订单结算价修改 苏尹岚 2019-12-12 17:32:55 +08:00
  • f156cfcd1d up gazebo 2019-12-12 17:13:49 +08:00
  • 2bf513f4be sync2中没有正确使用vendorIDs与appOrgCodes的bug修复 gazebo 2019-12-12 17:03:14 +08:00
  • a0c5949b3f 根据Excel更新京西价 苏尹岚 2019-12-12 16:49:45 +08:00
  • 690453cd73 根据Excel更新京西价，修改异步任务中返回值 苏尹岚 2019-12-12 16:25:27 +08:00
  • e918d834ec RefreshHistoryOrdersEarningPrice中不正确返回retVal给ParallelTask的问题修复 gazebo 2019-12-12 16:16:02 +08:00
  • 54de6440b7 fk gazebo 2019-12-12 16:03:54 +08:00
  • 8f27fb920b Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-12-12 16:00:12 +08:00
  • 4d15303149 处理创建分类是的父子关系 gazebo 2019-12-12 15:53:17 +08:00
  • 1fc9037f0f Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-12-12 15:39:03 +08:00
  • 7468b67542 根据Excel更新京西价 苏尹岚 2019-12-12 15:38:45 +08:00
  • 099ba06d04 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-12-12 15:02:17 +08:00
  • 231aac93a8 SyncSkus与SyncCategories错误继续 gazebo 2019-12-12 15:01:01 +08:00
  • 99da2e9824 根据excel更新京西价 苏尹岚 2019-12-12 14:40:20 +08:00
  • dd58517099 京东api修改 苏尹岚 2019-12-12 14:17:07 +08:00
  • 24a47c7649 Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-12-12 13:38:38 +08:00
  • 19704b74bc 错误提示，门店评分修改 苏尹岚 2019-12-12 13:38:06 +08:00
  • e94cd01982 京西菜市启用349454 gazebo 2019-12-12 12:49:35 +08:00
  • b21d652149 +djsw.UpdateSku gazebo 2019-12-12 12:02:15 +08:00
  • a9f18ab056 去除JdStoreInfoCoordinateRecover中对于JdAPI的直接依赖 gazebo 2019-12-12 11:41:02 +08:00
  • 96dd367d65 GetStoresSkusNew获取正确的京东平台vendorSkuID gazebo 2019-12-12 11:15:52 +08:00
  • 248a9299ce GetSkusWithVendor,GetSkuCategoryWithVendor apimanager的bug修改 gazebo 2019-12-12 10:59:55 +08:00
  • ccc0d3dfda updateThingMapEntity gazebo 2019-12-12 10:02:37 +08:00
  • d8c77cfb6e up gazebo 2019-12-12 09:32:36 +08:00
  • ce9b0f2661 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-12-12 09:19:44 +08:00
  • 29bc986e45 jd2配置 SyncSkuNames SyncCategorys gazebo 2019-12-12 09:18:44 +08:00
  • 53d4b6e987 Accept Merge Request #76: (yonghui -> mark) Merge Request: 新增可修改结算信息权限人员 Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/76 苏尹岚 2019-12-12 08:19:45 +08:00
  • 4a4342def0 新增可修改结算信息权限人员 苏尹岚 2019-12-12 08:17:42 +08:00
  • 2168cf9731 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-12-11 22:31:07 +08:00
  • db85de7454 +FullSyncVendorStuff gazebo 2019-12-11 22:30:32 +08:00
  • 8d93079655 Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-12-11 18:12:33 +08:00
  • d08b64d1d9 分类状态和分类图片 苏尹岚 2019-12-11 18:12:09 +08:00
  • 2156c77dbf UploadImg添加vendorOrgCode参数 gazebo 2019-12-11 17:42:56 +08:00
  • bc10962095 修复GetActStoreSkuVendorList中sqlParams的错误 gazebo 2019-12-11 17:29:33 +08:00
  • 592ed3c252 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-12-11 16:55:05 +08:00
  • 118ad50abd store_sku_check对于vendorOrgCode的正确依赖 gazebo 2019-12-11 16:27:10 +08:00
  • ef5ec63951 StoreExt的StoreMaps与CourierMaps从map数组改为struct数组 gazebo 2019-12-11 16:04:44 +08:00
  • 59df3488c4 根据excel改惊喜价 苏尹岚 2019-12-11 16:04:42 +08:00
  • d74a0d8079 根据Excel更新京西价 苏尹岚 2019-12-11 16:01:58 +08:00
  • 95a669476e -partner.ReadSku 修改partner.GetSkus原型，添加vendorOrgCode，去除skuName gazebo 2019-12-11 15:44:42 +08:00
  • 044750478c Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-12-11 15:29:01 +08:00
  • 7182ea87d5 更新调价包修改 苏尹岚 2019-12-11 15:28:25 +08:00
  • ccba718569 全部启用useThingMap gazebo 2019-12-11 15:02:32 +08:00
  • 37ae9df27b 果园启用useThingMap gazebo 2019-12-11 14:58:43 +08:00
  • b61862acec 菜市启用useThingMap gazebo 2019-12-11 14:53:00 +08:00
  • 3a2599ad23 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-12-11 14:43:24 +08:00
  • 1817d67ca7 beta启用useThingMap gazebo 2019-12-11 14:43:04 +08:00
  • c0cd4fe692 Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-12-11 13:46:41 +08:00
  • 77880d2318 addstoreVendorMap和update支持京西门店 苏尹岚 2019-12-11 13:46:16 +08:00
  • d22fef3bc7 去除一些对于jd_id与jd_sync_status的直接依赖 gazebo 2019-12-11 11:43:52 +08:00
  • 2b49d2ba74 刷新京西调价包 苏尹岚 2019-12-11 10:53:05 +08:00
  • 3cac9bfa32 刷新调价包 苏尹岚 2019-12-11 10:49:29 +08:00
  • 73811a7bc6 fk gazebo 2019-12-11 10:28:38 +08:00
  • a3e1521bb4 updateThingMapEntity gazebo 2019-12-11 10:13:35 +08:00
  • 6c98fecca6 修复GetSkuCategoryWithVendor中的bug gazebo 2019-12-11 09:22:17 +08:00
  • 3e6fdb0de1 up gazebo 2019-12-11 09:11:15 +08:00
  • 31704041a8 alpha环境启用isUseThingMap gazebo 2019-12-11 09:07:32 +08:00
  • d566ee38e3 OnXXThing依赖mdoel.IsUseThingMap返回错误 gazebo 2019-12-11 08:53:32 +08:00
  • 96d1147257 Merge branch 'master' into mark gazebo 2019-12-11 08:49:40 +08:00
  • 7ef2f0c23d 1000007223的配送管理问题。暂时先把SelfDeliverDelivered的状态限制放开 gazebo 2019-12-11 08:49:15 +08:00
  • 794f4f084a up gazebo 2019-12-10 18:39:32 +08:00
  • 7721893692 fk gazebo 2019-12-10 18:34:58 +08:00
  • 517ae5245e CreateAct与AddStoreVendorMap必须要求vendorOrgCode 修复UpdateStoreVendorMap中的bug gazebo 2019-12-10 18:15:01 +08:00
  • 90edf2a581 addStoreVendorMap接口修改，支持京西平台 苏尹岚 2019-12-10 18:01:49 +08:00
  • 9439aa17b6 Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-12-10 17:52:48 +08:00
  • b448f6996c 存回调活动时，修复没有保存VendorOrgCode的bug gazebo 2019-12-10 17:52:31 +08:00
  • 4d8504d39c Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-12-10 17:52:27 +08:00
  • 2e042d9c14 addStoreVnedorMap支持京西平台 苏尹岚 2019-12-10 17:51:55 +08:00
  • 5363e34209 Merge branch 'master' of e.coding.net:rosydev/jx-callback gazebo 2019-12-10 17:47:19 +08:00
  • 99a00476ef GetSkusWithVendor中，排除GIF图片 gazebo 2019-12-10 17:46:39 +08:00
  • 92761a332d 未营业门店修改 苏尹岚 2019-12-10 17:31:17 +08:00
  • ad10c9d5d4 Merge remote-tracking branch 'origin/master' into yonghui 苏尹岚 2019-12-10 17:21:20 +08:00
  • 55257f839d Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-12-10 17:20:54 +08:00
  • ed67833601 根据excel刷新京西价 苏尹岚 2019-12-10 17:20:49 +08:00
  • 04ab485bd7 addstorevendormap修改 苏尹岚 2019-12-10 17:19:08 +08:00
  • 386e7a2980 comment gazebo 2019-12-10 16:52:23 +08:00
  • 933a18d362 Accept Merge Request #69: (yonghui -> master) Merge Request: 商品图片判断 Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/69 苏尹岚 2019-12-10 15:57:47 +08:00
  • 8b9e36d59d 京东API几乎全部使用vendorOrgCode（除了GetSkus） gazebo 2019-12-10 15:52:09 +08:00