Commit Graph

4724 Commits

Author SHA1 Message Date
苏尹岚
1869e4245e 顾客次数取消时间 2020-01-16 11:58:36 +08:00
苏尹岚
0d5494d29d 操作日志记录排除Get开头的非Get请求 2020-01-16 11:26:04 +08:00
苏尹岚
7201eda9cb Accept Merge Request #153: (su -> mark)
Merge Request: 商品库,门店,同步错误返回
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/153
2020-01-16 10:52:41 +08:00
苏尹岚
2b2eb2a67d mm 2020-01-16 10:49:48 +08:00
苏尹岚
fdce900972 活动退回 2020-01-16 10:48:54 +08:00
gazebo
88748b4d99 实验StoreSkuAct 2020-01-16 10:47:42 +08:00
苏尹岚
bf9982e3cf Merge branch 'su' of e.coding.net:rosydev/jx-callback into su 2020-01-16 10:46:41 +08:00
苏尹岚
b94a1dd520 补漏订单状态是新订单则接单 2020-01-16 10:23:13 +08:00
苏尹岚
1ded6199f4 同步错误门店管理返回新增 2020-01-16 10:09:03 +08:00
苏尹岚
d092792229 同步错误 2020-01-16 10:09:03 +08:00
苏尹岚
7f2be04650 同步商品库错误返回修改 2020-01-16 10:09:03 +08:00
苏尹岚
ccff341489 同步商品库错误修改 2020-01-16 10:09:03 +08:00
苏尹岚
e925327e8a 新增同步商品库错误返回(测试) 2020-01-16 10:09:03 +08:00
苏尹岚
942328e96f 用Excel导入活动(一半) 2020-01-16 10:08:44 +08:00
gazebo
b62c4fe403 fk 2020-01-16 09:32:16 +08:00
gazebo
5c2da76f25 causeFlag 2020-01-16 09:25:58 +08:00
gazebo
c4c1d3b6f3 京西果园cookie 2020-01-16 09:25:58 +08:00
苏尹岚
825d53b892 getOrderInfo字段修改 2020-01-16 09:19:42 +08:00
苏尹岚
6ff593ca83 getOrderInfo字段修改 2020-01-16 09:17:50 +08:00
苏尹岚
c052dbe1a3 Merge remote-tracking branch 'origin/mark' into orderinfo 2020-01-16 09:05:29 +08:00
gazebo
bcf322afaa UpdateStoresSkus添加可选参数causeFlag 2020-01-16 09:03:58 +08:00
苏尹岚
d6cefab677 订单详情获取顾客信息修改 2020-01-16 09:03:29 +08:00
gazebo
36b8cfb1f1 syncStoreSkuNew添加参数:causeFlag 2020-01-15 18:20:27 +08:00
gazebo
6dc177da70 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2020-01-15 16:50:42 +08:00
gazebo
8b3977b10f 基础运费尽量用订单的,没有才用缺省值 2020-01-15 16:50:03 +08:00
苏尹岚
42b83cc8d1 同步错误门店管理返回新增 2020-01-15 14:41:09 +08:00
苏尹岚
41583569f7 同步错误 2020-01-15 14:16:04 +08:00
苏尹岚
f7535eac30 同步商品库错误返回修改 2020-01-15 14:12:57 +08:00
苏尹岚
07badc4a8f 同步商品库错误修改 2020-01-15 14:06:06 +08:00
苏尹岚
c9d7144ee4 新增同步商品库错误返回(测试) 2020-01-15 13:57:06 +08:00
苏尹岚
e367b19a05 Accept Merge Request #148: (su -> mark)
Merge Request: 按全国中位价刷新门店价格
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/148
2020-01-15 13:52:44 +08:00
苏尹岚
c5ad12bf29 畅销品自动关注条件修改,刷新中位价增加全国 2020-01-15 11:47:56 +08:00
苏尹岚
299bfce603 Accept Merge Request #147: (su -> mark)
Merge Request: 操作日志记录优化
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/147
2020-01-15 10:41:28 +08:00
苏尹岚
ee7e1b0d3e 操作日志记录开关根据运行环境决定 2020-01-15 10:27:01 +08:00
苏尹岚
1f99d9223c 操作日志记录优化 2020-01-15 10:11:22 +08:00
苏尹岚
dde956c08f Accept Merge Request #146: (su -> mark)
Merge Request: 增加门店商品的操作日志以及开关
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/146
2020-01-15 08:57:39 +08:00
苏尹岚
59ffb8838f 操作日志增加开关 2020-01-15 08:51:41 +08:00
苏尹岚
1b9921c387 Merge remote-tracking branch 'origin/mark' into su 2020-01-14 19:11:48 +08:00
苏尹岚
45adf058c9 Accept Merge Request #145: (tmp -> mark)
Merge Request: 订单状态修改
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/145
2020-01-14 19:03:22 +08:00
苏尹岚
fa93efc754 订单状态修改 2020-01-14 19:02:44 +08:00
gazebo
5c3e0627ba up 2020-01-14 18:59:46 +08:00
gazebo
78b63abdc6 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2020-01-14 18:35:46 +08:00
gazebo
59269b3733 fk 2020-01-14 18:35:38 +08:00
苏尹岚
19ce032a72 Merge remote-tracking branch 'origin/mark' into su 2020-01-14 18:34:58 +08:00
苏尹岚
4052e58799 Accept Merge Request #144: (tmp -> mark)
Merge Request: 刷新订单状态新增订单完成时间,畅销品自动关注放开城市限制
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/144
2020-01-14 18:26:38 +08:00
苏尹岚
6375cde824 小bug 2020-01-14 18:24:57 +08:00
苏尹岚
89f64ecc97 刷新订单状态新增订单完成时间,畅销品自动关注放开城市限制 2020-01-14 18:22:21 +08:00
gazebo
b8bab31b47 同步时不修改LastOperator与UpdatedAt 2020-01-14 18:12:11 +08:00
gazebo
819de53e85 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2020-01-14 17:37:37 +08:00
gazebo
b9f74f8a13 +api UploadFakeJdThingMap 2020-01-14 17:37:13 +08:00