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

2686 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Nathan drake
8dbeba87a1 Accept Merge Request #34: (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/34
 2019-08-14 11:32:10 +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
667e27d62e - up 2019-08-14 10:32:15 +08:00
gazebo
37ade34458 - getOrders中优化对时间字符的解析处理 2019-08-14 10:15:28 +08:00
gazebo
c48ebb4bd7 - GetOrders容错 2019-08-14 10:04:54 +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
f8a5e1bc8d - SyncFlagStoreSkuOnlyMask去掉SyncFlagStockMask 2019-08-13 18:34:03 +08:00
gazebo
1829156fba - 将老平台同步逻辑注释掉 2019-08-13 18:09:12 +08:00
gazebo
ad0c8eb3c0 + api_config.go 2019-08-13 17:57:03 +08:00
gazebo
ff3cd0fa1b - GetRoleUserList中忽略ERR_NAME_NOT_FOUND错 2019-08-13 16:40:40 +08:00
gazebo
05e6dbe6e1 - casbin model文件移到conf下 2019-08-13 16:27:48 +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
gazebo
d4270bf8c3 - auth2也支持多小程序登录 2019-08-13 11:50:33 +08:00
gazebo
cd84cbdfd2 - auth2与auth在小程序登录成功后，如有必要刷新openID 2019-08-13 11:23:36 +08:00
gazebo
d59ca265c4 - IAuther.UnbindAuth的接口改为userID 2019-08-13 11:02:14 +08:00
gazebo
37b931abe5 + OrderSkuFinancial.StoreSubID, StoreSubName 2019-08-13 10:27:29 +08:00
gazebo
91efe965d1 Merge branch 'mark' of git.coding.net:XJH-Rosy/jx-callback into mark 2019-08-13 09:35:29 +08:00
gazebo
55ab58df0f - 修复SaveOrderFinancialInfo中误删售后单的BUG 2019-08-13 09:34:51 +08:00
Rosy-zhudan
505dc40559 ctx传参 2019-08-13 09:17:50 +08:00
Nathan drake
262cc9d4f3 Accept Merge Request #31: (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/31
 2019-08-12 18:28:51 +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
6a8e3cb4b0 - 去除auth.localpass（已经移到auth2.localpass） 2019-08-12 17:56:50 +08:00
gazebo
339b60c374 + EnableWXAuth2 2019-08-12 17:54:00 +08:00
gazebo
c5a5f4777b - AdjustOrder与PartRefundOrder中，为了区别活动与非活动SKU，需转入SubStoreID（即单品的活动ID）区分 2019-08-12 17:17:12 +08:00
gazebo
20362a4efe - auth中不管验证码是否发送失败都保存在cache中 2019-08-12 15:03:47 +08:00
gazebo
342be58814 - 修复多小程序支持的BUG，从referer中得到小程序ID信息 2019-08-12 14:42:55 +08:00
gazebo
9ab43f291e - 新旧小程序兼容BUG修复 2019-08-12 14:15:11 +08:00
gazebo
4ec85bbb73 - RegisterUser在已经找到相应手机号用户的情况下，返回正式登录信息 2019-08-12 10:59:01 +08:00
gazebo
d90bc3cb11 - 兼容一个新的微信小程序 2019-08-12 10:49:35 +08:00
gazebo
fb2d8734f9 - 尝试处理京东售后SKU是非正品的情况 2019-08-11 18:21:40 +08:00
gazebo
a8115479eb - 调整每晚同步时间至8:30 2019-08-10 08:43:43 +08:00
gazebo
15d270b075 - 同步商品库已下架商品时，设置删除日期 2019-08-10 08:18:07 +08:00
gazebo
28124c18d4 - 晚上定时同步时强制同步价格与可售状态 2019-08-09 18:35:29 +08:00
gazebo
64a4ceda62 Merge branch 'mark' of git.coding.net:XJH-Rosy/jx-callback into mark 2019-08-09 18:18:19 +08:00
gazebo
1111a70277 - 不过滤饿百目录名 2019-08-09 18:17:57 +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