Commit Graph

2999 Commits

Author SHA1 Message Date
gazebo
d5b31014ca - 临时禁止同步时平台分类为空的报警 2019-09-17 21:16:30 +08:00
gazebo
025b2b0cfd + DeleteRecipes 2019-09-17 18:22:06 +08:00
gazebo
9a7ab6425f - 活动出错信息返回最终的活动价 2019-09-17 18:15:55 +08:00
gazebo
b140091b33 - 菜谱配料列表中,返回sku的名字与图片 2019-09-17 17:57:54 +08:00
gazebo
c4c5afb6f9 - 修复菜谱BUG 2019-09-17 17:46:56 +08:00
gazebo
8dbb872f4c - 修改菜谱的几个bug 2019-09-17 17:25:24 +08:00
gazebo
8357152344 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-09-17 17:06:21 +08:00
gazebo
d8f684f720 - up 2019-09-17 17:06:08 +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
gazebo
7b0d1d396f - up 2019-09-17 16:57:46 +08:00
gazebo
f4b6516b4d + 添加数据资源操作相关的API 2019-09-17 16:02:44 +08:00
gazebo
bf8fd2f255 - 菜谱API基本OK 2019-09-17 14:39:15 +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
gazebo
6bf8296963 + QueryFoodRecipes 2019-09-17 10:17:10 +08:00
gazebo
4caa33cac5 + UpdateFoodRecipe 2019-09-17 09:33:36 +08:00
gazebo
0b923640b7 - 饿百的配送异常不应该当成取消来处理,比如:1568651453228834871 2019-09-17 09:13:26 +08:00
gazebo
44810b2957 + CalcPolygonAreaAutonavi 2019-09-16 20:54:55 +08:00
gazebo
312ce745cc - 菜谱相关 2019-09-16 18:40:43 +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
gazebo
5fdbf3a1e1 - 修复GetAndStoreCitiesShops中存储最后一个商店出记录已经存在错出的bug 2019-09-13 16:14:49 +08:00
gazebo
5eadabd0d8 - 订单门店在本地不存在报警 2019-09-13 15:31:57 +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
gazebo
3de6498de4 + NewSeqTask2 2019-09-12 17:35:43 +08:00
gazebo
54a55dcac0 - 活动价保留到到角 2019-09-12 16:55:11 +08:00
gazebo
d9ec93d493 - 饿百订单的order_index可能为int或string... 2019-09-12 16:31:14 +08:00
gazebo
e789e17714 + getAllUsers4Store 2019-09-12 14:54:28 +08:00
gazebo
f791668f5e - 取货失败审核同意后,不更新订单状态为待配送 2019-09-12 13:51:51 +08:00
gazebo
f3e64ed996 - up 2019-09-12 10:28:18 +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
gazebo
569abe56b5 - 添加自提假订单处理 2019-09-11 17:31:07 +08:00
gazebo
3919aafe83 - GetAndStoreCitiesShops添加参数isShuffle 2019-09-11 16:49:56 +08:00
gazebo
37c9acc407 - up 2019-09-11 16:35:33 +08:00
gazebo
b2937294c9 - up 2019-09-11 16:25:41 +08:00
gazebo
4e52916066 - 拉取饿百门店营业执照信息 2019-09-11 16:24:42 +08:00
gazebo
adbaf4ff13 - up 2019-09-11 15:30:25 +08:00