Rosy-zhudan
|
6199a2e714
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-09-17 09:29:46 +08:00 |
|
Rosy-zhudan
|
dbdf04d83c
|
同步修改
|
2019-09-17 09:29:13 +08:00 |
|
Rosy-zhudan
|
f208fea6a1
|
门店配送范围-修改多边形计算公式
|
2019-09-17 09:26:35 +08:00 |
|
gazebo
|
0b923640b7
|
- 饿百的配送异常不应该当成取消来处理，比如：1568651453228834871
|
2019-09-17 09:13:26 +08:00 |
|
Rosy-zhudan
|
05809c3a50
|
修改
|
2019-09-17 08:41:13 +08:00 |
|
Rosy-zhudan
|
299444ddd5
|
提交
|
2019-09-17 08:31:04 +08:00 |
|
gazebo
|
44810b2957
|
+ CalcPolygonAreaAutonavi
|
2019-09-16 20:54:55 +08:00 |
|
gazebo
|
312ce745cc
|
- 菜谱相关
|
2019-09-16 18:40:43 +08:00 |
|
Rosy-zhudan
|
12194ac987
|
修改字段名
|
2019-09-16 17:46:42 +08:00 |
|
Rosy-zhudan
|
f88b273f92
|
修改SQL字段名
|
2019-09-16 17:42:32 +08:00 |
|
Rosy-zhudan
|
e35d86f690
|
修改门店评分细节
|
2019-09-16 16:20:46 +08:00 |
|
gazebo
|
ea58ab6f79
|
- 门店报警信息按城市排序
|
2019-09-16 15:33:29 +08:00 |
|
gazebo
|
0a0c051d50
|
- up
|
2019-09-16 14:16:21 +08:00 |
|
gazebo
|
f6ee092ac2
|
- 饿百商店更新不修改“外卖客服联系电话”，因为有时会报错
|
2019-09-16 10:13:07 +08:00 |
|
Rosy-zhudan
|
22f8d169d0
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-09-16 08:47:20 +08:00 |
|
gazebo
|
5fdbf3a1e1
|
- 修复GetAndStoreCitiesShops中存储最后一个商店出记录已经存在错出的bug
|
2019-09-13 16:14:49 +08:00 |
|
gazebo
|
5eadabd0d8
|
- 订单门店在本地不存在报警
|
2019-09-13 15:31:57 +08:00 |
|
Rosy-zhudan
|
3aa9234b68
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-09-12 18:28:02 +08:00 |
|
gazebo
|
e0418ad25a
|
- 修复GetAndStoreCitiesShops中城市继续的bug（找不到城市的情况）
|
2019-09-12 18:24:12 +08:00 |
|
gazebo
|
9c135ed927
|
- fk
|
2019-09-12 18:18:43 +08:00 |
|
gazebo
|
db8ca7470b
|
- fk
|
2019-09-12 18:13:42 +08:00 |
|
Rosy-zhudan
|
91b05593e4
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-09-12 17:58:31 +08:00 |
|
gazebo
|
3de6498de4
|
+ NewSeqTask2
|
2019-09-12 17:35:43 +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 |
|
gazebo
|
d9ec93d493
|
- 饿百订单的order_index可能为int或string...
|
2019-09-12 16:31:14 +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 |
|
gazebo
|
f791668f5e
|
- 取货失败审核同意后，不更新订单状态为待配送
|
2019-09-12 13:51:51 +08:00 |
|
Rosy-zhudan
|
86d35d58c5
|
门店评分-优化内存
|
2019-09-12 11:42:20 +08:00 |
|
gazebo
|
f3e64ed996
|
- up
|
2019-09-12 10:28:18 +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
|
84b4d400e4
|
- BatchUpdateEntityByKV中不用事务
|
2019-09-11 22:59:19 +08:00 |
|
gazebo
|
5ffeb4142c
|
- fk
|
2019-09-11 21:55:36 +08:00 |
|
gazebo
|
9345f12738
|
- beta启动时自动运行netspider.GetAndStoreCitiesShops
|
2019-09-11 21:44:06 +08:00 |
|
gazebo
|
8e49f41227
|
- GetAndStoreCitiesShops会从上一次的地方继续
|
2019-09-11 21:21:13 +08:00 |
|
gazebo
|
11e30ffb24
|
- 自订单单与假订单的调度特殊处理
|
2019-09-11 18:13:08 +08:00 |
|
gazebo
|
88f55a1234
|
- checkConfig
|
2019-09-11 17:58:09 +08:00 |
|
gazebo
|
33509235e7
|
- fk
|
2019-09-11 17:48:10 +08:00 |
|
gazebo
|
5baecb3b37
|
- dao.QueryPageStores keyword查询licence_code
|
2019-09-11 17:44: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
|
569abe56b5
|
- 添加自提假订单处理
|
2019-09-11 17:31:07 +08:00 |
|
gazebo
|
3919aafe83
|
- GetAndStoreCitiesShops添加参数isShuffle
|
2019-09-11 16:49:56 +08:00 |
|