Commit Graph

3804 Commits

Author SHA1 Message Date
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
gazebo
6066e49014 sync2.SyncCategories, SyncReorderCategories 2019-12-05 15:30:05 +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
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
gazebo
38046bbe24 尽量减少对于api.JdAPI的直接依赖 2019-12-03 11:21:54 +08:00
gazebo
e7199741a4 手机号正则修改,包括16开头的手机号 2019-12-03 10:32:48 +08:00
gazebo
0a6136731e Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-12-03 10:17:29 +08:00
gazebo
30b5ff0c70 尽量去掉对于UpdateEntityLogicallyAndUpdateSyncStatus的使用 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
gazebo
30e918c5e2 删除历史无用的代码 2019-12-03 09:15:58 +08:00
gazebo
a03aa52be2 GoodsOrder.UserID as index 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
gazebo
5c8af121d6 ExpectedDeliveredTime 2019-12-02 18:14:02 +08:00