Commit Graph

5222 Commits

Author SHA1 Message Date
苏尹岚
ecb9b79ec6 修改 2019-12-04 11:22:11 +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
苏尹岚
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
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
苏尹岚
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
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
苏尹岚
2b979a4f68 Merge remote-tracking branch 'origin/mark' into su 2019-12-03 11:30:40 +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
苏尹岚
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
gazebo
b6659baf72 分类重新排序时没有正确更新JdSyncStatus修复 2019-12-02 16:21:59 +08:00
苏尹岚
1f3ee86edd Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-02 16:15:14 +08:00
苏尹岚
73f8bfd28f 禁用京东用户 2019-12-02 16:14:56 +08:00
苏尹岚
7ec9a99cfb 同步错误返回 2019-12-02 15:42:01 +08:00
gazebo
0f636d2274 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-12-02 15:07:58 +08:00
gazebo
244c653398 mtwm.AcceptOrRefuseOrder中容错 2019-12-02 15:07:16 +08:00
徐建华
34a1f1d954 Accept Merge Request #48: (yonghui -> mark)
Merge Request: 门店订单归属补漏
Created By: @苏尹岚
Accepted By: @徐建华
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/48
2019-12-02 14:37:09 +08:00
gazebo
351551bfe1 up 2019-12-02 14:24:23 +08:00