Commit Graph

  • 2ee7c74e2a 投诉骑手 苏尹岚 2019-12-23 15:41:43 +08:00
  • 943c4a723d Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-12-23 15:38:01 +08:00
  • c28247e6b7 +GoodsOrder.BaseFreightMoney gazebo 2019-12-23 15:35:34 +08:00
  • a8439f38e1 Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-12-23 15:29:27 +08:00
  • 166f5320d3 投诉骑手 苏尹岚 2019-12-23 15:27:06 +08:00
  • 0b35c7a932 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-12-23 14:46:18 +08:00
  • c6a99d73f8 up gazebo 2019-12-23 14:46:07 +08:00
  • 63e3ed0b4a Accept Merge Request #98: (yonghui -> mark) Merge Request: 订单利润预警 Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/98 苏尹岚 2019-12-23 10:57:50 +08:00
  • 3f98af6a11 订单利润预警 苏尹岚 2019-12-23 10:45:12 +08:00
  • 868cce8445 UpdateActPrice4StoreSkuNameNew中EarningPrice逻辑修改 gazebo 2019-12-23 10:31:00 +08:00
  • ddb129dbc0 订单预警 苏尹岚 2019-12-23 10:32:40 +08:00
  • cb94b34a88 Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-12-23 10:30:05 +08:00
  • 846442f478 订单利润报警 苏尹岚 2019-12-23 10:29:35 +08:00
  • b846c1d124 京东cookie gazebo 2019-12-21 21:25:45 +08:00
  • 3040e0baf7 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-12-21 13:06:46 +08:00
  • 9e92f40a47 amendAndPruneStoreStuff中删除平台商品单个操作 gazebo 2019-12-21 13:06:04 +08:00
  • bd5a9e5e7d Accept Merge Request #97: (yonghui -> mark) Merge Request: 获取各平台门店某商品价格 Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/97 苏尹岚 2019-12-20 18:11:07 +08:00
  • 693be23ca0 获取各平台门店商品价格 苏尹岚 2019-12-20 17:59:27 +08:00
  • 5e93227546 获取平台门店商品价格 苏尹岚 2019-12-20 17:24:36 +08:00
  • f07862deeb 更新京东cookie gazebo 2019-12-20 17:12:12 +08:00
  • ce4703b720 获取各平台商品门店价格 苏尹岚 2019-12-20 16:58:19 +08:00
  • da97aee570 Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-12-20 16:23:02 +08:00
  • 968b062c2d Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-12-20 16:21:43 +08:00
  • d5e3457173 UpdateSkuSyncStatusForExPrefix改为使用thing_map gazebo 2019-12-20 16:21:05 +08:00
  • dfd4a7a183 Accept Merge Request #96: (yonghui -> mark) Merge Request: 平台门店名,刷新订单状态,商品名前缀,获取平台门店商品价 Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/96 苏尹岚 2019-12-20 16:00:31 +08:00
  • af280510db Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-12-20 15:59:58 +08:00
  • 480132cafe 组合名字函数修改 苏尹岚 2019-12-20 15:59:42 +08:00
  • 9987281578 dadadelivery notify gazebo 2019-12-20 14:49:55 +08:00
  • 7766c9428d Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-12-20 14:41:53 +08:00
  • da2440e971 获取平台门店商品价格 苏尹岚 2019-12-20 14:41:21 +08:00
  • b2e9f91373 商品前缀 苏尹岚 2019-12-20 14:40:22 +08:00
  • 0a8a0faec4 exprefix索引,order修改 苏尹岚 2019-12-20 14:32:14 +08:00
  • fc588aec60 获取平台门店商品价格 苏尹岚 2019-12-20 11:56:53 +08:00
  • 41f0d1fa3d up gazebo 2019-12-20 11:44:09 +08:00
  • b8f7ffea18 获取门店商品价格 苏尹岚 2019-12-20 11:40:04 +08:00
  • 53bd1ecb43 fk gazebo 2019-12-20 11:33:17 +08:00
  • 015e098a6c 订单打印去掉ActualPayPrice gazebo 2019-12-20 11:28:35 +08:00
  • db37338060 up gazebo 2019-12-20 11:23:40 +08:00
  • d6d4ab23bb Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-12-20 11:23:16 +08:00
  • f72257d07c 获取平台门店商品价格 苏尹岚 2019-12-20 11:22:41 +08:00
  • 48b6de0a6f +setFakeActualPayPrice gazebo 2019-12-20 11:20:02 +08:00
  • 163b27ca6e wxpay partner gazebo 2019-12-20 11:19:47 +08:00
  • d1d49d464e 商品前缀名 苏尹岚 2019-12-20 10:00:13 +08:00
  • fa6f86a01f 商品名前缀 苏尹岚 2019-12-20 09:30:52 +08:00
  • 0623da776b 商品关键字 苏尹岚 2019-12-20 09:16:56 +08:00
  • f5db2daee2 获取商品平台价 苏尹岚 2019-12-20 08:57:52 +08:00
  • 5438e90021 获取某商品各平台价 苏尹岚 2019-12-20 08:39:23 +08:00
  • 7f88bad413 商品前缀修改 苏尹岚 2019-12-19 18:43:36 +08:00
  • 58e3066d19 Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-12-19 18:40:58 +08:00
  • dad7a5a926 获取某个商品平台价,商品名前缀 苏尹岚 2019-12-19 18:40:46 +08:00
  • 4c698967d0 wxpay to wxpayapi gazebo 2019-12-19 16:29:15 +08:00
  • 850c35c9d9 调整京西商城支付 gazebo 2019-12-19 16:20:10 +08:00
  • 415cc834fc maxStoreNameBind = 10000 gazebo 2019-12-19 15:57:18 +08:00
  • a3c236d281 Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-12-19 15:24:31 +08:00
  • 84985a73fb 调整单的调试信息 gazebo 2019-12-19 14:10:45 +08:00
  • 9498542e59 修复订单调度定时器的BUG PickupGoods失败后判断订单状态如果是已经大于拣货完成,则忽略错误 gazebo 2019-12-19 12:07:15 +08:00
  • 480bfb4ed8 Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-12-19 10:55:59 +08:00
  • 16823207c9 商品名前缀 苏尹岚 2019-12-19 10:55:41 +08:00
  • 1f1036b503 每晚自动同步时,全量同步 用AmendAndPruneStoreStuff替代PruneMissingStoreSkus与AddCreateFlagForJxStoreSku gazebo 2019-12-19 09:55:10 +08:00
  • 5f1c793a37 mtwm的partner.FuncUpdateStoreSkus改为1 gazebo 2019-12-19 08:28:44 +08:00
  • be8a98dc90 同步商品名 苏尹岚 2019-12-18 18:35:14 +08:00
  • 7fdb107e6f Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-12-18 15:19:39 +08:00
  • 990f3a2da2 pr修改 苏尹岚 2019-12-18 15:19:22 +08:00
  • 2f9df63b10 必要时清除门店商品价格锁定时间 gazebo 2019-12-18 12:25:29 +08:00
  • af09cf0878 up gazebo 2019-12-18 12:06:52 +08:00
  • 51217978ba 门店商品添加锁定概念 gazebo 2019-12-18 11:55:48 +08:00
  • 12a1a23ac1 商品关键字修改 苏尹岚 2019-12-18 11:45:02 +08:00
  • d1cb4a8c8b 饿百输出回调消息 gazebo 2019-12-18 10:50:14 +08:00
  • 9a68b63b5e ebai.onOrderMsg gazebo 2019-12-18 10:41:04 +08:00
  • 2403c51764 修改不正常订单状态 苏尹岚 2019-12-18 10:29:09 +08:00
  • 8cd09089a8 组合名字函数修改 苏尹岚 2019-12-18 10:06:14 +08:00
  • 404a7b9040 jdsku冲突解决 苏尹岚 2019-12-18 09:17:43 +08:00
  • 2659c51d91 up gazebo 2019-12-18 08:39:02 +08:00
  • fc039600d5 DeleteSkusFromAct添加可选参数types gazebo 2019-12-18 08:30:32 +08:00
  • 169efcaa92 修改刷新活动结束状态逻辑 gazebo 2019-12-17 18:24:56 +08:00
  • 0cc04cc9d2 +OrderStatusVendorRejectCancel,OrderStatusVendorAgreeCancel gazebo 2019-12-17 18:01:24 +08:00
  • 3feff96127 Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-12-17 17:35:12 +08:00
  • 9fdae12a66 增加商品额外前缀 苏尹岚 2019-12-17 17:34:51 +08:00
  • 2c69e934f8 限制饿百平台的商家分类名长度 gazebo 2019-12-17 17:23:46 +08:00
  • b6e8c33012 去除老的sku与category相关多门店平台接口 gazebo 2019-12-17 16:51:45 +08:00
  • 64c7aec3c3 +jd.VenderAuditApplyCancelOrder gazebo 2019-12-17 15:55:46 +08:00
  • b2994f13cd Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-12-17 14:10:59 +08:00
  • a02dbdeacc 更改平台门店名称 苏尹岚 2019-12-17 14:10:44 +08:00
  • 6e3ee7c9c1 京西商城订单取消 gazebo 2019-12-17 14:05:43 +08:00
  • d5f2273d79 +dao.LoadPendingOrders gazebo 2019-12-17 14:00:01 +08:00
  • d7f9f30178 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-12-17 11:25:44 +08:00
  • d38582709f act.SyncAct gazebo 2019-12-17 11:25:22 +08:00
  • 81ea19b80a Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-12-17 10:43:04 +08:00
  • 57fb6ac078 更新门店公告 苏尹岚 2019-12-17 10:42:48 +08:00
  • 8d51d77529 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-12-17 10:07:23 +08:00
  • 16b772f13c Merge branch 'master' into mark gazebo 2019-12-17 10:07:13 +08:00
  • 272462f3eb up gazebo 2019-12-17 09:46:56 +08:00
  • 9e1ec73200 去除realEarningPrice gazebo 2019-12-17 09:35:28 +08:00
  • 7d944f4ac6 刷新京东门店等级 苏尹岚 2019-12-17 09:04:05 +08:00
  • f5b7b03044 刷新京东门店等级 苏尹岚 2019-12-17 08:57:51 +08:00
  • 2064cc11f5 刷新京东门店等级 苏尹岚 2019-12-17 08:53:07 +08:00
  • ac6372888d 刷新京东等级 苏尹岚 2019-12-16 18:42:29 +08:00
  • c55211fa53 刷新京东等级 苏尹岚 2019-12-16 18:40:39 +08:00
  • 365f69f8fa 刷新京东等级 苏尹岚 2019-12-16 18:38:48 +08:00
  • 6afbfb156a 刷新京东等级 苏尹岚 2019-12-16 18:32:32 +08:00