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

Commit Graph

  • d1d0e576eb - 移除常量字符串'1970-01-01 00:00:00' gazebo 2019-09-20 15:46:09 +08:00
  • 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 xujianhua 2019-09-20 15:25:39 +08:00
  • 92cdb1d975 - 修复美团外卖售后单的处理bug，对于notifyType与resType的处理 gazebo 2019-09-20 15:12:59 +08:00
  • 6a20aa4aa4 Merge remote-tracking branch 'origin/mark' into don Rosy-zhudan 2019-09-20 15:05:17 +08:00
  • f901750850 修改SQL查询时间的方式 Rosy-zhudan 2019-09-20 15:04:22 +08:00
  • 4a8c3190fb - 处理美团外卖poi/save时，报错：商家已接入美团配送，不可修改门店配送相关信息的问题（忽略错误） gazebo 2019-09-20 14:38:10 +08:00
  • 7e1104c068 - 修复美团门店修改状态没有合并的bug gazebo 2019-09-20 14:20:34 +08:00
  • 877ffb2bec - JxBadComments.Createtime添加索引 gazebo 2019-09-20 12:04:42 +08:00
  • 900544560b - 美团外卖门店同步不同步地址（要报错，已接入美团配送，不可修改门店配送相关信息） gazebo 2019-09-20 11:53:54 +08:00
  • 634c9afa6e Merge remote-tracking branch 'origin/mark' into don Rosy-zhudan 2019-09-20 11:31:22 +08:00
  • a5b8513eb5 - 饿百对订单也设置deliveryType gazebo 2019-09-20 11:22:46 +08:00
  • 62d941d3f7 城市商品销量统计-修复问题 Rosy-zhudan 2019-09-20 11:12:18 +08:00
  • af931ce496 - ebai的shop_fee用ForceInterface2Int64 gazebo 2019-09-20 10:53:44 +08:00
  • 479fb6e1d9 - up gazebo 2019-09-20 10:41:30 +08:00
  • 2409b4f323 - 每晚8点再同步一次平台门店信息 gazebo 2019-09-20 10:30:45 +08:00
  • aa3bfcd4c2 - BatchUpdateEntityByKV中panic时，打印调试信息 gazebo 2019-09-20 09:11:41 +08:00
  • 201411d325 统计商品销量 Rosy-zhudan 2019-09-19 18:32:12 +08:00
  • 24ff7daad9 Merge remote-tracking branch 'origin/mark' into don Rosy-zhudan 2019-09-19 17:46:01 +08:00
  • 6d90f5117d 处理err Rosy-zhudan 2019-09-19 17:43:56 +08:00
  • 61a5f9f040 - jdapi.UpdateStoreInfo4Open2 gazebo 2019-09-19 17:26:38 +08:00
  • 1303962088 修改BUG Rosy-zhudan 2019-09-19 17:10:09 +08:00
  • dc53e2e46b 城市商品销量统计 Rosy-zhudan 2019-09-19 16:57:24 +08:00
  • a74c9230f1 - 修复CaculateSkuPrice四舍五入的bug gazebo 2019-09-19 16:56:38 +08:00
  • 72f9852d42 - 去掉调试代码（门店状态报警只发老板） gazebo 2019-09-19 16:31:24 +08:00
  • 4917b8fca6 - 京东门店相关的操作改用新API（非map） gazebo 2019-09-19 15:56:38 +08:00
  • af41dbb6b8 + EnableAutoAcceptOrder gazebo 2019-09-19 11:46:58 +08:00
  • a9c7be1027 - 微信端改价强制异步 gazebo 2019-09-19 11:20:55 +08:00
  • dbd99797aa - 添加周到测试 gazebo 2019-09-19 10:57:26 +08:00
  • 546cb648dd - 添加门店商品修改强制异步（asyncStoreSkuOpFilter） gazebo 2019-09-19 10:17:37 +08:00
  • 3d9aefb411 - 调整OrderSku的索引 gazebo 2019-09-19 09:57:18 +08:00
  • 103ab3c755 - DeleteStoreAllCategories中的任务改为可错误继续的 gazebo 2019-09-19 09:28:46 +08:00
  • e6af1d9ebe - 修复CreateStoreCategoryByStoreSku中误用常量VendorIDMTWM的bug gazebo 2019-09-18 17:24:02 +08:00
  • d0667a818d - PruneMissingStoreSkus, 因为美团外卖分类当前是用的名字关联的，所以改名后如果没有及时同步，这个函数会导致美团平台的分类被误删 gazebo 2019-09-18 15:15:43 +08:00
  • 54e95857bd - 处理在修改美团分类名，但分类已不存在的情况 gazebo 2019-09-18 15:04:24 +08:00
  • a2e71189db - up gazebo 2019-09-18 14:36:21 +08:00
  • 6fb485cd6b - 菜谱查询返回创建都名字 gazebo 2019-09-18 14:25:50 +08:00
  • f438b005a2 - fk gazebo 2019-09-18 14:16:30 +08:00
  • 135089e12b - fk gazebo 2019-09-18 14:12:22 +08:00
  • 737a7f3387 - 订单事件中加载订单时，把sku都加载了 gazebo 2019-09-18 14:09:19 +08:00
  • 88f1976f61 - 修复订单取消消息发送的bug gazebo 2019-09-18 13:50:13 +08:00
  • cef2b9e1e6 - 修复addOrderOrWaybillStatus中判断消息重复的逻辑问题（要加Status判断，否则在自动补运单新运单消息时会出错） gazebo 2019-09-18 11:36:52 +08:00
  • 32e0ec7219 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-09-18 10:53:50 +08:00
  • 285d7d68ec - 添加订单取消微信与短信通知 gazebo 2019-09-18 10:53:33 +08:00
  • ac95d41f75 Merge remote-tracking branch 'origin/mark' into don Rosy-zhudan 2019-09-18 09:17:48 +08:00
  • 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