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

2665 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
gazebo
6f403e909f - 修复GetStores中没有限制new_config未删除的bug 2019-08-09 11:59:38 +08:00
gazebo
8c6ed7949b - DeleteSkusFromAct排除结算类型 2019-08-09 11:30:15 +08:00
gazebo
d8f3b7f467 - 活动商品后台分页,GetActStoreSkuInfo分页，添加keyword 2019-08-09 11:19:43 +08:00
gazebo
edff61d85c - GetStores中GROUP BY与字段不匹配的BUG修改 2019-08-09 11:15:44 +08:00
gazebo
304f3fe86e - 启用DeleteSkusFromAct 2019-08-09 10:01:23 +08:00
gazebo
0e45ae3151 - up 2019-08-09 09:54:51 +08:00
gazebo
4d1c5a6704 - 调试DeleteSkusFromAct 2019-08-09 09:48:01 +08:00
gazebo
57b68f3155 - up 2019-08-09 09:38:28 +08:00
gazebo
cf9ecaa3a9 Merge branch 'auth2' into mark 2019-08-09 09:33:27 +08:00
gazebo
7b652ed47c Merge branch 'mark' of git.coding.net:XJH-Rosy/jx-callback into mark 2019-08-09 09:33:18 +08:00
gazebo
35e06e8c94 + DeleteSkusFromAct 2019-08-09 09:33:01 +08:00
XJH-Rosy
721e78948f Accept Merge Request #28: (don -> mark) 
Merge Request: ctx外部传参
Created By: @Nathan drake
Accepted By: @XJH-Rosy
URL: https://coding.net/u/XJH-Rosy/p/jx-callback/git/merge/28
 2019-08-09 08:58:45 +08:00
Rosy-zhudan
748a530108 ctx外部传参 2019-08-09 08:55:54 +08:00
gazebo
3541fada72 - fk 2019-08-08 22:42:46 +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
b163fe4d5d Merge branch 'mark' into auth2 2019-08-08 17:52:47 +08:00
gazebo
3c39a2df22 - RefreshDingDingToken在beta上打开 2019-08-08 17:52:07 +08:00
gazebo
af88e9c52e - ren AuthInfo.ExpiresIn to ExpiresAt 
- 将auth2中不是小驼峰的全部修改
 2019-08-08 17:14:45 +08:00