Commit Graph

4460 Commits

Author SHA1 Message Date
苏尹岚
279e71a2ea 同步错误返回修改:从task中获取failedList才返回新的同步错 2020-01-10 14:38:25 +08:00
苏尹岚
c6f3e49be8 同步统一返回错误增加判断(尝试) 2020-01-10 14:32:09 +08:00
苏尹岚
d520cfe4bc 同步错误返回,新增同步错误类型,修改错误返回判断条件 2020-01-10 14:00:55 +08:00
苏尹岚
e430c8ae59 同步错误返回 2020-01-09 17:53:13 +08:00
苏尹岚
08be46ca02 同步错误 2020-01-09 17:44:28 +08:00
苏尹岚
2b872e34cd 同步错误 2020-01-09 15:41:00 +08:00
苏尹岚
b4a2970c5b 同步错误 2020-01-09 14:57:24 +08:00
苏尹岚
e6c59c4850 同步错误返回 2020-01-09 14:02:32 +08:00
苏尹岚
77e4fb078f 同步错误返回 2020-01-09 08:50:23 +08:00
苏尹岚
70376fb6e7 冲突处理 2020-01-09 08:46:26 +08:00
gazebo
27e13ecb99 fk 2020-01-08 18:40:39 +08:00
gazebo
ce41890da7 alipayAppID 2020-01-08 18:36:55 +08:00
gazebo
3ea689951b updateStoresSkusWithoutSync中改价是判断价格是否一致 2020-01-08 18:32:29 +08:00
苏尹岚
fbabc83524 Accept Merge Request #131: (yonghui -> mark)
Merge Request: 增加同步返回错误
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/131
2020-01-08 18:09:56 +08:00
苏尹岚
7101582522 增加同步错误 2020-01-08 18:09:04 +08:00
gazebo
c196e7aab9 添加支付宝登录方式:alipaycode 2020-01-08 18:06:53 +08:00
苏尹岚
19ab93ab1e 同步错误 2020-01-08 16:07:36 +08:00
苏尹岚
90513226e9 同步错误 2020-01-08 15:50:55 +08:00
苏尹岚
2b3d7ce83a 同步错误 2020-01-08 15:35:53 +08:00
苏尹岚
74e52a0d94 Merge remote-tracking branch 'origin/mark' into su 2020-01-08 14:41:06 +08:00
苏尹岚
e5db4f27b1 操作日志 2020-01-08 14:26:31 +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