liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 0d92a2edd1 门店评分-修改bug Rosy-zhudan 2019-09-18 09:13:33 +08:00
  • 96bb72f87a - dao.GetSkusCategories gazebo 2019-09-18 08:23:40 +08:00
  • d919b5d9f1 - up gazebo 2019-09-17 21:48:24 +08:00
  • 26221afaef - 修复dao.GetSkusCategories没有取全分类的问题 gazebo 2019-09-17 21:44:04 +08:00
  • d5b31014ca - 临时禁止同步时平台分类为空的报警 gazebo 2019-09-17 21:16:30 +08:00
  • 025b2b0cfd + DeleteRecipes gazebo 2019-09-17 18:22:06 +08:00
  • 9a7ab6425f - 活动出错信息返回最终的活动价 gazebo 2019-09-17 18:15:55 +08:00
  • b140091b33 - 菜谱配料列表中，返回sku的名字与图片 gazebo 2019-09-17 17:57:54 +08:00
  • c4c5afb6f9 - 修复菜谱BUG gazebo 2019-09-17 17:46:56 +08:00
  • 8dbb872f4c - 修改菜谱的几个bug gazebo 2019-09-17 17:25:24 +08:00
  • 8357152344 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-09-17 17:06:21 +08:00
  • d8f684f720 - up gazebo 2019-09-17 17:06:08 +08:00
  • 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 zhudan 2019-09-17 17:03:10 +08:00
  • 7b0d1d396f - up gazebo 2019-09-17 16:57:46 +08:00
  • 78c238e6c6 解决冲突，合并提交 Rosy-zhudan 2019-09-17 16:37:01 +08:00
  • 6b1a2f19fc 门店评分-修改BUG Rosy-zhudan 2019-09-17 16:30:43 +08:00
  • f4b6516b4d + 添加数据资源操作相关的API gazebo 2019-09-17 16:02:44 +08:00
  • bf8fd2f255 - 菜谱API基本OK gazebo 2019-09-17 14:36:39 +08:00
  • daa72b7b7d Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-09-17 11:31:07 +08:00
  • b54f86f00c - IsSyncStatusSec fixed to IsSyncStatusSeq - 修改（或创建）单平台门店商品时，如果没有平台分类ID，报警 gazebo 2019-09-17 11:30:07 +08:00
  • 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 xujianhua 2019-09-17 11:12:33 +08:00
  • 7bc963c31f - 修复门店报警门店按城市排序的bug gazebo 2019-09-17 10:47:09 +08:00
  • 957db04544 修改细节 Rosy-zhudan 2019-09-17 10:32:49 +08:00
  • 6bf8296963 + QueryFoodRecipes gazebo 2019-09-17 10:17:10 +08:00
  • 4caa33cac5 + UpdateFoodRecipe gazebo 2019-09-17 09:33:36 +08:00
  • 6199a2e714 Merge remote-tracking branch 'origin/mark' into don Rosy-zhudan 2019-09-17 09:29:46 +08:00
  • dbdf04d83c 同步修改 Rosy-zhudan 2019-09-17 09:29:13 +08:00
  • f208fea6a1 门店配送范围-修改多边形计算公式 Rosy-zhudan 2019-09-17 09:26:35 +08:00
  • 0b923640b7 - 饿百的配送异常不应该当成取消来处理，比如：1568651453228834871 gazebo 2019-09-17 09:13:26 +08:00
  • 05809c3a50 修改 Rosy-zhudan 2019-09-17 08:41:13 +08:00
  • 299444ddd5 提交 Rosy-zhudan 2019-09-17 08:31:04 +08:00
  • 44810b2957 + CalcPolygonAreaAutonavi gazebo 2019-09-16 20:54:55 +08:00
  • 312ce745cc - 菜谱相关 gazebo 2019-09-16 18:40:43 +08:00
  • 12194ac987 修改字段名 Rosy-zhudan 2019-09-16 17:46:42 +08:00
  • f88b273f92 修改SQL字段名 Rosy-zhudan 2019-09-16 17:42:32 +08:00
  • e35d86f690 修改门店评分细节 Rosy-zhudan 2019-09-16 16:20:46 +08:00
  • ea58ab6f79 - 门店报警信息按城市排序 gazebo 2019-09-16 15:33:29 +08:00
  • 0a0c051d50 - up gazebo 2019-09-16 14:16:21 +08:00
  • f6ee092ac2 - 饿百商店更新不修改“外卖客服联系电话”，因为有时会报错 gazebo 2019-09-16 10:13:07 +08:00
  • 22f8d169d0 Merge remote-tracking branch 'origin/mark' into don Rosy-zhudan 2019-09-16 08:47:20 +08:00
  • 5fdbf3a1e1 - 修复GetAndStoreCitiesShops中存储最后一个商店出记录已经存在错出的bug gazebo 2019-09-13 16:14:49 +08:00
  • 5eadabd0d8 - 订单门店在本地不存在报警 gazebo 2019-09-13 15:31:57 +08:00
  • 3aa9234b68 Merge remote-tracking branch 'origin/mark' into don Rosy-zhudan 2019-09-12 18:28:02 +08:00
  • e0418ad25a - 修复GetAndStoreCitiesShops中城市继续的bug（找不到城市的情况） gazebo 2019-09-12 18:24:12 +08:00
  • 9c135ed927 - fk gazebo 2019-09-12 18:18:43 +08:00
  • db8ca7470b - fk gazebo 2019-09-12 18:13:42 +08:00
  • 91b05593e4 Merge remote-tracking branch 'origin/mark' into don Rosy-zhudan 2019-09-12 17:58:31 +08:00
  • 3de6498de4 + NewSeqTask2 gazebo 2019-09-12 17:35:43 +08:00
  • 00603a0a34 门店评分-减少并发数 Rosy-zhudan 2019-09-12 17:22:02 +08:00
  • 54a55dcac0 - 活动价保留到到角 gazebo 2019-09-12 16:55:11 +08:00
  • f2b4f88573 门店评分-减少并发数 Rosy-zhudan 2019-09-12 16:53:15 +08:00
  • d9ec93d493 - 饿百订单的order_index可能为int或string... gazebo 2019-09-12 16:31:14 +08:00
  • dfdcc671f6 门店评分-减少并发数 Rosy-zhudan 2019-09-12 16:30:16 +08:00
  • 7d194b3b90 Merge remote-tracking branch 'origin/mark' into don Rosy-zhudan 2019-09-12 15:44:48 +08:00
  • 6b3b0bcd35 门店评分-优化数据读取速度 Rosy-zhudan 2019-09-12 15:36:39 +08:00
  • e789e17714 + getAllUsers4Store gazebo 2019-09-12 14:54:28 +08:00
  • f791668f5e - 取货失败审核同意后，不更新订单状态为待配送 gazebo 2019-09-12 13:51:51 +08:00
  • 86d35d58c5 门店评分-优化内存 Rosy-zhudan 2019-09-12 11:42:20 +08:00
  • f3e64ed996 - up gazebo 2019-09-12 10:28:18 +08:00
  • 895ad8b4f6 Merge remote-tracking branch 'origin/mark' into don Rosy-zhudan 2019-09-12 08:40:59 +08:00
  • ad2acc3a7e 修改时间 Rosy-zhudan 2019-09-12 08:40:25 +08:00
  • 84b4d400e4 - BatchUpdateEntityByKV中不用事务 gazebo 2019-09-11 22:59:19 +08:00
  • 5ffeb4142c - fk gazebo 2019-09-11 21:55:36 +08:00
  • 9345f12738 - beta启动时自动运行netspider.GetAndStoreCitiesShops gazebo 2019-09-11 21:44:06 +08:00
  • 8e49f41227 - GetAndStoreCitiesShops会从上一次的地方继续 gazebo 2019-09-11 21:21:13 +08:00
  • 11e30ffb24 - 自订单单与假订单的调度特殊处理 gazebo 2019-09-11 18:13:08 +08:00
  • 88f55a1234 - checkConfig gazebo 2019-09-11 17:58:09 +08:00
  • 33509235e7 - fk gazebo 2019-09-11 17:48:10 +08:00
  • 5baecb3b37 - dao.QueryPageStores keyword查询licence_code gazebo 2019-09-11 17:44:09 +08:00
  • 435b4397d6 - 门店状态报警提示修改 gazebo 2019-09-11 17:37:57 +08:00
  • 8378b832a3 Merge remote-tracking branch 'origin/mark' into don Rosy-zhudan 2019-09-11 17:38:54 +08:00
  • 30a7c1dbe2 - 门店状态报警提示修改 gazebo 2019-09-11 17:37:57 +08:00
  • 8a955013d9 门店评分-优化 Rosy-zhudan 2019-09-11 17:37:27 +08:00
  • 569abe56b5 - 添加自提假订单处理 gazebo 2019-09-11 17:31:07 +08:00
  • 3919aafe83 - GetAndStoreCitiesShops添加参数isShuffle gazebo 2019-09-11 16:49:56 +08:00
  • 37c9acc407 - up gazebo 2019-09-11 16:35:33 +08:00
  • b2937294c9 - up gazebo 2019-09-11 16:25:41 +08:00
  • 4e52916066 - 拉取饿百门店营业执照信息 gazebo 2019-09-11 16:24:42 +08:00
  • adbaf4ff13 - up gazebo 2019-09-11 15:30:25 +08:00
  • eab614a734 + RegisterPurchaseOrderHandler（为了适应加入的京西自营商城） gazebo 2019-09-11 15:10:32 +08:00
  • bfaea1b998 门店评分并发修改 Rosy-zhudan 2019-09-11 14:49:59 +08:00
  • c0953da5a1 - debug gazebo 2019-09-11 14:49:42 +08:00
  • f2a1cff346 - 优化net_spider gazebo 2019-09-11 11:54:54 +08:00
  • 85c8354873 - up gazebo 2019-09-11 11:13:59 +08:00
  • 86fc32cf2e + GetRolesUserList gazebo 2019-09-11 11:04:29 +08:00
  • 3784696334 修正 Rosy-zhudan 2019-09-11 10:35:54 +08:00
  • f62268821e 门店配送面积计算(根据经纬度计算多边形球面积-凸多边形和凹多边形) Rosy-zhudan 2019-09-11 10:15:28 +08:00
  • f1fbcf6366 - 高德API的KEY改为公司认证的KEY，可访问量更大 - 拉取门店信息时要获取坐标及区信息 - 饿百订单买家的坐标转换为高德坐标 gazebo 2019-09-11 10:14:40 +08:00
  • b72043257c - 平台快递投递失败或取货失败后，更新订单配送信息 gazebo 2019-09-11 09:38:45 +08:00
  • f9850362b6 - jx.onOrderNew中对于StoreID与SkuID赋值 gazebo 2019-09-11 08:35:16 +08:00
  • a2bb472640 - 优化updateOrderSkuOtherInfo中对于skuID的获取处理 gazebo 2019-09-10 21:06:03 +08:00
  • a6350630bd - up gazebo 2019-09-10 18:46:04 +08:00
  • f632622b55 + ConfigSysFakeOrderMobiles gazebo 2019-09-10 18:32:55 +08:00
  • 690b4c2e69 - up gazebo 2019-09-10 18:09:08 +08:00
  • 7f05b771f4 - 设置美团外卖订单的DeliveryType字段 gazebo 2019-09-10 17:51:36 +08:00
  • e873ce0264 - 京西订单支持自提 gazebo 2019-09-10 17:36:02 +08:00
  • a90941b26e - 京西自营商城 gazebo 2019-09-10 17:21:44 +08:00
  • 40586e19a6 增加StoreScoreEx结构来获取门店名字,去掉表中的字段StoreName Rosy-zhudan 2019-09-10 15:42:26 +08:00
  • cc750af2ca - 修复SendAlarmVendorSnapshot调用GetUsers时，防止roleUserIDList为空的bug gazebo 2019-09-10 15:22:15 +08:00
  • fb8732c94c - 门店状态变化添加发送微信通知消息 gazebo 2019-09-10 11:23:39 +08:00