Commit Graph

  • 0587e883e0 京东回调api切换至新接口 gazebo 2019-12-09 09:38:53 +08:00
  • 5d1f128e1d 价格统计 苏尹岚 2019-12-09 09:31:34 +08:00
  • 441fa5e3d8 fk gazebo 2019-12-08 18:47:15 +08:00
  • 554f3cb319 启用自动完成内部自提单 gazebo 2019-12-08 18:30:05 +08:00
  • 769a66a08a 自动完成内部自提单 gazebo 2019-12-08 17:49:26 +08:00
  • 6226b19e96 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-12-08 17:47:43 +08:00
  • 63c01887d9 up gazebo 2019-12-07 23:53:54 +08:00
  • 02d19cce82 门店价格 suyl 2019-12-07 21:38:30 +08:00
  • d1b2b666f6 门店价格 suyl 2019-12-07 21:05:33 +08:00
  • 4caf019e70 门店价格插叙 suyl 2019-12-07 20:26:52 +08:00
  • 6eb984987d up gazebo 2019-12-07 19:26:46 +08:00
  • 7155739cd2 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-12-07 19:19:43 +08:00
  • 6961c12ede 测试新京东回调实现 gazebo 2019-12-07 19:17:58 +08:00
  • 1b1e320074 Accept Merge Request #58: (yonghui -> mark) Merge Request: 统计价格 Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/58 苏尹岚 2019-12-06 19:13:28 +08:00
  • 7092b7aa95 统计价格 苏尹岚 2019-12-06 19:13:08 +08:00
  • f9d29eb0b2 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-12-06 18:38:45 +08:00
  • 6100c8a17a 测试京东新回调 gazebo 2019-12-06 18:38:30 +08:00
  • 071d30efe7 门店价格 苏尹岚 2019-12-06 18:33:50 +08:00
  • 06cea8a047 门店价格 苏尹岚 2019-12-06 18:12:01 +08:00
  • 6e976487cb Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-12-06 17:22:54 +08:00
  • 0a6f7d6777 查询门店价格评分 苏尹岚 2019-12-06 17:21:42 +08:00
  • 039f87c8dc !!!门店相关的API全部添加vendorOrgCode依赖 gazebo 2019-12-06 17:20:55 +08:00
  • 5d556203fe 推荐商品 苏尹岚 2019-12-06 15:49:48 +08:00
  • c3e3be933c 推荐商品 苏尹岚 2019-12-06 15:47:38 +08:00
  • f1b01506d3 推荐商品 苏尹岚 2019-12-06 15:44:08 +08:00
  • 0046255791 Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-12-06 15:26:18 +08:00
  • d4d20f4ddf 推荐分类 苏尹岚 2019-12-06 15:26:03 +08:00
  • 7fb09f99d1 整理DataResource相关的内容 gazebo 2019-12-06 15:20:22 +08:00
  • b9421e7979 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-12-06 14:55:34 +08:00
  • 92ecba727d 新SyncSkus基本能工作 gazebo 2019-12-06 14:55:16 +08:00
  • 388a8da753 推荐商品,分类 苏尹岚 2019-12-06 13:54:26 +08:00
  • d35fe2c40d 推荐商品,分类 苏尹岚 2019-12-06 13:50:27 +08:00
  • 6806ab202d Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-12-06 09:45:22 +08:00
  • 9c2c65d266 去掉SkuCategoryWithVendor gazebo 2019-12-06 09:41:11 +08:00
  • 43d18f6e96 价格参考 苏尹岚 2019-12-06 09:30:18 +08:00
  • ab7201e973 Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-12-06 09:05:16 +08:00
  • c6abdbbd3e 价格参考 苏尹岚 2019-12-06 09:04:55 +08:00
  • 61eed7f9e2 FullSyncStoresSkus支持excludeSkuIDs 每晚同步京东改为FullSyncStoresSkus gazebo 2019-12-05 19:05:57 +08:00
  • d6d59e4ef5 !!!调整SkuStoreCatInfo与StoreSkuSyncInfo中SyncStatus的字段名 gazebo 2019-12-05 18:22:12 +08:00
  • 496ff86ff4 Accept Merge Request #52: (yonghui -> mark) Merge Request: 获取各平台未营业门店 Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/52 苏尹岚 2019-12-05 17:22:37 +08:00
  • 0a69bb7522 TransformJdSpu2Sku中序列任务也可以是isContinueWhenError gazebo 2019-12-05 17:09:50 +08:00
  • a2f80aa60e 不允许创建多规格商品 gazebo 2019-12-05 16:42:23 +08:00
  • f2b686a60c 京西商城订单状态改改用异步 gazebo 2019-12-05 16:28:39 +08:00
  • d40a8cf035 generateOrder允许空商品列表 gazebo 2019-12-05 15:45:33 +08:00
  • 25982cf994 获取各平台未营业门店 苏尹岚 2019-12-05 15:33:55 +08:00
  • 6066e49014 sync2.SyncCategories, SyncReorderCategories gazebo 2019-12-05 15:30:05 +08:00
  • ab08935d4d 获取未营业门店 苏尹岚 2019-12-05 15:06:45 +08:00
  • 8b29246088 Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-12-05 14:47:08 +08:00
  • 9dd4c76074 获取各平台未营业门店 苏尹岚 2019-12-05 14:46:52 +08:00
  • 1c05e4c1da dao.GetUsers keyword支持id查找 gazebo 2019-12-05 14:00:15 +08:00
  • efd358b0d4 up gazebo 2019-12-05 13:32:49 +08:00
  • 64ffeb1279 fk gazebo 2019-12-05 12:30:45 +08:00
  • e09dc5a4da fk gazebo 2019-12-05 12:21:04 +08:00
  • 7c7457db40 微信退款bug gazebo 2019-12-05 12:14:31 +08:00
  • 33f38552d4 注册表:OrderPayRefund gazebo 2019-12-05 11:45:32 +08:00
  • fa98368814 UpdateSku中的bug gazebo 2019-12-05 10:08:16 +08:00
  • ae92b11a76 京西活动不需要同步的BUG修改 gazebo 2019-12-05 09:26:07 +08:00
  • db01d62722 fk gazebo 2019-12-05 09:20:42 +08:00
  • e742d88efd 加入ThingMap表示商品库的同步信息 gazebo 2019-12-05 09:04:23 +08:00
  • 527659bf55 dao.GetOrders的排序调整 gazebo 2019-12-05 08:35:31 +08:00
  • 358e6723f3 fk gazebo 2019-12-04 18:38:19 +08:00
  • c2787d64b7 fk gazebo 2019-12-04 18:36:56 +08:00
  • d25ce87ebf up gazebo 2019-12-04 18:30:34 +08:00
  • 5cecffc501 +ConstrainPayPercentage gazebo 2019-12-04 18:17:44 +08:00
  • 621ae66f6e Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-12-04 17:56:08 +08:00
  • 4d3eb5d94c 添加改价时的isScale gazebo 2019-12-04 17:49:45 +08:00
  • 7e21f6edd1 合并mark 苏尹岚 2019-12-04 17:37:06 +08:00
  • 6d677bab43 同步错误返回 苏尹岚 2019-12-04 17:34:45 +08:00
  • e6004bea32 重构sku,skuname,category的CUD gazebo 2019-12-04 12:11:57 +08:00
  • 16a14e8b4d 同步错误返回 苏尹岚 2019-12-04 11:56:02 +08:00
  • 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