Commit Graph

1819 Commits

Author SHA1 Message Date
苏尹岚
7bc490c7e8 根据skuid关注商品 2020-01-09 15:14:15 +08:00
苏尹岚
8f78abc97d 冲突处理 2020-01-09 14:45:51 +08:00
苏尹岚
20fc83000e 改规格->改价 2020-01-09 14:42:39 +08:00
gazebo
580b3c735f dao.QueryActs改参数skuID为skuIDs 2020-01-09 14:15:07 +08:00
gazebo
59d21cce7f updateStoresSkusWithoutSync 2020-01-09 12:01:54 +08:00
苏尹岚
da3c177e54 build失败处理 2020-01-09 11:00:10 +08:00
苏尹岚
cda6d91dae Merge remote-tracking branch 'origin/mark' into yonghui 2020-01-09 10:32:28 +08:00
gazebo
506eb7c929 dao.GetStoreSkus和dao.GetFullStoreSkus忽略sku与skuName的状态检查 2020-01-09 10:13:19 +08:00
苏尹岚
8f7e1fd1bb 操作日志 2020-01-09 08:31:44 +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
苏尹岚
e5db4f27b1 操作日志 2020-01-08 14:26:31 +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
苏尹岚
296d877d55 批量关注修改 2020-01-08 10:20:50 +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
gazebo
a69b5b3772 +Act.OverlapRule 2020-01-07 15:17:08 +08:00
苏尹岚
a0d833d4ae 操作日志 2020-01-07 11:03:07 +08:00
苏尹岚
103bce68ba 差评补款 2020-01-06 18:25:14 +08:00
苏尹岚
e4b8d1da21 Merge remote-tracking branch 'origin/mark' into yonghui 2020-01-06 17:47:03 +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
苏尹岚
ff0a3b3a02 显示中位价 2020-01-06 14:26:00 +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
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
苏尹岚
36a46455ce 价格统计 2020-01-06 08:51:24 +08:00
苏尹岚
c616808290 Merge remote-tracking branch 'origin/mark' into yonghui 2020-01-03 10:54:36 +08:00
苏尹岚
22b8f16701 价格统计 2020-01-03 10:54:31 +08:00
gazebo
2f6a983dcd checkActUpdate 2020-01-03 09:00:43 +08:00
gazebo
11eed26443 删除旧的活动规则校验 2020-01-02 18:38:06 +08:00
gazebo
22959ce4ad 修改活动校验规则 2020-01-02 18:28:01 +08:00