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

Commit Graph

  • 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
  • 7410da75fd +GetOrderPay GetOrders添加参数isPurchase gazebo 2019-11-27 10:05:26 +08:00
  • 4b1b011459 微信支付时，body必须填 gazebo 2019-11-27 08:44:49 +08:00
  • 7913fc96b9 导出微盟订单修改 苏尹岚 2019-11-27 08:23:34 +08:00
  • 852f3510da Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-11-26 18:31:19 +08:00
  • f8283bb159 导出微盟订单修改 苏尹岚 2019-11-26 18:31:04 +08:00
  • 799c8232d7 同步错误返回 苏尹岚 2019-11-26 18:26:16 +08:00
  • 881cf8b515 添加京东活动商品时，同时传入infoId与outInfoId参数（京东的bug） gazebo 2019-11-26 17:59:18 +08:00
  • 6145142f58 +model.OrderStatusPayed gazebo 2019-11-26 17:39:13 +08:00
  • 47d6b5d2f8 Merge remote-tracking branch 'origin/mark' into su 苏尹岚 2019-11-26 17:26:51 +08:00
  • 498a28bfe9 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-11-26 17:17:06 +08:00
  • 026e73cc21 CreateOrder返回的商品列表排序 gazebo 2019-11-26 17:16:43 +08:00
  • 20cb7b4414 Accept Merge Request #41: (yonghui -> mark) Merge Request: 根据微盟价更新京西价修改 Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/41 苏尹岚 2019-11-26 17:12:50 +08:00
  • 80c5560faf 根据微盟更新京西价 苏尹岚 2019-11-26 17:07:52 +08:00
  • e369341bdf GetAvailableDeliverTime添加“立即送出” gazebo 2019-11-26 16:50:22 +08:00
  • ca3b8a8907 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-11-26 16:17:14 +08:00
  • 2d1bfa4c1e +GetAvailableDeliverTime gazebo 2019-11-26 16:16:54 +08:00
  • edcd56eb45 同步错误返回 苏尹岚 2019-11-26 14:20:49 +08:00
  • 45f620627e Merge remote-tracking branch 'origin/mark' into su 苏尹岚 2019-11-26 13:37:16 +08:00
  • 2c4fce2956 Accept Merge Request #40: (yonghui -> mark) Merge Request: 读取微盟订单bug修改 Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/40 苏尹岚 2019-11-26 12:02:10 +08:00
  • fd8b6c957f 读取微盟订单商品bug修改 苏尹岚 2019-11-26 12:01:29 +08:00
  • d0f59c3f4b fk gazebo 2019-11-26 12:00:07 +08:00
  • b51389ab4f Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-11-26 11:47:41 +08:00
  • af7ba61bbc bug fix gazebo 2019-11-26 11:47:33 +08:00
  • d16bab2e77 Accept Merge Request #39: (yonghui -> mark) Merge Request: 获取微盟订单信息bug修改 Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/39 苏尹岚 2019-11-26 11:43:38 +08:00
  • a9df406011 获取微盟订单商品信息bug修改 苏尹岚 2019-11-26 11:42:20 +08:00
  • d69ad7a9e4 同步错误返回 苏尹岚 2019-11-26 11:27:52 +08:00
  • ed0f172865 京西活动不设置同步标志 gazebo 2019-11-26 11:15:14 +08:00
  • 4e9d09657c up gazebo 2019-11-26 11:05:26 +08:00
  • b8a293c296 up gazebo 2019-11-26 11:00:49 +08:00
  • 483d3c8dbc mergemark 苏尹岚 2019-11-26 10:26:14 +08:00
  • 684c1091f8 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-11-26 09:47:35 +08:00
  • 5697cdbcff 防止京东活动重复记录 gazebo 2019-11-26 09:47:02 +08:00
  • 8eef3288db 获取微盟订单信息 苏尹岚 2019-11-26 09:36:46 +08:00
  • 22f60a4546 直营店始终按比例结算，不考虑活动与结算表 gazebo 2019-11-26 08:58:49 +08:00
  • 01b11e0a55 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-11-25 18:14:13 +08:00
  • 72d6b3c733 自配送门店订单的三方配送限价直接为10元 gazebo 2019-11-25 18:13:42 +08:00
  • 3c36f76b58 Accept Merge Request #37: (yonghui -> mark) Merge Request: 统计订单查询bug修改 Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/37 苏尹岚 2019-11-25 17:40:58 +08:00
  • aae1689fc3 订单统计查询bug修改 苏尹岚 2019-11-25 17:40:05 +08:00
  • d49446a155 Accept Merge Request #36: (yonghui -> mark) Merge Request: 统计订单查询bug修改 Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/36 苏尹岚 2019-11-25 17:04:42 +08:00
  • 0f582721f2 统计订单查询bug修改 苏尹岚 2019-11-25 17:02:35 +08:00
  • 63ee62eecc 后来又发现有订单（81710104014426376）在完成后，直接再被取消的情况，不能生成售后单，还是再允许完成后取消。。。 gazebo 2019-11-25 16:09:04 +08:00
  • 622bfc89df !!!重新实现订单调度timer，可以允许多个timer. gazebo 2019-11-25 15:49:38 +08:00
  • f1b3547645 up gazebo 2019-11-25 15:22:47 +08:00
  • 7a206dd9b9 UpdateUserByMiniInfo中jsCode可选 gazebo 2019-11-25 15:18:31 +08:00
  • d7c77068cc DecryptData中更新sessionKey gazebo 2019-11-25 14:46:40 +08:00
  • a9d8df2f8c JdStoreInfo1125 gazebo 2019-11-25 13:48:20 +08:00
  • fbfe4037bc up gazebo 2019-11-25 11:04:57 +08:00
  • ab445a8edf addOrderStatusk,美团在订单完成后，还可能收到订单取消（应该当成售后单处理才合适），强制忽略这种情况，比如订单：80662201436073600 gazebo 2019-11-25 10:55:50 +08:00
  • aadbb087d2 美团外卖全额售后单创建时，不再依赖于OrderFinancialDetail2Refund gazebo 2019-11-25 10:30:53 +08:00
  • 143db222e1 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-11-24 08:33:50 +08:00
  • bb602a14d4 美团商品强制设置5张图 gazebo 2019-11-24 08:32:45 +08:00
  • 42e348e59a 准备重构订单调度定时器 gazebo 2019-11-23 15:36:17 +08:00
  • c033fd3988 Accept Merge Request #35: (yonghui -> mark) Merge Request: excel Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/35 苏尹岚 2019-11-22 19:11:00 +08:00
  • 228071d00e excel 苏尹岚 2019-11-22 19:10:36 +08:00
  • 88b84ef014 Accept Merge Request #34: (yonghui -> mark) Merge Request: 永辉excel Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/34 苏尹岚 2019-11-22 19:09:36 +08:00
  • ae6ad69d8c yonghuiexcel 苏尹岚 2019-11-22 19:08:48 +08:00
  • 78a26364c0 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-11-22 18:33:02 +08:00
  • 5d2e9be549 创建活动时，OriginalPrice返回京西价 gazebo 2019-11-22 18:32:31 +08:00
  • ec494368a4 Accept Merge Request #33: (yonghui -> mark) Merge Request: 修改永辉Excel接口修改 Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/33 苏尹岚 2019-11-22 18:03:39 +08:00
  • 70bf3a70a9 永辉Excel接口修改 苏尹岚 2019-11-22 18:03:12 +08:00
  • 92b9f96889 读取永辉Excel接口修改 苏尹岚 2019-11-22 17:59:48 +08:00
  • aaf9e9a183 取消生成美团店的假商品 gazebo 2019-11-22 17:34:00 +08:00
  • 27a573bd30 specialStoreID = "8171010" gazebo 2019-11-22 17:13:41 +08:00
  • 0fef41b956 up gazebo 2019-11-22 17:09:25 +08:00
  • 90092058a2 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-11-22 17:06:01 +08:00
  • 251894e2d2 up gazebo 2019-11-22 17:05:50 +08:00
  • ab3741ae2b Accept Merge Request #32: (yonghui -> mark) Merge Request: 读取永辉Excel修改 Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/32 苏尹岚 2019-11-22 17:00:06 +08:00
  • aa5a8bacc0 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-11-22 17:00:10 +08:00
  • 4a6ada20c4 临时测试温江直营店SKU与图片自动加多 gazebo 2019-11-22 16:59:32 +08:00
  • 34759f564b 读取永辉Excel修改 苏尹岚 2019-11-22 16:59:31 +08:00