Commit Graph

3824 Commits

Author SHA1 Message Date
苏尹岚
388a8da753 推荐商品,分类 2019-12-06 13:54:26 +08:00
苏尹岚
d35fe2c40d 推荐商品,分类 2019-12-06 13:50:27 +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
gazebo
5cecffc501 +ConstrainPayPercentage 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
gazebo
4d3eb5d94c 添加改价时的isScale 2019-12-04 17:49:45 +08:00
gazebo
e6004bea32 重构sku,skuname,category的CUD 2019-12-04 12:11:57 +08:00
gazebo
a255acb4f1 修复ReorderCategories中的bug 2019-12-04 11:05:33 +08:00
gazebo
2635fb035a +ThingMap
+OnxxThing
2019-12-04 10:57:31 +08:00
gazebo
f69173bd2e 去掉注释"!!! 此函数不要将store_sku_bind中的vendor_price取出来放到StoreSkuSyncInfo.VendorPrice中,因为之后会依赖这个VendorPrice进行重算" 2019-12-04 10:01:05 +08:00
gazebo
3fe9fd5483 修复cms.DeleteStoreSku中漏设置美团外卖删除标志 2019-12-04 09:24:10 +08:00
gazebo
55fdde9be2 LoopMultiStoresVendors引入OrgCode 2019-12-03 18:27:53 +08:00
gazebo
457bd4b0a2 GetStoreOrderAfterTime排除内部单 2019-12-03 17:52:51 +08:00
gazebo
b25b7ebe41 fk 2019-12-03 16:38:20 +08:00
gazebo
86f37ba367 up 2019-12-03 16:36:20 +08:00
gazebo
c75769495a remove some comment 2019-12-03 15:54:33 +08:00
gazebo
902c770515 调整GetOrders中的排序逻辑 2019-12-03 15:34:14 +08:00
gazebo
84dac23be8 京东回调消息根据token动态选择不同的配置 2019-12-03 15:07:50 +08:00
gazebo
ea3cd1b833 fk 2019-12-03 12:12:03 +08:00
gazebo
596afbd8c5 fk 2019-12-03 12:08:51 +08:00
gazebo
dabbfc1dd6 up 2019-12-03 11:57:27 +08:00
gazebo
c98299cdcb debug 2019-12-03 11:48:16 +08:00