Commit Graph

4407 Commits

Author SHA1 Message Date
苏尹岚
86e783a4d0 错误返回 2020-01-07 17:53:56 +08:00
苏尹岚
e813e81ed8 同步错误 2020-01-07 14:53:23 +08:00
苏尹岚
617b361fbe 同步错误 2020-01-07 14:43:50 +08:00
苏尹岚
68c9f17d73 同步错误 2020-01-07 14:37:24 +08:00
苏尹岚
6c935643ae 同步错误 2020-01-07 14:25:39 +08:00
苏尹岚
540209eadc 同步错误 2020-01-07 14:20:56 +08:00
苏尹岚
386e6df25a Merge remote-tracking branch 'origin/mark' into su 2020-01-07 11:04:54 +08:00
苏尹岚
16d2b0e3d2 Accept Merge Request #123: (yonghui -> mark)
Merge Request: 推荐商品
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/123
2020-01-07 10:31:28 +08:00
苏尹岚
f05fa6302f 推荐商品 2020-01-07 10:31:01 +08:00
gazebo
4ca6723fa2 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2020-01-07 10:30:04 +08:00
gazebo
11dd554561 BuyerCancelOrder 2020-01-07 10:29:51 +08:00
苏尹岚
bba21e80a1 Accept Merge Request #122: (yonghui -> mark)
Merge Request: 推荐商品
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/122
2020-01-07 10:28:52 +08:00
苏尹岚
6d148fd0c8 推荐商品 2020-01-07 10:28:01 +08:00
gazebo
47094be681 RegisterUser中,如果有AuthToken,忽略Token 2020-01-07 10:10:50 +08:00
gazebo
586644d0ec up 2020-01-07 10:01:24 +08:00
gazebo
d913a8d68b up 2020-01-07 09:56:03 +08:00
gazebo
901b45690d fk 2020-01-07 09:50:47 +08:00
gazebo
4a394a60eb 美团UpdateStoreBoxFee中,忽略没有打包费配置错误 2020-01-07 09:47:29 +08:00
gazebo
3fabb0d952 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2020-01-07 09:43:41 +08:00
gazebo
c47a49cebd 修复饿百在设置门店状态后以上取状态状态没有变化导致的bug 2020-01-07 09:42:55 +08:00
苏尹岚
c191436968 去掉验证token 2020-01-07 09:02:35 +08:00
苏尹岚
33f2e2b74d 差评扣款 2020-01-07 08:26:13 +08:00
苏尹岚
103bce68ba 差评补款 2020-01-06 18:25:14 +08:00
gazebo
772c8f9cbe StoreSkuAct 2020-01-06 18:00:14 +08:00
苏尹岚
e4b8d1da21 Merge remote-tracking branch 'origin/mark' into yonghui 2020-01-06 17:47:03 +08:00
gazebo
c331ae3996 fk 2020-01-06 17:30:36 +08:00
gazebo
c92996a1d9 up 2020-01-06 16:54:54 +08:00
苏尹岚
14b45ee277 畅销品 2020-01-06 16:51:05 +08:00
苏尹岚
93c42824aa Merge remote-tracking branch 'origin/mark' into yonghui 2020-01-06 16:37:52 +08:00
苏尹岚
e0991f8609 畅销品查询 2020-01-06 16:37:36 +08:00
gazebo
170cd63936 RegisterUser支持token 2020-01-06 16:36:52 +08:00
苏尹岚
54ad61d578 Merge remote-tracking branch 'origin/mark' into yonghui 2020-01-06 15:43:02 +08:00
苏尹岚
f869a8e065 差评退款 2020-01-06 15:42:47 +08:00
gazebo
fda22fa2d4 SendVerifyCode 2020-01-06 15:36:33 +08:00
gazebo
483aa6df20 IsAdmin 2020-01-06 15:24:59 +08:00
苏尹岚
ff0a3b3a02 显示中位价 2020-01-06 14:26:00 +08:00
gazebo
5d21158c7b SendVerifyCode时,如果是管理员,返回verifyCode 2020-01-06 12:13:28 +08:00
苏尹岚
71ba2e13db 显示中位价 2020-01-06 11:27:01 +08:00
苏尹岚
6f0a3bc971 显示中位价 2020-01-06 11:11:37 +08:00
苏尹岚
3bd34ce8a5 显示中位价 2020-01-06 11:08:16 +08:00
苏尹岚
a5ea3ebd3d 显示中位价 2020-01-06 10:51:54 +08:00
苏尹岚
df6a0b1a1c 显示中位价 2020-01-06 10:46:51 +08:00
苏尹岚
6fb43fa553 Merge remote-tracking branch 'origin/mark' into yonghui 2020-01-06 10:27:57 +08:00
gazebo
a07209c86d 更新美团 cookie
SyncStore2添加isManageIt
2020-01-06 10:21:54 +08:00
苏尹岚
b80b83aaef Merge remote-tracking branch 'origin/mark' into yonghui 2020-01-06 10:13:52 +08:00
苏尹岚
754c190220 增加中位价 2020-01-06 10:13:31 +08:00
gazebo
152844a9f4 up 2020-01-06 09:39:34 +08:00
gazebo
dd7d226b16 fix bug in GetStoresMapList2 2020-01-06 09:30:10 +08:00
gazebo
c47fc8e8e3 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2020-01-06 09:19:01 +08:00
gazebo
64cf14a04c 京东每晚同步不全同步 2020-01-06 09:15:32 +08:00