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

Commit Graph

  • f4c400d69e 推荐商品 苏尹岚 2019-12-03 10:25:12 +08:00
  • 0a6136731e Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-12-03 10:17:29 +08:00
  • 30b5ff0c70 尽量去掉对于UpdateEntityLogicallyAndUpdateSyncStatus的使用 gazebo 2019-12-03 10:17:12 +08:00
  • 8c196ab87f 推荐商品 苏尹岚 2019-12-03 10:09:55 +08:00
  • 9b382088c4 Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-12-03 09:18:48 +08:00
  • 0c55b76bf1 推荐商品 苏尹岚 2019-12-03 09:18:31 +08:00
  • 30e918c5e2 删除历史无用的代码 gazebo 2019-12-03 09:15:58 +08:00
  • a03aa52be2 GoodsOrder.UserID as index gazebo 2019-12-02 21:59:50 +08:00
  • 33fbbf7192 禁用京东用户 苏尹岚 2019-12-02 19:02:14 +08:00
  • ef7d9814fb Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-12-02 18:23:58 +08:00
  • 4e17b43a22 京东用户处理 苏尹岚 2019-12-02 18:23:39 +08:00
  • 5c8af121d6 ExpectedDeliveredTime gazebo 2019-12-02 18:14:02 +08:00
  • b6659baf72 分类重新排序时没有正确更新JdSyncStatus修复 gazebo 2019-12-02 16:21:59 +08:00
  • 1f3ee86edd Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-12-02 16:15:14 +08:00
  • 73f8bfd28f 禁用京东用户 苏尹岚 2019-12-02 16:14:56 +08:00
  • 7ec9a99cfb 同步错误返回 苏尹岚 2019-12-02 15:42:01 +08:00
  • 0f636d2274 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-12-02 15:07:58 +08:00
  • 244c653398 mtwm.AcceptOrRefuseOrder中容错 gazebo 2019-12-02 15:07:16 +08:00
  • 34a1f1d954 Accept Merge Request #48: (yonghui -> mark) Merge Request: 门店订单归属补漏 Created By: @苏尹岚 Accepted By: @徐建华 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/48 徐建华 2019-12-02 14:37:09 +08:00
  • 351551bfe1 up gazebo 2019-12-02 14:23:14 +08:00
  • dc881a2acc fk gazebo 2019-12-02 12:16:50 +08:00
  • 35a05e2b9d Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-12-02 12:10:57 +08:00
  • ab4251e5b9 OrderPrice的bug gazebo 2019-12-02 12:04:11 +08:00
  • d033383eef OrderPrice的bug gazebo 2019-12-02 12:04:11 +08:00
  • 1454d08119 generateOrder中处理活动的情况 gazebo 2019-12-02 11:30:09 +08:00
  • d4edd5d06d 订单门钉归属修改 苏尹岚 2019-12-02 11:30:36 +08:00
  • 410f671a36 冲突修改 苏尹岚 2019-12-02 11:14:20 +08:00
  • 3c5afc31b6 接口位置移动，门店归属补漏修改，获取京东用户修改 苏尹岚 2019-12-02 11:12:09 +08:00
  • 71bc871bdb StoreSkuNameExt.Skus2改为Skus gazebo 2019-12-02 11:08:57 +08:00
  • 0a42beac8a +GetMyOrderCountInfo gazebo 2019-12-02 11:00:57 +08:00
  • 67976664e6 fk gazebo 2019-12-02 08:55:51 +08:00
  • 2836da8c94 同步错误返回 苏尹岚 2019-12-02 08:20:05 +08:00
  • 36d964ef93 AutoSaleAtStr改为22:00:00 gazebo 2019-12-01 17:03:44 +08:00
  • 0b4886c246 限制美团活动最小折扣为3折 活动至少要有98折 gazebo 2019-11-30 14:11:46 +08:00
  • 5f2da8a4dc 取消活动时，也要将act_store_sku_map中条目相应置删除标志 gazebo 2019-11-29 20:27:07 +08:00
  • 16dfd05943 Merge branch 'yonghui' of e.coding.net:rosydev/jx-callback into su 苏尹岚 2019-11-29 17:55:09 +08:00
  • c0b394f43d Merge remote-tracking branch 'origin/mark' into su 苏尹岚 2019-11-29 17:52:28 +08:00
  • 6c0c837fae 门店归属订单不漏 苏尹岚 2019-11-29 17:48:29 +08:00
  • 6d1129a61c up gazebo 2019-11-29 17:19:24 +08:00
  • 09944d68cd 每晚自动补全前一天与当天订单 gazebo 2019-11-29 17:15:01 +08:00
  • 9f3eb98db0 启用ChangeStoreSkuSaleStatus日常任务 gazebo 2019-11-29 16:49:09 +08:00
  • 899e516a75 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-11-29 16:28:36 +08:00
  • d93356ad01 饿百在发送运单取消事件后，如果订单没有及时（具体时间未知）转出自送，则订单会被取消，且不会发送订单取消事件 gazebo 2019-11-29 16:28:21 +08:00
  • d44e70074c Accept Merge Request #47: (yonghui -> mark) Merge Request: 获取京东用户列表 Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/47 苏尹岚 2019-11-29 16:17:17 +08:00
  • 648357c423 获取京东用户列表 苏尹岚 2019-11-29 16:15:06 +08:00
  • 5f4aa686d9 京东token gazebo 2019-11-29 15:43:50 +08:00
  • 774f324b7b Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-11-29 15:06:38 +08:00
  • ebb846dca8 GetStoresSkusNew中正确处理actVendorID gazebo 2019-11-29 15:06:14 +08:00
  • 6887fbc18a 读取永辉excel 苏尹岚 2019-11-29 15:03:59 +08:00
  • b4db130c5e Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-11-29 14:35:36 +08:00
  • 595572ef14 获取京东用户列表 苏尹岚 2019-11-29 14:33:38 +08:00
  • a4cdd45487 up gazebo 2019-11-29 12:07:33 +08:00
  • 2e4c408170 读取永辉excel 苏尹岚 2019-11-29 11:56:47 +08:00
  • 2d653c2e19 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-11-29 11:13:56 +08:00
  • 4c948798f1 up gazebo 2019-11-29 11:13:46 +08:00
  • 519c4eadec Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-11-29 11:09:48 +08:00
  • 34ee046ce2 获取京东用户修改，刷新订单结算价修改 苏尹岚 2019-11-29 11:09:07 +08:00
  • ab493a59fb +GetMyOrders gazebo 2019-11-29 10:35:38 +08:00
  • 3756ac67b2 调整依赖结构，jxutils不依赖于dao，dao依赖于jxutils gazebo 2019-11-29 08:43:36 +08:00
  • 211ff82517 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-11-28 18:55:24 +08:00
  • 1bda4d6058 +OrderManager.CreateAfsOrderFromOrder gazebo 2019-11-28 18:54:52 +08:00
  • d85f595fee 读取永辉excel 苏尹岚 2019-11-28 17:58:08 +08:00
  • fac0e95546 Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-11-28 17:52:34 +08:00
  • b998b2b91c conf 4 jd gazebo 2019-11-28 17:26:35 +08:00
  • 406b522d05 ForceUpdateVendorPrice找不到门店商品时，给出具体信息 gazebo 2019-11-28 15:52:36 +08:00
  • c0d9b2e6b8 读取永辉excel 苏尹岚 2019-11-28 15:25:57 +08:00
  • ef8acccb3b 读取永辉excel 苏尹岚 2019-11-28 15:07:11 +08:00
  • 9c37dd84fc remove SkuCategory.ElmCategoryID and WscCategoryID gazebo 2019-11-28 15:01:44 +08:00
  • 6fb1142e67 读取永辉excel 苏尹岚 2019-11-28 14:54:23 +08:00
  • 4c61474de7 读取永辉excel 苏尹岚 2019-11-28 14:53:14 +08:00
  • 0145442512 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-11-28 14:29:55 +08:00
  • ae0fb69866 订单列表返回城市与区名 gazebo 2019-11-28 14:29:42 +08:00
  • e30808a752 Accept Merge Request #42: (yonghui -> mark) Merge Request: 查找京东用户 Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/42 苏尹岚 2019-11-28 14:26:10 +08:00
  • fa843d3d1e 同步错误返回 苏尹岚 2019-11-28 14:24:41 +08:00
  • 45827aceb5 +CanSwitch2SelfDeliver，美团预定单是不能转自送的 减小转自送失败尝试时间间隙至3秒（以免出现不能取消三方运单的情况） gazebo 2019-11-28 14:18:52 +08:00
  • 363b44a21c 同步错误返回 苏尹岚 2019-11-28 14:15:57 +08:00
  • 2c21ea4385 up gazebo 2019-11-28 14:08:18 +08:00
  • 57cc23f36b ForceUpdateVendorPrice中由ActPrice替换ActualActPrice gazebo 2019-11-28 13:51:17 +08:00
  • 1a64005d81 up gazebo 2019-11-28 13:43:05 +08:00
  • fb758e1211 up gazebo 2019-11-28 13:35:20 +08:00
  • 2a486ea2ba 同步错误返回 苏尹岚 2019-11-28 11:47:19 +08:00
  • 4ca1f56cb6 不需要token的API添加可选参数token(以便转入时能输出token信息） gazebo 2019-11-28 10:32:54 +08:00
  • 49c42986ef Merge branch 'yonghui' of e.coding.net:rosydev/jx-callback into su 苏尹岚 2019-11-28 09:50:19 +08:00
  • a041906c86 Merge remote-tracking branch 'origin/mark' into su 苏尹岚 2019-11-28 09:49:47 +08:00
  • 412fe44d32 按活动要求强制刷新商品平台价 gazebo 2019-11-28 08:59:56 +08:00
  • bbc9be5503 查找京东商城用户关联的活跃门店 苏尹岚 2019-11-28 08:49:53 +08:00
  • 5cf58c44b0 Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-11-28 08:37:22 +08:00
  • b91163cb18 addOrderStatus中，修改订单状态更新逻辑： 1，只有终止状态，或解锁事件才会解锁 gazebo 2019-11-27 21:15:09 +08:00
  • d836376ac3 fk gazebo 2019-11-27 18:02:47 +08:00
  • d6205e955d fk gazebo 2019-11-27 17:59:28 +08:00
  • d6e172f6f9 fk gazebo 2019-11-27 17:32:38 +08:00
  • 47803c64e4 up gazebo 2019-11-27 17:24:21 +08:00
  • 814795b1f8 Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-11-27 15:02:37 +08:00
  • cea72b06de SetJdCookie gazebo 2019-11-27 14:56:47 +08:00
  • 1eff6bfd43 QueryPageStores添加radius,lng,lat参数 gazebo 2019-11-27 14:34:30 +08:00
  • 7c913c0d5b 根据微盟更新京西价修改 苏尹岚 2019-11-27 11:04:03 +08:00
  • 38b81a320e Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-11-27 10:08:12 +08:00
  • 53efea0eb4 配送费设置为0调试 gazebo 2019-11-27 10:06:58 +08:00
  • 491fddf6ed Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-11-27 10:06:12 +08:00
  • 3ffb353901 老格拓店恢复 苏尹岚 2019-11-27 10:05:57 +08:00