Commit Graph

  • 20b4bff48f - 商品单价最高限价改为5000元 gazebo 2019-09-25 11:17:06 +08:00
  • d25b096353 - GetAfsOrders添加参数skuIDs gazebo 2019-09-25 11:16:51 +08:00
  • 15d16c41a6 删除分类调价比例 gazebo 2019-09-25 10:28:54 +08:00
  • 4e63f526f2 去掉SkuName的ElmImgHashCode与ImgWeimob gazebo 2019-09-25 10:05:31 +08:00
  • 9cc4328706 - 屏蔽StoreRange越界异步,打印调试信息 gazebo 2019-09-25 09:37:41 +08:00
  • bf86235ce2 - 添加用户最后登录信息 gazebo 2019-09-24 18:09:32 +08:00
  • 412b11396a - 注释掉老user与auth相关的代码 gazebo 2019-09-24 16:39:50 +08:00
  • 72c9889d10 - GetOrders添加GetOrders参数 gazebo 2019-09-24 14:51:15 +08:00
  • 3153ee6ea9 - 添加美团配送店时,强制忽略更新错 gazebo 2019-09-24 12:01:04 +08:00
  • 9b1d282c82 - 重构dao.Sku gazebo 2019-09-24 10:55:13 +08:00
  • 53f4d84025 - 添加京西商城订单取消事件 gazebo 2019-09-24 10:15:16 +08:00
  • 1144d9e8ee - 恢复每晚同步平台价格 gazebo 2019-09-24 08:49:55 +08:00
  • 86b958a8f0 - GetStoreTotalScoreList中的日期处理错误 gazebo 2019-09-24 08:49:06 +08:00
  • dfe1b5c3d3 - 京西商城订单设置vendorStatus gazebo 2019-09-23 18:41:27 +08:00
  • 041bb9ca87 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-09-23 18:26:57 +08:00
  • c6ae8e830d - 京西商城发送假订单消息时,不直接修改改订单状态 gazebo 2019-09-23 18:26:11 +08:00
  • 4b7fe79245 Merge remote-tracking branch 'origin/mark' into don Rosy-zhudan 2019-09-23 16:58:39 +08:00
  • 2814b0c55a 得到门店总分排名 Rosy-zhudan 2019-09-23 16:58:02 +08:00
  • f0f7d241d5 - 京东到家0923晚上维护价格接口,暂停同步到家 gazebo 2019-09-23 16:50:27 +08:00
  • 9ea9e484a7 - 不用GROUP BY重新实现GetStores gazebo 2019-09-23 16:47:10 +08:00
  • 76e42e7043 - 修复getMapCenter的bug gazebo 2019-09-23 12:21:03 +08:00
  • 06a155daf2 - 对于长时间未提交事务报警 gazebo 2019-09-21 22:06:08 +08:00
  • b5e28a280f - 将长时间没有提交的事务打印出来 gazebo 2019-09-21 17:31:44 +08:00
  • 61dcd6db6f - up gazebo 2019-09-21 17:04:37 +08:00
  • 3f459a5e10 - 防止重复发送订单取消通知消息 gazebo 2019-09-21 17:01:41 +08:00
  • 190793d6ec - 饿百支持仅传cat3了 gazebo 2019-09-20 17:18:33 +08:00
  • b48281d893 - 修复GuessDataResourceVendor中的bug gazebo 2019-09-20 16:57:26 +08:00
  • 4fe91cfdcb Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-09-20 16:31:45 +08:00
  • f60554f514 - 监控平台门店状态时,如果平台门店是自动接单的,改为非自动接单 gazebo 2019-09-20 16:30:57 +08:00
  • 7216cfd911 合并修改 Rosy-zhudan 2019-09-20 16:14:56 +08:00
  • ea0358f00d 增加未找到门店的异常捕捉 Rosy-zhudan 2019-09-20 16:11:08 +08:00
  • b030168e07 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-09-20 15:46:27 +08:00
  • 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