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

Commit Graph

  • 3b8209906f - PrintOrderByOrder只有在prod下才生效 gazebo 2019-04-16 16:15:10 +08:00
  • 844cc70c1e - 将Dao.DB中db改为Db gazebo 2019-04-16 16:14:08 +08:00
  • fc5cb88d8b - 京东订单SkuID的容错处理 gazebo 2019-04-16 16:10:49 +08:00
  • 96a29cdcf5 - StoreSkuNameExt中的json gazebo 2019-04-16 11:51:21 +08:00
  • 4e7ff8ff1f - 关注之后再关注不操作 gazebo 2019-04-16 11:41:02 +08:00
  • cb35d92feb - 一些同步的任务名添加关键信息 gazebo 2019-04-16 09:42:36 +08:00
  • 98e873f0b2 - AgreeOrRefuseRefund renmae to AgreeOrRefuseCancel - 修改饿百门店状态判断的错误 gazebo 2019-04-16 09:28:02 +08:00
  • ba85c710b5 - GetSkuNames keyword可搜索upc gazebo 2019-04-15 15:04:57 +08:00
  • a6dfc8dbda - 创建与修改SkuName时，防止UPC重复 gazebo 2019-04-15 15:01:15 +08:00
  • 5e3bd659c9 - cms.GetStoresSkus gazebo 2019-04-15 14:33:22 +08:00
  • 2747e6f1c5 - remove agentId from dingapi.Sign gazebo 2019-04-15 13:27:45 +08:00
  • b6468297a1 - ddapi.Sign gazebo 2019-04-15 12:42:43 +08:00
  • ba463210b3 - 修改IsMobileFake，13位及以上为非真实号 gazebo 2019-04-14 22:48:57 +08:00
  • b91fe783f6 - ebai.CmdOrderPartRefund的业务流程处理 gazebo 2019-04-14 17:54:47 +08:00
  • 99f675fcb4 - fix StoreOrderFinishedPickup to OrderFinishedPickup for mtwm gazebo 2019-04-14 17:03:31 +08:00
  • bb02e6fe9e - AdjustOrder - CancelOrder gazebo 2019-04-14 17:01:29 +08:00
  • 89e076343d - test mtwm.MsgTypeOrderFinishedPickup gazebo 2019-04-14 16:28:20 +08:00
  • c3d272d0d3 - up gazebo 2019-04-14 13:27:35 +08:00
  • e33ab1d62a - add shop_close in ebai.onShopMsgPush gazebo 2019-04-14 12:43:38 +08:00
  • 06c54755b0 - up gazebo 2019-04-14 12:38:11 +08:00
  • caabbb4a66 - IPurchasePlatformHandler中添加 AgreeOrRefuseRefund CancelOrder AdjustOrder gazebo 2019-04-13 18:35:58 +08:00
  • 16725bf8f8 - 修改Rollback调用时机 - 创建三方运单判断EnableStoreWrite gazebo 2019-04-13 11:30:24 +08:00
  • 0055892cb2 - 修复financial中的事务问题，某些情况上return nil需要回滚 gazebo 2019-04-13 11:08:24 +08:00
  • a12889d133 Merge branch 'mark' of git.coding.net:XJH-Rosy/jx-callback into mark gazebo 2019-04-13 09:34:17 +08:00
  • 53cc491a04 - order_Financial to order_financial gazebo 2019-04-13 09:33:46 +08:00
  • d9785939cd Accept Merge Request #12: (lcw -> mark) Merge Request: 修复一些报警 Created By: @XJH-Rosy Accepted By: @XJH-Rosy URL: https://coding.net/u/XJH-Rosy/p/jx-callback/git/merge/12 XJH-Rosy 2019-04-12 17:55:47 +08:00
  • cc627da2a4 - 修复FormalizeStoreStatus中的死锁问题 gazebo 2019-04-12 17:26:28 +08:00
  • 47ec846c36 - dao.FormalizeStoreStatus gazebo 2019-04-12 17:10:35 +08:00
  • 211a9928e0 结账信息收到重复订单推送处理 renyutian 2019-04-12 16:30:59 +08:00
  • c968cfe109 - fk gazebo 2019-04-12 16:29:52 +08:00
  • 70876759a1 Merge remote-tracking branch 'origin/mark' into lcw renyutian 2019-04-12 16:26:16 +08:00
  • 77c5a16c08 - 接收门店状态消息，本地同步状态，京东暂时无效 gazebo 2019-04-12 16:22:22 +08:00
  • b342af3e7e 美团正向账单bug优化 skuid-->vendorskuid renyutian 2019-04-12 13:48:22 +08:00
  • ca8d0b362b - 单门店同步商品时，只同步SKUNAME和SKU可售的 gazebo 2019-04-12 11:16:39 +08:00
  • 06f92d952c - 处理美团外卖shipping/list返回的配送范围(area)有时是整数，有时是字符串的情况 gazebo 2019-04-12 09:08:02 +08:00
  • f3939687ed - ebai.OnCallbackMsg中要判断事件后才会调用GetOrderIDFromMsg gazebo 2019-04-11 19:46:05 +08:00
  • e2f728889b - dao.GetStoreSkus 与 dao.GetFullStoreSkus 智能取sku name的img gazebo 2019-04-11 17:06:46 +08:00
  • 1c77d18e23 - 由于微盟微商城TOKEN的原因，在ALPHA禁用 gazebo 2019-04-11 16:27:24 +08:00
  • 5f9b2a08bb - 重构UploadImg gazebo 2019-04-11 16:19:28 +08:00
  • 660ff1e34c - 去掉ebai.GetAllRemoteSkus中一个冗长的调度输出 - BaseTask marshal时忽略Result gazebo 2019-04-11 15:19:57 +08:00
  • 911c6d83ce - 只在prod时做手机号与差评刷新 gazebo 2019-04-11 14:54:01 +08:00
  • 53fa68d3ba - 饿百图片库管理 gazebo 2019-04-11 14:39:45 +08:00
  • 6e3b9a8215 - 将微信的备注改为店名相关的信息 gazebo 2019-04-11 11:59:04 +08:00
  • ff52db6dd7 - 对于外卖管家打印机ESCAPE * gazebo 2019-04-11 09:58:54 +08:00
  • f4e2d403dd - 打印订单格式调整 gazebo 2019-04-11 09:46:58 +08:00
  • 79e6e30616 - GetStores时keyword查询printer_sn gazebo 2019-04-11 09:05:20 +08:00
  • 83e0b698a8 - 中午云打印 gazebo 2019-04-10 18:27:16 +08:00
  • fc29cf8adc - 美团外卖SyncStoreSkus中，只处理与相应的skuIDs相关的分类信息 gazebo 2019-04-10 17:36:12 +08:00
  • 62fdb4fa3f - 添加调试输出 gazebo 2019-04-10 16:39:27 +08:00
  • 6ae25dc574 - 只有在prod环境下才刷新易联云token gazebo 2019-04-10 16:15:50 +08:00
  • 5236fdf90c - 易联云打印订单排版完成 gazebo 2019-04-10 16:09:23 +08:00
  • e0208f77e9 - 易联云打印格式完成 gazebo 2019-04-10 15:35:12 +08:00
  • aeca8901d8 - 同步门店商品时，以门店价格排序 gazebo 2019-04-10 13:56:54 +08:00
  • 0f38cadb5f - 删除网络打印机时，修复printerVendorID为0的错误 gazebo 2019-04-10 11:03:17 +08:00
  • ac98b753ae - 校验外卖管家设备编号长度 gazebo 2019-04-10 10:17:07 +08:00
  • 771fda0914 - up gazebo 2019-04-10 09:58:26 +08:00
  • f4b0dc1d92 - GetStores中返回printer_vendor_id gazebo 2019-04-10 09:33:25 +08:00
  • 927c6db248 Merge remote-tracking branch 'origin/lcw' into mark gazebo 2019-04-10 09:28:14 +08:00
  • a8ca896949 - 外卖管家READY gazebo 2019-04-10 09:26:43 +08:00
  • a8c4b6e675 - fix printer_vendor_i_d to printer_vendor_id gazebo 2019-04-10 09:06:37 +08:00
  • 6c8117a953 - fk gazebo 2019-04-09 21:09:00 +08:00
  • 54a0cc216d - yilianyun printer added gazebo 2019-04-09 20:56:53 +08:00
  • 3cc5d7a8b6 Merge remote-tracking branch 'origin/mark' into lcw renyutian 2019-04-09 17:50:31 +08:00
  • 3203201bc6 - 修复GetPossibleVendorIDFromVendorOrderID中的错误 gazebo 2019-04-09 17:49:39 +08:00
  • 5a96290567 Merge remote-tracking branch 'origin/mark' into lcw renyutian 2019-04-09 17:22:35 +08:00
  • 07f6b9d340 - 调用SelfDeliverDelivering要传骑手或店主手机号 gazebo 2019-04-09 17:10:07 +08:00
  • 4e567f1687 Merge remote-tracking branch 'origin/mark' into lcw renyutian 2019-04-09 15:19:28 +08:00
  • 6ccf2d984f - fk gazebo 2019-04-09 15:18:46 +08:00
  • 1bc96f808a Merge remote-tracking branch 'origin/mark' into lcw renyutian 2019-04-09 14:51:20 +08:00
  • 3900e71265 - 将人民币符号换成全角，半角飞鹅打印机打不出来 gazebo 2019-04-09 14:46:42 +08:00
  • c5ef17afee ebai "delivery_party" 多类型处理 renyutian 2019-04-09 13:58:09 +08:00
  • 2b221d0ea3 Merge remote-tracking branch 'origin/mark' into lcw renyutian 2019-04-09 13:55:41 +08:00
  • af1dbe225c - 因为在UpdateStore是存的valid，所以在调用打印机处理相关的函数后按store更新valid gazebo 2019-04-09 13:41:41 +08:00
  • 8025bddf43 ebai msg.Timestamp renyutian 2019-04-09 12:04:56 +08:00
  • 4a1b80261c Merge remote-tracking branch 'origin/mark' into lcw renyutian 2019-04-09 12:03:43 +08:00
  • 48c36173bb - 外卖管理打印机添加完成 gazebo 2019-04-09 12:03:18 +08:00
  • 8c6b1bc067 - 重构打印机流程，添加“外卖管家”打印 gazebo 2019-04-09 11:35:27 +08:00
  • 5043a9b1f6 Merge remote-tracking branch 'origin/mark' into lcw renyutian 2019-04-09 10:01:46 +08:00
  • 358257c70d - 商品如果下架，查询门店商品时，只有关注且可售的才会返回 gazebo 2019-04-09 09:52:29 +08:00
  • fb9ee37ecd - 复制门店商品时，LEFT JOIN写成JOIN了 gazebo 2019-04-09 09:17:53 +08:00
  • 657374d8ba t2.delivery_confirm_time 不存在 renyutian 2019-04-08 15:14:54 +08:00
  • 1094c325fa 美团公益捐款优化 renyutian 2019-04-08 15:07:10 +08:00
  • 976a7d0d76 结账报错优化 renyutian 2019-04-08 11:27:56 +08:00
  • 7d820a6131 Merge remote-tracking branch 'origin/mark' into lcw renyutian 2019-04-04 18:08:47 +08:00
  • 48ab6f7e75 美团尝试 renyutian 2019-04-04 17:58:08 +08:00
  • 014ee01dd6 - message.content to text gazebo 2019-04-04 17:09:04 +08:00
  • 1745509543 Merge branch 'lcw' of https://git.dev.tencent.com/XJH-Rosy/jx-callback into lcw renyutian 2019-04-04 17:03:25 +08:00
  • 7a3a914839 bug 优化 renyutian 2019-04-04 17:02:48 +08:00
  • a0e1875911 Merge branch 'lcw' of git.coding.net:XJH-Rosy/jx-callback into lcw gazebo 2019-04-04 15:50:33 +08:00
  • bb882a016a Merge branch 'master' into lcw gazebo 2019-04-04 15:50:15 +08:00
  • edaad0c9b6 - SelfDeliveringAndUpdateStatus中不应该依赖DeliveryFlag状态 gazebo 2019-04-04 15:47:50 +08:00
  • 18d7a24ba5 Merge branch 'lcw' of https://git.dev.tencent.com/XJH-Rosy/jx-callback into lcw renyutian 2019-04-04 14:52:42 +08:00
  • d276ae55aa bug处理 renyutian 2019-04-04 14:51:10 +08:00
  • e61ae7a1b0 Merge branch 'master' into lcw gazebo 2019-04-04 12:37:14 +08:00
  • 5986c5ad17 - 饿百状态调整 gazebo 2019-04-04 12:36:00 +08:00
  • f28be52906 格式优化 renyutian 2019-04-04 10:16:35 +08:00
  • 53733320c2 报错优化 renyutian 2019-04-04 09:39:21 +08:00
  • 2c457a38d5 - 修改美团外卖门店要报错"商家已接入美团配送，不可修改门店配送相关信息"，还是只修改门店状态与营业时间 gazebo 2019-04-03 20:42:02 +08:00
  • 2d54c5510e - up gazebo 2019-04-03 20:34:43 +08:00
  • 886fde0800 - 同步美团外卖门店信息 gazebo 2019-04-03 20:30:11 +08:00