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

2872 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
gazebo
7ca4429e43 - remove globals.ReallyReplyComment 2019-09-02 16:53:22 +08:00
gazebo
e4f1812337 - 绑定认证方式前，先删除可能的相同的认证方式 2019-09-02 14:53:18 +08:00
gazebo
c0c79c368d - 用户已经存在，自动继承时，正确更新当前认证方式 2019-09-02 14:27:34 +08:00
gazebo
f0d8582b12 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-09-02 14:04:48 +08:00
gazebo
3d21ffaf11 - 禁用auth1. 2019-09-02 14:04:27 +08:00
zhudan
6c8ab5cc6c Accept Merge Request #2: (don -> mark) 
Merge Request: 优化重排序商品
Created By: @zhudan
Accepted By: @zhudan
URL: https://rosydev.coding.net/p/jx-callback/git/merge/2
 2019-09-02 11:21:01 +08:00
Rosy-zhudan
b12d7dad77 优化重排序商品 2019-09-02 11:13:46 +08:00
gazebo
de6c5de6df - SkuCategoryMap 2019-09-02 10:42:38 +08:00
zhudan
a32c805785 Accept Merge Request #1: (don -> mark) 
Merge Request: 打开刷新假开店开关
Created By: @zhudan
Accepted By: @zhudan
URL: https://rosydev.coding.net/p/jx-callback/git/merge/1
 2019-09-02 10:23:45 +08:00
gazebo
9307114a7a + sync2.go 2019-09-02 09:31:26 +08:00
Rosy-zhudan
bb7a2ce37b 打开刷新假开店开关 2019-09-02 08:58:58 +08:00
gazebo
16e9e02e94 - getOrders的keyword搜索vendor_order_id2 2019-09-01 17:29:30 +08:00
gazebo
0331e704e0 + IPurchasePlatformHandler.UpdateStoreCustomID 
- 删除平台门店时，将平台门店的CUSTOMID设置为其平台ID本身
- 饿了么与微商城handler不注册了
 2019-09-01 15:27:06 +08:00
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