Rosy-zhudan
|
e0bbfa0150
|
商品子分类下商品的重排序
|
2019-08-30 08:58:37 +08:00 |
|
gazebo
|
bfa6ca2b9e
|
- CaculateSkuEarningPrice支持四舍五入
|
2019-08-29 17:47:50 +08:00 |
|
gazebo
|
53a9a78b1d
|
Merge branch 'mark' of git.coding.net:XJH-Rosy/jx-callback into mark
|
2019-08-29 17:32:13 +08:00 |
|
gazebo
|
21b66cc482
|
- updateOrderSkuOtherInfo中固化订单商品的EarningPrice
|
2019-08-29 17:31:21 +08:00 |
|
XJH-Rosy
|
24c25246a9
|
Accept Merge Request #40: (don -> mark)
Merge Request: 生成Base64格式的二维码/条形码
Created By: @Nathan drake
Accepted By: @XJH-Rosy
URL: https://coding.net/u/XJH-Rosy/p/jx-callback/git/merge/40
|
2019-08-29 16:18:53 +08:00 |
|
Rosy-zhudan
|
1ea9c5aca2
|
修正和重构代码
|
2019-08-29 16:05:29 +08:00 |
|
Rosy-zhudan
|
21c1c3c514
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-08-29 15:20:17 +08:00 |
|
Rosy-zhudan
|
f2d049bdef
|
修正错误
|
2019-08-29 15:19:43 +08:00 |
|
gazebo
|
81ae87f5a5
|
- 优化GetStoreSkus2中的SQL（强制转换vendor_category_id至字符串以使用索引）
|
2019-08-29 15:13:36 +08:00 |
|
Rosy-zhudan
|
511a0b02e9
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-08-29 14:49:09 +08:00 |
|
Rosy-zhudan
|
ebfc3c3a9a
|
生成Base64格式的二维码/条形码
|
2019-08-29 14:48:13 +08:00 |
|
gazebo
|
ce5fc2ef9d
|
- 优化AddCreateFlagForJxStoreSku
|
2019-08-29 14:04:26 +08:00 |
|
gazebo
|
ce53d17461
|
- UnmanageTasks中添加GC
|
2019-08-29 12:02:10 +08:00 |
|
Rosy-zhudan
|
82d22c08e6
|
二维码/条形码的生成
|
2019-08-29 11:54:48 +08:00 |
|
Rosy-zhudan
|
71f918568c
|
二维码/条形码的生成
|
2019-08-29 11:54:21 +08:00 |
|
gazebo
|
701da73a6e
|
- BaseTask.GetResult中成功返回结果后，结果在任务中会被删除（以免被管理的任务不必要的HOLD住对象）
|
2019-08-29 11:23:17 +08:00 |
|
gazebo
|
6c805edf92
|
- tasksch中，任务完成后要将worker置空，否则被管理的任务的worker会hold住大量对象
|
2019-08-29 11:19:54 +08:00 |
|
gazebo
|
4ad77227d6
|
- fk
|
2019-08-29 10:39:40 +08:00 |
|
gazebo
|
f25beafb9e
|
- fk
|
2019-08-29 10:13:36 +08:00 |
|
gazebo
|
4e09e36cff
|
+ SkuCategoryMap
|
2019-08-29 08:39:58 +08:00 |
|
Rosy-zhudan
|
acd94aa5d3
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-08-29 08:37:58 +08:00 |
|
Rosy-zhudan
|
b482867bc2
|
回退代码
|
2019-08-29 08:37:02 +08:00 |
|
gazebo
|
ab8b25e60a
|
- 去掉秒杀，直降折扣限制
|
2019-08-28 18:44:51 +08:00 |
|
Rosy-zhudan
|
77da618442
|
测试
|
2019-08-28 18:32:16 +08:00 |
|
gazebo
|
d0fd45e751
|
- 优化AmendMissingOrders
|
2019-08-28 18:08:41 +08:00 |
|
Rosy-zhudan
|
e5e6c45e7a
|
测试-饿百拉取平台商品-协程改为FOR循环
|
2019-08-28 18:07:05 +08:00 |
|
gazebo
|
7cb6708165
|
- 老TOKEN调用user2/GetMyStoreList时，返回TOKEN无效或过期错，要求重新登录
|
2019-08-28 16:50:00 +08:00 |
|
gazebo
|
9e6a0148f8
|
- 修复updateStoreSkusSaleWithoutSync中的bug
|
2019-08-28 16:43:30 +08:00 |
|
gazebo
|
07edb6a495
|
- GetMobileAndUserID中对于V1的TOKEN，也尝试返回user2的ID
|
2019-08-28 16:23:59 +08:00 |
|
gazebo
|
538b3162a2
|
+ IMultipleStoresHandler.GetAllCategories
|
2019-08-28 15:36:51 +08:00 |
|
gazebo
|
cf4202a41b
|
- 京东handler不直接依赖api.JdAPI
|
2019-08-28 14:25:29 +08:00 |
|
gazebo
|
da6fdd4c8e
|
- BindMiniProgram成功后调用TransferLegacyWeixins
|
2019-08-28 13:54:49 +08:00 |
|
gazebo
|
3cf3c9ddfe
|
+ apimanager
|
2019-08-28 11:41:04 +08:00 |
|
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 |
|
Rosy-zhudan
|
2929d18bd4
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-08-28 08:24:25 +08:00 |
|
gazebo
|
3f69f94cbb
|
- 平台多账号相关
|
2019-08-27 18:45:58 +08:00 |
|
Rosy-zhudan
|
09298ad560
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-08-27 18:13:52 +08:00 |
|
Rosy-zhudan
|
a4de571a19
|
手动释放局部变量内存
|
2019-08-27 18:10:35 +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 |
|