Commit Graph

3843 Commits

Author SHA1 Message Date
苏尹岚
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
gazebo
f9d29eb0b2 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-12-06 18:38:45 +08:00
gazebo
6100c8a17a 测试京东新回调 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
gazebo
039f87c8dc !!!门店相关的API全部添加vendorOrgCode依赖 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
gazebo
7fb09f99d1 整理DataResource相关的内容 2019-12-06 15:20:22 +08:00
gazebo
b9421e7979 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-12-06 14:55:34 +08:00
gazebo
92ecba727d 新SyncSkus基本能工作 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
gazebo
6806ab202d Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-12-06 09:45:22 +08:00
gazebo
9c2c65d266 去掉SkuCategoryWithVendor 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
gazebo
61eed7f9e2 FullSyncStoresSkus支持excludeSkuIDs
每晚同步京东改为FullSyncStoresSkus
2019-12-05 19:05:57 +08:00
gazebo
d6d59e4ef5 !!!调整SkuStoreCatInfo与StoreSkuSyncInfo中SyncStatus的字段名 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
gazebo
0a69bb7522 TransformJdSpu2Sku中序列任务也可以是isContinueWhenError 2019-12-05 17:09:50 +08:00
gazebo
a2f80aa60e 不允许创建多规格商品 2019-12-05 16:42:23 +08:00
gazebo
f2b686a60c 京西商城订单状态改改用异步 2019-12-05 16:28:39 +08:00
gazebo
d40a8cf035 generateOrder允许空商品列表 2019-12-05 15:45:33 +08:00
苏尹岚
25982cf994 获取各平台未营业门店 2019-12-05 15:33:55 +08:00
gazebo
6066e49014 sync2.SyncCategories, SyncReorderCategories 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
gazebo
1c05e4c1da dao.GetUsers keyword支持id查找 2019-12-05 14:00:15 +08:00
gazebo
efd358b0d4 up 2019-12-05 13:32:49 +08:00
gazebo
64ffeb1279 fk 2019-12-05 12:30:45 +08:00
gazebo
e09dc5a4da fk 2019-12-05 12:21:04 +08:00
gazebo
7c7457db40 微信退款bug 2019-12-05 12:14:31 +08:00
gazebo
33f38552d4 注册表:OrderPayRefund 2019-12-05 11:45:32 +08:00
gazebo
fa98368814 UpdateSku中的bug 2019-12-05 10:08:16 +08:00
gazebo
ae92b11a76 京西活动不需要同步的BUG修改 2019-12-05 09:26:07 +08:00
gazebo
db01d62722 fk 2019-12-05 09:20:42 +08:00
gazebo
e742d88efd 加入ThingMap表示商品库的同步信息 2019-12-05 09:04:23 +08:00
gazebo
527659bf55 dao.GetOrders的排序调整 2019-12-05 08:35:31 +08:00
gazebo
358e6723f3 fk 2019-12-04 18:38:19 +08:00
gazebo
c2787d64b7 fk 2019-12-04 18:36:56 +08:00
gazebo
d25ce87ebf up 2019-12-04 18:30:34 +08:00