gazebo
|
3f459a5e10
|
- 防止重复发送订单取消通知消息
|
2019-09-21 17:01:41 +08:00 |
|
gazebo
|
4fe91cfdcb
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-09-20 16:31:45 +08:00 |
|
gazebo
|
f60554f514
|
- 监控平台门店状态时，如果平台门店是自动接单的，改为非自动接单
|
2019-09-20 16:30:57 +08:00 |
|
Rosy-zhudan
|
7216cfd911
|
合并修改
|
2019-09-20 16:14:56 +08:00 |
|
Rosy-zhudan
|
ea0358f00d
|
增加未找到门店的异常捕捉
|
2019-09-20 16:11:08 +08:00 |
|
gazebo
|
b030168e07
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-09-20 15:46:27 +08:00 |
|
gazebo
|
d1d0e576eb
|
- 移除常量字符串'1970-01-01 00:00:00'
|
2019-09-20 15:46:09 +08:00 |
|
xujianhua
|
c5df4f5f5e
|
Accept Merge Request #6: (don -> mark)
Merge Request: 城市商品销量统计
Created By: @zhudan
Accepted By: @xujianhua
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/6
|
2019-09-20 15:25:39 +08:00 |
|
Rosy-zhudan
|
634c9afa6e
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-09-20 11:31:22 +08:00 |
|
Rosy-zhudan
|
62d941d3f7
|
城市商品销量统计-修复问题
|
2019-09-20 11:12:18 +08:00 |
|
gazebo
|
2409b4f323
|
- 每晚8点再同步一次平台门店信息
|
2019-09-20 10:30:45 +08:00 |
|
gazebo
|
aa3bfcd4c2
|
- BatchUpdateEntityByKV中panic时，打印调试信息
|
2019-09-20 09:11:41 +08:00 |
|
Rosy-zhudan
|
201411d325
|
统计商品销量
|
2019-09-19 18:32:12 +08:00 |
|
Rosy-zhudan
|
6d90f5117d
|
处理err
|
2019-09-19 17:43:56 +08:00 |
|
Rosy-zhudan
|
dc53e2e46b
|
城市商品销量统计
|
2019-09-19 16:57:24 +08:00 |
|
gazebo
|
72f9852d42
|
- 去掉调试代码（门店状态报警只发老板）
|
2019-09-19 16:31:24 +08:00 |
|
gazebo
|
a9c7be1027
|
- 微信端改价强制异步
|
2019-09-19 11:20:55 +08:00 |
|
gazebo
|
dbd99797aa
|
- 添加周到测试
|
2019-09-19 10:57:26 +08:00 |
|
gazebo
|
546cb648dd
|
- 添加门店商品修改强制异步（asyncStoreSkuOpFilter）
|
2019-09-19 10:27:51 +08:00 |
|
gazebo
|
103ab3c755
|
- DeleteStoreAllCategories中的任务改为可错误继续的
|
2019-09-19 09:28:46 +08:00 |
|
gazebo
|
e6af1d9ebe
|
- 修复CreateStoreCategoryByStoreSku中误用常量VendorIDMTWM的bug
|
2019-09-18 17:24:02 +08:00 |
|
gazebo
|
d0667a818d
|
- PruneMissingStoreSkus, 因为美团外卖分类当前是用的名字关联的，所以改名后如果没有及时同步，这个函数会导致美团平台的分类被误删
|
2019-09-18 15:15:43 +08:00 |
|
Rosy-zhudan
|
ac95d41f75
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-09-18 09:17:48 +08:00 |
|
Rosy-zhudan
|
0d92a2edd1
|
门店评分-修改bug
|
2019-09-18 09:13:33 +08:00 |
|
gazebo
|
d5b31014ca
|
- 临时禁止同步时平台分类为空的报警
|
2019-09-17 21:16:30 +08:00 |
|
gazebo
|
9a7ab6425f
|
- 活动出错信息返回最终的活动价
|
2019-09-17 18:15:55 +08:00 |
|
zhudan
|
61c52330fd
|
Accept Merge Request #4: (don -> mark)
Merge Request: 门店评分-修改BUG
Created By: @zhudan
Accepted By: @zhudan
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/4
|
2019-09-17 17:03:10 +08:00 |
|
Rosy-zhudan
|
78c238e6c6
|
解决冲突，合并提交
|
2019-09-17 16:37:01 +08:00 |
|
Rosy-zhudan
|
6b1a2f19fc
|
门店评分-修改BUG
|
2019-09-17 16:30:43 +08:00 |
|
gazebo
|
f4b6516b4d
|
+ 添加数据资源操作相关的API
|
2019-09-17 16:02:44 +08:00 |
|
gazebo
|
daa72b7b7d
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-09-17 11:31:07 +08:00 |
|
gazebo
|
b54f86f00c
|
- IsSyncStatusSec fixed to IsSyncStatusSeq
- 修改（或创建）单平台门店商品时，如果没有平台分类ID，报警
|
2019-09-17 11:30:07 +08:00 |
|
xujianhua
|
9c7ae16186
|
Accept Merge Request #3: (don -> mark)
Merge Request: 门店评分
Created By: @zhudan
Accepted By: @xujianhua
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/3
|
2019-09-17 11:12:33 +08:00 |
|
gazebo
|
7bc963c31f
|
- 修复门店报警门店按城市排序的bug
|
2019-09-17 10:47:09 +08:00 |
|
Rosy-zhudan
|
957db04544
|
修改细节
|
2019-09-17 10:32:49 +08:00 |
|
Rosy-zhudan
|
f208fea6a1
|
门店配送范围-修改多边形计算公式
|
2019-09-17 09:26:35 +08:00 |
|
Rosy-zhudan
|
05809c3a50
|
修改
|
2019-09-17 08:41:13 +08:00 |
|
Rosy-zhudan
|
299444ddd5
|
提交
|
2019-09-17 08:31:04 +08:00 |
|
Rosy-zhudan
|
12194ac987
|
修改字段名
|
2019-09-16 17:46:42 +08:00 |
|
Rosy-zhudan
|
e35d86f690
|
修改门店评分细节
|
2019-09-16 16:20:46 +08:00 |
|
gazebo
|
ea58ab6f79
|
- 门店报警信息按城市排序
|
2019-09-16 15:33:29 +08:00 |
|
Rosy-zhudan
|
91b05593e4
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-09-12 17:58:31 +08:00 |
|
Rosy-zhudan
|
00603a0a34
|
门店评分-减少并发数
|
2019-09-12 17:22:02 +08:00 |
|
gazebo
|
54a55dcac0
|
- 活动价保留到到角
|
2019-09-12 16:55:11 +08:00 |
|
Rosy-zhudan
|
f2b4f88573
|
门店评分-减少并发数
|
2019-09-12 16:53:15 +08:00 |
|
Rosy-zhudan
|
dfdcc671f6
|
门店评分-减少并发数
|
2019-09-12 16:30:16 +08:00 |
|
Rosy-zhudan
|
7d194b3b90
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-09-12 15:44:48 +08:00 |
|
Rosy-zhudan
|
6b3b0bcd35
|
门店评分-优化数据读取速度
|
2019-09-12 15:36:39 +08:00 |
|
gazebo
|
e789e17714
|
+ getAllUsers4Store
|
2019-09-12 14:54:28 +08:00 |
|
Rosy-zhudan
|
86d35d58c5
|
门店评分-优化内存
|
2019-09-12 11:42:20 +08:00 |
|