gazebo
|
51727df4de
|
- RebindAllPrinters中改用NewParallelTask
|
2019-09-01 10:06:28 +08:00 |
|
gazebo
|
bb69051742
|
- 修复将易联云token中的ExpireIn处理错误（没有当成秒）
|
2019-08-31 11:26:50 +08:00 |
|
gazebo
|
4a700fc476
|
- 处理京东查询证照返回的有效期非法的情况
|
2019-08-30 19:01:54 +08:00 |
|
gazebo
|
f74901739c
|
- GetSkuNames返回Sku.Seq
|
2019-08-30 18:56:48 +08:00 |
|
gazebo
|
5e0f93a1c8
|
- 展示门店商品时，在分类下，按Sku.Seq排序
|
2019-08-30 18:41:44 +08:00 |
|
gazebo
|
3e7b07fc9e
|
- UpdateSkuName中的delete几个改为小驼峰
|
2019-08-30 18:16:38 +08:00 |
|
XJH-Rosy
|
8f8dc30333
|
Accept Merge Request #41: (don -> mark)
Merge Request: 商品子分类下商品的重排序
Created By: @Nathan drake
Accepted By: @XJH-Rosy
URL: https://coding.net/u/XJH-Rosy/p/jx-callback/git/merge/41
|
2019-08-30 18:13:11 +08:00 |
|
Rosy-zhudan
|
b9ec8067ac
|
修改问题
|
2019-08-30 16:59:46 +08:00 |
|
Rosy-zhudan
|
02bb89d67d
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-08-30 16:01:12 +08:00 |
|
Rosy-zhudan
|
c8c09640dc
|
去掉seq
|
2019-08-30 16:00:44 +08:00 |
|
gazebo
|
03296d1a99
|
- dao.GetSkuByCats中，要判断sku_name是否被删除了
|
2019-08-30 15:56:43 +08:00 |
|
Rosy-zhudan
|
a7270ccd84
|
修改各处商品查询加入Seq排序字段
|
2019-08-30 15:08:44 +08:00 |
|
Rosy-zhudan
|
de91ac4a20
|
“测试优化
|
2019-08-30 14:09:50 +08:00 |
|
gazebo
|
d428a0334a
|
- 注释掉价格审核相关的一些代码
|
2019-08-30 14:07:25 +08:00 |
|
Rosy-zhudan
|
8ec7239b1d
|
优化速度
|
2019-08-30 13:42:10 +08:00 |
|
Rosy-zhudan
|
a1086344ca
|
优化速度
|
2019-08-30 13:38:42 +08:00 |
|
gazebo
|
46527e139e
|
- enablePendingChange = false
|
2019-08-30 12:21:48 +08:00 |
|
gazebo
|
0b899d612f
|
- UpdateStoresSkus中添加调试信息
|
2019-08-30 12:09:27 +08:00 |
|
gazebo
|
7afd15cf0e
|
- 优化dao.GenQuestionMarks
|
2019-08-30 09:54:23 +08:00 |
|
Rosy-zhudan
|
088d83417f
|
删除更新SKU商品数据时的seq字段
|
2019-08-30 09:20:36 +08:00 |
|
Rosy-zhudan
|
e0bbfa0150
|
商品子分类下商品的重排序
|
2019-08-30 08:58:37 +08:00 |
|
gazebo
|
27adff6add
|
- ParallelTask结束后，清除subFinishChan与taskChan
|
2019-08-30 08:50:07 +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 |
|