Commit Graph

2802 Commits

Author SHA1 Message Date
gazebo
eaebbd387c - fk 2019-08-28 10:53:01 +08:00
gazebo
5eab792196 - 认证通过且通过手机(或邮箱)能找到用户,在没有相应认证方式的情况下,自动绑定此认证方式 2019-08-28 10:41:51 +08:00
gazebo
4a54ea1ec2 + UnmanageTasks 2019-08-28 09:19:43 +08:00
gazebo
3f69f94cbb - 平台多账号相关 2019-08-27 18:45:58 +08:00
gazebo
c8926056fb - 京东售后枚举调整 2019-08-27 17:11:53 +08:00
gazebo
b52d1ae51e - "您好,近期饿百零售开放平台对订单相关接口中部分字段进行调整,平台将从8月29日起根据门店维度逐步灰度,预计9月底全量。请开发者关注"调整 2019-08-27 16:18:10 +08:00
gazebo
71495be821 - fk 2019-08-27 15:05:09 +08:00
gazebo
11f4468846 - 再次调整TransferLegacyWeixins的调用时机,回到之前几个点都要调用的方式 2019-08-27 14:56:21 +08:00
gazebo
ebb8b8ed44 - RegisterUser中误设置UserTypeBoss 2019-08-27 14:44:10 +08:00
gazebo
af5947288d - 修复TransferLegacyWeixins中删除角色的BUG 2019-08-27 14:36:18 +08:00
gazebo
702713933d - 调整TransferLegacyWeixins的调用时机,只在UnbindMobile与BindMobile2调用 2019-08-27 14:27:58 +08:00
gazebo
e19d5be608 ! 全部启用EnableWXAuth2 2019-08-27 10:13:07 +08:00
gazebo
f2972580d1 + TransferLegacyWeixins 2019-08-27 10:10:43 +08:00
gazebo
645567c7ea Merge branch 'mark' of git.coding.net:XJH-Rosy/jx-callback into mark 2019-08-27 10:01:17 +08:00
gazebo
7dfa59e6e0 - 区分菜市与果园的调试端口 2019-08-27 10:00:40 +08:00
Nathan drake
b25545b9f0 Accept Merge Request #39: (don -> mark)
Merge Request: 测试PPROF
Created By: @Nathan drake
Accepted By: @Nathan drake
URL: https://dev.tencent.com/u/XJH-Rosy/p/jx-callback/git/merge/39
2019-08-27 09:30:09 +08:00
Rosy-zhudan
311f39d5ae 去掉调试代码 2019-08-27 09:18:19 +08:00
Rosy-zhudan
42618f729a Merge remote-tracking branch 'origin/mark' into don 2019-08-27 09:08:47 +08:00
gazebo
e0fdd2055c - 添加pprof启动代码 2019-08-27 09:06:30 +08:00
Rosy-zhudan
fc9e032096 加SLEEP测试 2019-08-27 09:03:35 +08:00
Rosy-zhudan
092281e8bd Merge remote-tracking branch 'origin/mark' into don 2019-08-27 08:29:29 +08:00
gazebo
0eaa99bb62 - GetStores中转换至百度坐标OK 2019-08-26 18:53:12 +08:00
gazebo
b1d7cb8f18 - fk 2019-08-26 18:37:53 +08:00
Rosy-zhudan
73fbb43157 打开调试PPROF 2019-08-26 17:48:50 +08:00
gazebo
139d3fec0f - fk 2019-08-26 17:47:40 +08:00
Rosy-zhudan
69cd849bbd 关闭PPROF 2019-08-26 17:46:15 +08:00
gazebo
ec612b807b - fk 2019-08-26 17:31:56 +08:00
Rosy-zhudan
43ae1c2efa 测试pprof 2019-08-26 17:30:35 +08:00
gazebo
a39a4b7917 - UpdateStore中调用updateCourierStores时的判断逻辑修改 2019-08-26 16:58:08 +08:00
gazebo
7bd415c21f - up 2019-08-26 16:01:12 +08:00
gazebo
20c63e7f59 - auth1与auth2以为是兼容 2019-08-26 15:17:42 +08:00
gazebo
fcc87c34af - TransferLegacyWeixins中采用增量式 2019-08-26 11:44:47 +08:00
Nathan drake
ea97ad1a6c Accept Merge Request #38: (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/38
2019-08-25 10:12:19 +08:00
Rosy-zhudan
949d4e7c8d 重构-开启或结束所有平台商店的额外时间 2019-08-25 10:05:37 +08:00
gazebo
881198d0f1 - GetStores添加provinceCode 2019-08-22 19:19:01 +08:00
gazebo
6b06041140 - 将每晚定时刷的任务拆分成京东与非京东 2019-08-21 22:09:44 +08:00
gazebo
966646f953 - 去掉GetStores的坐标转(转换至百度坐标要百度API,高德不行) 2019-08-21 21:28:23 +08:00
gazebo
2be1c7b71d - GetStores添加参数:startStoreID, coordinateType。返回值添加provinceName省名 2019-08-21 18:21:07 +08:00
gazebo
2769f18ab4 + OperationTime2StrWithSecond 2019-08-21 17:38:06 +08:00
gazebo
cdc5ec75b3 + ScheduleTimerFuncOnce 2019-08-21 17:22:02 +08:00
gazebo
5e94bf4dbd - fk 2019-08-21 16:42:36 +08:00
gazebo
e626d4242f - fk 2019-08-21 16:34:49 +08:00
gazebo
8e284beba0 + StoreMap添加FakeOpenStart和FakeOpenStop 2019-08-21 16:28:57 +08:00
gazebo
c35df3a5a4 - 同步门店商品时,修改商品信息时不改价(以免活动引起的失败),而用单独的改价来改 2019-08-21 15:35:13 +08:00
gazebo
9b8173d0f7 - 修改getGetStoresSkusBaseSQL中查询导常商品的逻辑 2019-08-21 14:17:02 +08:00
gazebo
c0339d245a - 修复GetSingleStoreVendorIDs的bug 2019-08-21 11:53:41 +08:00
gazebo
2ca7e5accc - 处理微商城订单中的SKU没有商家自编码的情况 2019-08-21 11:24:42 +08:00
gazebo
c5f859c92e - auth2添加固定TOKEN 2019-08-21 09:17:28 +08:00
gazebo
bf3e825f11 - SyncStoresSkus2中,当setSyncStatus不为0时,在要处理相应门店时,才设置相应标志(之前是一开始全部设置标志) 2019-08-21 08:34:32 +08:00
XJH-Rosy
360844863c Accept Merge Request #37: (don -> mark)
Merge Request: 把京西有,平台无且没有待创建标记的商品加上待创建标记
Created By: @Nathan drake
Accepted By: @XJH-Rosy
URL: https://coding.net/u/XJH-Rosy/p/jx-callback/git/merge/37
2019-08-20 17:20:28 +08:00