Commit Graph

3812 Commits

Author SHA1 Message Date
苏尹岚
c6abdbbd3e 价格参考 2019-12-06 09:04:55 +08:00
苏尹岚
25982cf994 获取各平台未营业门店 2019-12-05 15:33:55 +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
gazebo
38046bbe24 尽量减少对于api.JdAPI的直接依赖 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
gazebo
e7199741a4 手机号正则修改,包括16开头的手机号 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
苏尹岚
f4c400d69e 推荐商品 2019-12-03 10:25:12 +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