liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,690 Commits 4 Branches 0 Tags
774b0a8965fa7e2d5b846bcebe9c69fa2f8c398e
Commit Graph

683 Commits

Author SHA1 Message Date
gazebo
8440c6dca5 - 门店商品相关表中去除饿了么的字段 2019-08-14 14:49:12 +08:00
gazebo
c63c43a92b - 准备处理平台价格字段 2019-08-14 14:08:41 +08:00
gazebo
d3ed741016 - up 2019-08-14 13:57:12 +08:00
gazebo
bc6a5e9400 - 同步门店商品时，处理多门店平台SyncFlagModifiedMask标识的情况 2019-08-14 13:54:37 +08:00
gazebo
5cd07db4bb Merge branch 'mark' of git.coding.net:XJH-Rosy/jx-callback into mark 2019-08-14 11:32:39 +08:00
gazebo
f788eec5c1 - GetUsers支持分页 2019-08-14 11:32:20 +08:00
Rosy-zhudan
80a82ea3a4 优化京西和平台商品差异对比的代码结构 2019-08-14 11:28:38 +08:00
gazebo
4c484a6280 - 去除无用代码，主要是promotion相关的 2019-08-14 11:12:33 +08:00
gazebo
03e23ca0fd - 修复之前将老平台同步逻辑注释掉引入的BUG 2019-08-14 00:20:35 +08:00
gazebo
18ad339e0c - AddStoreVendorMap同步失败后回滚本地数据 2019-08-13 19:56:06 +08:00
gazebo
1829156fba - 将老平台同步逻辑注释掉 2019-08-13 18:09:12 +08:00
gazebo
e2867d6f67 Merge remote-tracking branch 'origin/don' into mark 2019-08-13 15:18:52 +08:00
gazebo
567046a238 - 在beta上启用EnableWXAuth2 2019-08-13 15:12:30 +08:00
Rosy-zhudan
06594330a5 不比较待创建且不可售的，京西有平台没有的商品 2019-08-13 14:53:14 +08:00
Rosy-zhudan
90f6b8b82b 关闭写文件 2019-08-12 18:23:32 +08:00
Rosy-zhudan
71bb175e45 增加两列（待创建，待删除），不比较待创建且不可售的京西商品 2019-08-12 18:18:03 +08:00
gazebo
339b60c374 + EnableWXAuth2 2019-08-12 17:54:00 +08:00
gazebo
4ec85bbb73 - RegisterUser在已经找到相应手机号用户的情况下，返回正式登录信息 2019-08-12 10:59:01 +08:00
gazebo
15d270b075 - 同步商品库已下架商品时，设置删除日期 2019-08-10 08:18:07 +08:00
gazebo
28124c18d4 - 晚上定时同步时强制同步价格与可售状态 2019-08-09 18:35:29 +08:00
Nathan drake
2b530faaf6 Accept Merge Request #30: (don -> mark) 
Merge Request: 过滤已经同步过商品的门店，增加京西平台商品的同步状态列
Created By: @Nathan drake
Accepted By: @Nathan drake
URL: https://dev.tencent.com/u/XJH-Rosy/p/jx-callback/git/merge/30
 2019-08-09 18:16:15 +08:00
Rosy-zhudan
32bd34e5c9 过滤已经同步过商品的门店，增加京西平台商品的同步状态列 2019-08-09 15:07:00 +08:00
gazebo
1f02ad823c Merge branch 'mark' of git.coding.net:XJH-Rosy/jx-callback into mark 2019-08-09 14:48:18 +08:00
gazebo
8a812e214b - GetStoresSkus必须指定storeIDs或skuIDs或分页 2019-08-09 14:47:59 +08:00
gazebo
87f69c553f - 暂不支持删除银行 2019-08-09 13:47:39 +08:00
XJH-Rosy
905928725a Accept Merge Request #29: (don -> mark) 
Merge Request: 修改一些BUG，代码重构
Created By: @Nathan drake
Accepted By: @XJH-Rosy
URL: https://coding.net/u/XJH-Rosy/p/jx-callback/git/merge/29
 2019-08-09 13:42:15 +08:00
Rosy-zhudan
8be5e69016 修改一些BUG，代码重构 2019-08-09 12:03:20 +08:00
gazebo
6f403e909f - 修复GetStores中没有限制new_config未删除的bug 2019-08-09 11:59:38 +08:00
gazebo
edff61d85c - GetStores中GROUP BY与字段不匹配的BUG修改 2019-08-09 11:15:44 +08:00
Rosy-zhudan
748a530108 ctx外部传参 2019-08-09 08:55:54 +08:00
XJH-Rosy
a06c4d471f Accept Merge Request #27: (don -> mark) 
Merge Request: 设置一些函数的父任务
Created By: @Nathan drake
Accepted By: @XJH-Rosy
URL: https://coding.net/u/XJH-Rosy/p/jx-callback/git/merge/27
 2019-08-08 18:13:28 +08:00
Rosy-zhudan
bd826a2b69 设置一些函数的父任务 2019-08-08 18:08:21 +08:00
XJH-Rosy
6def20bc4e Accept Merge Request #26: (don -> mark) 
Merge Request: 重构京西和平台商品对比的代码
Created By: @Nathan drake
Accepted By: @XJH-Rosy
URL: https://coding.net/u/XJH-Rosy/p/jx-callback/git/merge/26
 2019-08-08 17:59:28 +08:00
Rosy-zhudan
bc896e98e5 并发任务加入到管理 2019-08-08 17:56:45 +08:00
gazebo
b51614946f - 重构authz结构 
- 角色管理初版完成
 2019-08-08 17:06:58 +08:00
Rosy-zhudan
fcb04c7f52 使用当前已有的平台名字定义 2019-08-08 16:42:57 +08:00
Rosy-zhudan
e378affcf1 重构代码 2019-08-08 16:20:19 +08:00
gazebo
60f3ec9c3b + Store添加MarketManRole与OperatorRole 
- GetStoreListByMobileOrStoreIDs支持按Store.MarketManRole与OperatorRole来得到门店列表
 2019-08-08 15:46:32 +08:00
gazebo
03dd787375 - up 2019-08-08 15:12:11 +08:00
XJH-Rosy
50c5a52d6b Accept Merge Request #25: (don -> mark) 
Merge Request: 修改库存刷新机制-美团和饿百分时刷新
Created By: @Nathan drake
Accepted By: @XJH-Rosy
URL: https://coding.net/u/XJH-Rosy/p/jx-callback/git/merge/25
 2019-08-08 15:06:51 +08:00
gazebo
17b91e4ee7 - 根据已经部分关注的商品，得到已经存在的门店商品单价 2019-08-08 14:57:26 +08:00
Rosy-zhudan
df40806734 去掉注释代码 2019-08-08 09:26:55 +08:00
Rosy-zhudan
4facbdbbfd Merge remote-tracking branch 'origin/mark' into don 2019-08-08 09:14:21 +08:00
gazebo
fb7c59b38e - SyncFlagSpecMask从32改为64 
- 添加SyncFlagStockMask为32
- 修复新关注商品在同步至多门店平台时，同步出错时可能的清同步标识不正确的问题
 2019-08-07 23:48:39 +08:00
gazebo
3639a1c7cb - 角色管理初版 2019-08-07 18:16:44 +08:00
gazebo
059be1befd - 修复同步逻辑中，多门店平台关注商品时同步的BUG（需要同时改可售，价格信息） 2019-08-07 16:39:21 +08:00
Rosy-zhudan
fdd6d0f462 解决冲突，合并提交 2019-08-07 15:24:35 +08:00
Rosy-zhudan
e64e0cc4fb 给数据加锁 2019-08-07 15:18:10 +08:00
gazebo
8768fe8236 - FreeBatchStoreSkuInfo与FreeBatchStoreSkuSyncInfo添加任务名 2019-08-07 14:15:30 +08:00
gazebo
b1209a954b - 修改门店状态同步逻辑，只有在京西本地修改过门店状态相关的信息后才同步 2019-08-07 09:52:35 +08:00