Commit Graph

1088 Commits

Author SHA1 Message Date
苏尹岚
729eafd927 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-09 18:51:29 +08:00
gazebo
6be99b903a jd specialDistrictMap 2019-12-09 18:35:25 +08:00
苏尹岚
4ef840788b Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-09 18:08:40 +08:00
苏尹岚
57babd9b32 未营业门店,授权,改营业范围 2019-12-09 18:08:06 +08:00
gazebo
75a2833510 分类与sku返回mapList信息 2019-12-09 17:37:56 +08:00
gazebo
8b33ec5f5a 修复上次提交处理平台vendorOrgCode的bug 2019-12-09 15:45:09 +08:00
gazebo
ecedbe9be4 京东api区分vendorOrgCode 2019-12-09 15:16:21 +08:00
苏尹岚
3dfbb88e30 美团readstore修改 2019-12-09 14:37:19 +08:00
苏尹岚
a92d5b799b 美团readstore修改 2019-12-09 14:18:17 +08:00
苏尹岚
27fedb0d95 美团readstore城市名 2019-12-09 14:07:27 +08:00
苏尹岚
6bac5f9ae1 美团readstore城市名 2019-12-09 14:06:20 +08:00
苏尹岚
1fca6a4c7c readStore增加城市名 2019-12-09 13:52:18 +08:00
苏尹岚
745f1c8a4b Accept Merge Request #63: (yonghui -> mark)
Merge Request: 导出平台未营业门店
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/63
2019-12-09 11:08:58 +08:00
gazebo
7995f507b1 用新京东回调接口
GetAPIByAppKey
2019-12-09 11:05:00 +08:00
苏尹岚
0380394030 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-09 10:49:18 +08:00
苏尹岚
cbd050d02d 导出各平台未营业门店 2019-12-09 10:49:02 +08:00
gazebo
992711c5c2 restore 2019-12-09 10:38:50 +08:00
gazebo
0587e883e0 京东回调api切换至新接口 2019-12-09 09:38:53 +08:00
gazebo
441fa5e3d8 fk 2019-12-08 18:47:15 +08:00
gazebo
039f87c8dc !!!门店相关的API全部添加vendorOrgCode依赖 2019-12-06 17:20:55 +08:00
gazebo
92ecba727d 新SyncSkus基本能工作 2019-12-06 14:55:16 +08:00
gazebo
9c2c65d266 去掉SkuCategoryWithVendor 2019-12-06 09:41:11 +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
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
苏尹岚
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
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
55fdde9be2 LoopMultiStoresVendors引入OrgCode 2019-12-03 18:27:53 +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
84dac23be8 京东回调消息根据token动态选择不同的配置 2019-12-03 15:07:50 +08:00
gazebo
c98299cdcb debug 2019-12-03 11:48:16 +08:00
gazebo
30e918c5e2 删除历史无用的代码 2019-12-03 09:15:58 +08:00
gazebo
5c8af121d6 ExpectedDeliveredTime 2019-12-02 18:14:02 +08:00
gazebo
244c653398 mtwm.AcceptOrRefuseOrder中容错 2019-12-02 15:07:16 +08:00
gazebo
351551bfe1 up 2019-12-02 14:24:23 +08:00
gazebo
dc881a2acc fk 2019-12-02 12:16:50 +08:00
gazebo
ab4251e5b9 OrderPrice的bug 2019-12-02 12:07:39 +08:00
gazebo
1454d08119 generateOrder中处理活动的情况 2019-12-02 11:32:28 +08:00
gazebo
0a42beac8a +GetMyOrderCountInfo 2019-12-02 11:00:57 +08:00
gazebo
67976664e6 fk 2019-12-02 08:55:51 +08:00
gazebo
5f2da8a4dc 取消活动时,也要将act_store_sku_map中条目相应置删除标志 2019-11-29 20:27:07 +08:00
gazebo
d93356ad01 饿百在发送运单取消事件后,如果订单没有及时(具体时间未知)转出自送,则订单会被取消,且不会发送订单取消事件 2019-11-29 16:28:21 +08:00
gazebo
ab493a59fb +GetMyOrders 2019-11-29 10:35:38 +08:00