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

Commit Graph

  • ecb9b79ec6 修改 苏尹岚 2019-12-04 11:22:11 +08:00
  • a255acb4f1 修复ReorderCategories中的bug gazebo 2019-12-04 11:05:33 +08:00
  • 2635fb035a +ThingMap +OnxxThing gazebo 2019-12-04 10:57:31 +08:00
  • 9447c6b591 同步错误返回 苏尹岚 2019-12-04 10:37:40 +08:00
  • 72c60532e8 Merge remote-tracking branch 'origin/mark' into su 苏尹岚 2019-12-04 10:33:09 +08:00
  • 4c4ed40c24 同步错误返回 苏尹岚 2019-12-04 10:32:43 +08:00
  • f69173bd2e 去掉注释"!!! 此函数不要将store_sku_bind中的vendor_price取出来放到StoreSkuSyncInfo.VendorPrice中，因为之后会依赖这个VendorPrice进行重算" gazebo 2019-12-04 10:01:05 +08:00
  • 3fe9fd5483 修复cms.DeleteStoreSku中漏设置美团外卖删除标志 gazebo 2019-12-04 09:24:10 +08:00
  • aade004105 Merge remote-tracking branch 'origin/mark' into su 苏尹岚 2019-12-04 09:17:27 +08:00
  • 7f8615abfb 同步错误返回 苏尹岚 2019-12-04 09:17:06 +08:00
  • 55fdde9be2 LoopMultiStoresVendors引入OrgCode gazebo 2019-12-03 18:27:53 +08:00
  • 457bd4b0a2 GetStoreOrderAfterTime排除内部单 gazebo 2019-12-03 17:52:51 +08:00
  • b25b7ebe41 fk gazebo 2019-12-03 16:38:20 +08:00
  • 86f37ba367 up gazebo 2019-12-03 16:36:20 +08:00
  • c75769495a remove some comment gazebo 2019-12-03 15:54:33 +08:00
  • 902c770515 调整GetOrders中的排序逻辑 gazebo 2019-12-03 15:34:14 +08:00
  • 84dac23be8 京东回调消息根据token动态选择不同的配置 gazebo 2019-12-03 15:07:50 +08:00
  • ea3cd1b833 fk gazebo 2019-12-03 12:12:03 +08:00
  • 596afbd8c5 fk gazebo 2019-12-03 12:08:51 +08:00
  • dabbfc1dd6 up gazebo 2019-12-03 11:57:27 +08:00
  • c98299cdcb debug gazebo 2019-12-03 11:48:16 +08:00
  • 2b979a4f68 Merge remote-tracking branch 'origin/mark' into su 苏尹岚 2019-12-03 11:30:40 +08:00
  • 38046bbe24 尽量减少对于api.JdAPI的直接依赖 gazebo 2019-12-03 11:21:54 +08:00
  • ab9bdbbff9 推荐分类 苏尹岚 2019-12-03 11:09:06 +08:00
  • d570664efa 推荐分类 苏尹岚 2019-12-03 11:03:52 +08:00
  • dc58180729 推荐商品 苏尹岚 2019-12-03 10:45:42 +08:00
  • 15b3ff71b2 Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-12-03 10:43:10 +08:00
  • 6dbb783aec 推荐商品 苏尹岚 2019-12-03 10:42:50 +08:00
  • e7199741a4 手机号正则修改，包括16开头的手机号 gazebo 2019-12-03 10:32:48 +08:00
  • d81ff0241b Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-12-03 10:26:52 +08:00
  • 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