Commit Graph

4440 Commits

Author SHA1 Message Date
苏尹岚
74e52a0d94 Merge remote-tracking branch 'origin/mark' into su 2020-01-08 14:41:06 +08:00
gazebo
510b9e8483 修复处理投递失败的BUG 2020-01-08 11:38:46 +08:00
gazebo
a56a5b1ec7 OrderSkuDiscountTypeTe 2020-01-08 11:12:12 +08:00
苏尹岚
b121695eef Merge remote-tracking branch 'origin/mark' into su 2020-01-08 10:45:36 +08:00
苏尹岚
68494268ce Accept Merge Request #130: (yonghui -> mark)
Merge Request: 根据skuid部分关注
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/130
2020-01-08 10:43:01 +08:00
苏尹岚
a3e4503081 根据skuid部分关注 2020-01-08 10:42:34 +08:00
苏尹岚
256c00d31b Accept Merge Request #129: (yonghui -> mark)
Merge Request: 根据skuid 部分关注
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/129
2020-01-08 10:41:14 +08:00
gazebo
9c6b27ed56 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2020-01-08 10:39:19 +08:00
苏尹岚
82eb16ba66 商品部分关注 2020-01-08 10:39:16 +08:00
gazebo
b92cff3338 !token改为7部分 2020-01-08 10:38:55 +08:00
gazebo
4a51bfca9b +StoresOrderSaleInfo.DistanceFreightMoney, WaybillTipMoney 2020-01-08 10:38:08 +08:00
苏尹岚
d7ae6eb9a2 屏蔽接口 2020-01-08 10:30:03 +08:00
苏尹岚
296d877d55 批量关注修改 2020-01-08 10:20:50 +08:00
苏尹岚
48d8b3f772 Merge remote-tracking branch 'origin/mark' into su 2020-01-08 10:03:19 +08:00
苏尹岚
b22d880bde 同步错误 2020-01-08 10:02:56 +08:00
苏尹岚
5fed851b8d 修改索引 2020-01-08 09:47:09 +08:00
苏尹岚
f5e8860b0a 删除事务,修改索引 2020-01-08 09:46:05 +08:00
苏尹岚
743238b9ec 查询修改 2020-01-08 09:28:45 +08:00
苏尹岚
f7d89c8fe3 查询优化 2020-01-08 09:25:08 +08:00
苏尹岚
aa84f7ae31 根据skuID部分关注 2020-01-08 09:15:20 +08:00
苏尹岚
dc700da08d Merge remote-tracking branch 'origin/mark' into yonghui 2020-01-08 09:09:53 +08:00
苏尹岚
4f4e6698e7 tongbu 2020-01-08 09:09:32 +08:00
gazebo
a47f7cd845 CreateAct.OverlapRulep 2020-01-07 18:30:31 +08:00
苏尹岚
8429a1e68a Merge remote-tracking branch 'origin/mark' into su 2020-01-07 18:26:12 +08:00
苏尹岚
28c75def4e 同步错误 2020-01-07 18:26:01 +08:00
苏尹岚
c6c2febfd1 同步错误 2020-01-07 18:19:14 +08:00
苏尹岚
e53df61baa 同步错误返回 2020-01-07 18:02:14 +08:00
苏尹岚
86e783a4d0 错误返回 2020-01-07 17:53:56 +08:00
gazebo
7183d58554 up 2020-01-07 15:21:52 +08:00
gazebo
a69b5b3772 +Act.OverlapRule 2020-01-07 15:17:08 +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
gazebo
26ca0bc01d 京西商城订单暂时不支持付款后取消 2020-01-07 14:29:29 +08:00
苏尹岚
6c935643ae 同步错误 2020-01-07 14:25:39 +08:00
苏尹岚
540209eadc 同步错误 2020-01-07 14:20:56 +08:00
gazebo
5ad41fe621 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2020-01-07 13:38:35 +08:00
gazebo
8f8a8d304f BuyerCancelOrder 2020-01-07 13:36:08 +08:00
苏尹岚
386e6df25a Merge remote-tracking branch 'origin/mark' into su 2020-01-07 11:04:54 +08:00
苏尹岚
a0d833d4ae 操作日志 2020-01-07 11:03:07 +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