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 |
|
Rosy-zhudan
|
895ad8b4f6
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-09-12 08:40:59 +08:00 |
|
Rosy-zhudan
|
ad2acc3a7e
|
修改时间
|
2019-09-12 08:40:25 +08:00 |
|
gazebo
|
9345f12738
|
- beta启动时自动运行netspider.GetAndStoreCitiesShops
|
2019-09-11 21:44:06 +08:00 |
|
gazebo
|
88f55a1234
|
- checkConfig
|
2019-09-11 17:58:09 +08:00 |
|
gazebo
|
435b4397d6
|
- 门店状态报警提示修改
|
2019-09-11 17:42:26 +08:00 |
|
Rosy-zhudan
|
8378b832a3
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-09-11 17:38:54 +08:00 |
|
gazebo
|
30a7c1dbe2
|
- 门店状态报警提示修改
|
2019-09-11 17:37:57 +08:00 |
|
Rosy-zhudan
|
8a955013d9
|
门店评分-优化
|
2019-09-11 17:37:27 +08:00 |
|
gazebo
|
eab614a734
|
+ RegisterPurchaseOrderHandler（为了适应加入的京西自营商城）
|
2019-09-11 15:10:32 +08:00 |
|
Rosy-zhudan
|
bfaea1b998
|
门店评分并发修改
|
2019-09-11 14:49:59 +08:00 |
|
gazebo
|
86fc32cf2e
|
+ GetRolesUserList
|
2019-09-11 11:04:29 +08:00 |
|
Rosy-zhudan
|
f62268821e
|
门店配送面积计算(根据经纬度计算多边形球面积-凸多边形和凹多边形)
|
2019-09-11 10:15:28 +08:00 |
|
Rosy-zhudan
|
40586e19a6
|
增加StoreScoreEx结构来获取门店名字,去掉表中的字段StoreName
|
2019-09-10 15:42:26 +08:00 |
|
gazebo
|
cc750af2ca
|
- 修复SendAlarmVendorSnapshot调用GetUsers时，防止roleUserIDList为空的bug
|
2019-09-10 15:22:15 +08:00 |
|
gazebo
|
fb8732c94c
|
- 门店状态变化添加发送微信通知消息
|
2019-09-10 11:23:39 +08:00 |
|
Rosy-zhudan
|
69c57c6520
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-09-10 08:49:35 +08:00 |
|
Rosy-zhudan
|
46f31a7136
|
门店评分修改
|
2019-09-10 08:48:58 +08:00 |
|
gazebo
|
7dd0da9f97
|
- 不支持添加系统参数
|
2019-09-09 18:00:47 +08:00 |
|
gazebo
|
5f2415c8a5
|
- PruneMissingStoreSkus中改用NewParallelTask
|
2019-09-09 17:40:08 +08:00 |
|
gazebo
|
cf6bd1d5ea
|
- SyncStoresCategory中改为并行任务
|
2019-09-09 17:29:25 +08:00 |
|
gazebo
|
13c9bb76d4
|
- PruneMissingStoreSkus的bug
|
2019-09-09 17:07:17 +08:00 |
|
gazebo
|
910e351c00
|
- PruneMissingStoreSkus也会删除本地不存在的远程分类
|
2019-09-09 17:03:01 +08:00 |
|