Commit Graph

  • cbee85acce 京东正向订单结账信息记录优化 renyutian 2019-03-21 17:23:50 +08:00
  • 54b8bc8715 Merge remote-tracking branch 'origin/jxstore' into lcw renyutian 2019-03-21 16:52:21 +08:00
  • c7a1dc650d - fk gazebo 2019-03-21 16:50:49 +08:00
  • 9fc122d7f0 Merge remote-tracking branch 'origin/jxstore' into lcw renyutian 2019-03-21 16:48:27 +08:00
  • 81efff6380 - OnOrderDetail gazebo 2019-03-21 16:46:52 +08:00
  • 0ee04cdd4d - 结算初始版本 renyutian 2019-03-21 16:12:54 +08:00
  • 5c8106a70b - weimob del sku name to del_ gazebo 2019-03-21 16:01:10 +08:00
  • 2efd125a9b - refresh dingding key on all envs gazebo 2019-03-21 14:28:50 +08:00
  • b47e5db4d1 - fk gazebo 2019-03-21 12:13:32 +08:00
  • c2497b089f - refactor GetOrder gazebo 2019-03-21 11:09:58 +08:00
  • 9dae0c0f45 - 修改已经是小组成员的报错信息 gazebo 2019-03-21 10:46:17 +08:00
  • 9d5db6cfc9 - globals init gazebo 2019-03-21 10:19:16 +08:00
  • 75406c8d49 - fix globals init bug gazebo 2019-03-21 09:15:06 +08:00
  • 15c703b469 - refactor test init flow gazebo 2019-03-20 22:28:51 +08:00
  • 120e0dde6c - 将微商场当成一个单一商场,不再根据lbs来派单 gazebo 2019-03-20 22:02:30 +08:00
  • 712f311bed - make weixins.OpenID, OpenIDMini and OpenIDUnion visible gazebo 2019-03-20 18:07:11 +08:00
  • 4876b7664c - 新京东到家订单事件中,顺序调用得到新订单信息与手机号(因为超过了1000个店后,只用订单号查手机号要出错) - 在defsch中异步调用微信发消息 gazebo 2019-03-20 16:30:48 +08:00
  • 02db9f0b4f - implement mtwm.DeleteRemoteStoreSkus gazebo 2019-03-20 15:31:26 +08:00
  • de63254fc3 - fix bug in UpdateSkuName gazebo 2019-03-20 11:50:51 +08:00
  • add27be617 - set id to 0 when syncStatus is new in dao.SetStoreSkuSyncStatus gazebo 2019-03-20 10:48:15 +08:00
  • 30db450d51 - remove debug code in initdata gazebo 2019-03-20 10:24:49 +08:00
  • 21b94db940 - 临时将alpha京东的KEY换成果园的 gazebo 2019-03-20 10:22:03 +08:00
  • 2d58ef69ab - fix bug in PushJDBadCommentToWeiXin gazebo 2019-03-20 09:48:52 +08:00
  • 49ff1a0b47 - comment test code gazebo 2019-03-20 09:32:33 +08:00
  • d8b7b41b01 - SplitSkuName don't use comment as name - add DownloadFileByURL - refactor UploadWeimobImg4SkuName - ignore RefreshMissingDadaStores error - add BuildSkuFromEbaiStore gazebo 2019-03-20 09:31:33 +08:00
  • d0587fef0a - 饿百改了订单中的send_time类型,从string改为int了,FUCK gazebo 2019-03-19 15:34:07 +08:00
  • 5c640c08c5 - OrderAccounting gazebo 2019-03-19 11:51:03 +08:00
  • d158b0fc02 - up gazebo 2019-03-19 10:29:27 +08:00
  • e906f0b159 - remove useless comment gazebo 2019-03-19 10:29:09 +08:00
  • f07eeeb9c4 - OnOrderDetail gazebo 2019-03-18 18:14:05 +08:00
  • 6266315684 - create dada store when after jx store created. gazebo 2019-03-18 16:26:11 +08:00
  • cf2dc1be14 - debug msg in auth and auth2 gazebo 2019-03-18 16:16:56 +08:00
  • 69cf6d54ff - fix mtwm price to normal price. gazebo 2019-03-18 16:06:38 +08:00
  • 4ef9b65299 - debug output redirectURL in GetWeiXinUserInfo gazebo 2019-03-18 15:36:16 +08:00
  • 1e53e4edae - improve jxutils.SplitStoreName gazebo 2019-03-18 15:04:42 +08:00
  • a4d8fd6230 - set mtwm sku weight when tag_id specified in SyncStoreSkus gazebo 2019-03-18 10:51:15 +08:00
  • 45e784e365 - 忽略京东错误:店内分类名称未修改,无需操作 gazebo 2019-03-18 10:36:13 +08:00
  • 2434f77b8b - don't set default mtwm vendor cat id gazebo 2019-03-17 22:25:28 +08:00
  • efec73afc4 - call SyncStoreSkus synchronously in mtwm.FullSyncStoreSkus - handle mtps except event in status event handler too (美团配送的运单异常事件会发到status的回调来) gazebo 2019-03-17 21:48:05 +08:00
  • 071ae8c5d8 - try mtwm app_poi_code as platform id(not jx id). gazebo 2019-03-16 20:32:00 +08:00
  • 40410b6632 - ignore some windows temp file types gazebo 2019-03-15 16:56:10 +08:00
  • 8346f30b86 - financial related msg gazebo 2019-03-15 16:51:09 +08:00
  • d0ea300330 - cms buildTime and startupTime gazebo 2019-03-15 15:53:06 +08:00
  • b000fbb3e7 - AfterSaleBillStatus gazebo 2019-03-15 15:04:25 +08:00
  • 3e7af36e8e - fix bug because the result of GetEleCommentList, shop_id is elm id not ebai id. in ebai.RefreshComment gazebo 2019-03-15 11:54:02 +08:00
  • b9da868736 - TmpGetJxBadComments support only fetch fix order comment gazebo 2019-03-15 11:34:21 +08:00
  • 39f390cb1f - wrap StartRefreshComment and StartRefreshEbaiRealMobile by ReallyCallPlatformAPI gazebo 2019-03-15 11:14:33 +08:00
  • bb01fc422b - refactor config ReallyCallPlatformAPI, ReallySendWeixinMsg and ReallyReplyComment gazebo 2019-03-15 11:09:43 +08:00
  • df54ea9478 - remove duplicated cms const storeDeliveryTypeName - change misc.Init to StartRefreshEbaiRealMobile and make it async to minimize startup time gazebo 2019-03-15 10:53:57 +08:00
  • dec14126a7 - replace all goroutine and AfterFunc with recover version gazebo 2019-03-15 10:26:30 +08:00
  • e5bf25bd04 - enable auto reply order comment gazebo 2019-03-15 09:49:32 +08:00
  • f0fa933196 - make StartRefreshComment async gazebo 2019-03-15 09:37:54 +08:00
  • 6b7f0626b3 - 饿百的评价不是一点一点出来的,而是一下把前一天的全部崩出来。。。,相应修改定时器 gazebo 2019-03-15 09:22:59 +08:00
  • d602fe2fa1 - search vendor_order_id2 when orderID is specified in GetOrders gazebo 2019-03-14 16:54:13 +08:00
  • 9932d6dc94 - use ShippingList and ShippingFetch to get delivery info for mtwm store gazebo 2019-03-14 16:34:21 +08:00
  • 1c5a431c10 - 限制差评推送时间 gazebo 2019-03-14 12:27:36 +08:00
  • f331557856 - fk gazebo 2019-03-14 12:13:06 +08:00
  • fffb7a495b - enable new order comment gazebo 2019-03-14 12:07:59 +08:00
  • 227f485691 - refactor order comment gazebo 2019-03-14 09:37:48 +08:00
  • 7234520503 - force add vendor store if IsSync == 0. gazebo 2019-03-13 20:53:20 +08:00
  • bb5bc45232 - ebai acceptOrderDelay = 180 * time.Second gazebo 2019-03-13 20:27:48 +08:00
  • c548afcd86 - fk gazebo 2019-03-13 18:28:29 +08:00
  • a9501856ea - don't print warning when LoadOrder2 failed in OnOrderComments gazebo 2019-03-13 18:18:34 +08:00
  • 8310a0b2cf - fix bug in OrderManager.OnOrderComments gazebo 2019-03-13 18:06:29 +08:00
  • 0f7a3ab809 - fk gazebo 2019-03-13 16:45:43 +08:00
  • 5d37250b55 - utils.Interface2String(result["comment_id"]) gazebo 2019-03-13 16:26:30 +08:00
  • 4a4bd4518b - fk gazebo 2019-03-13 16:11:37 +08:00
  • fd2638f831 - fix bug in RefreshEbaiBadComment gazebo 2019-03-13 16:03:26 +08:00
  • 7181861a09 - 在ebai.RefreshComment中GetEleCommentList错误继续 gazebo 2019-03-13 15:38:39 +08:00
  • 14a8c58239 - 处理同一运单重复接单情况 gazebo 2019-03-13 15:22:18 +08:00
  • 780b17009b - fk gazebo 2019-03-13 15:19:30 +08:00
  • be8d7fc110 - fk gazebo 2019-03-13 15:13:05 +08:00
  • 9266534bab - fk gazebo 2019-03-13 14:52:22 +08:00
  • 5801a0c5e9 - fix return value for update store sku apis gazebo 2019-03-13 14:47:15 +08:00
  • 23a0abe1d3 - return task id for update store sku series apis gazebo 2019-03-13 14:33:35 +08:00
  • f8a488f1a4 - add param isAsync and isContinueWhenError for update store sku serial apis gazebo 2019-03-13 11:45:59 +08:00
  • 9423f2efea - fk gazebo 2019-03-13 11:04:55 +08:00
  • 786239a897 - optimize SyncStoreSkus, isContinueWhenError will really continue gazebo 2019-03-13 10:54:47 +08:00
  • 6a9067f643 - fk gazebo 2019-03-13 09:02:08 +08:00
  • ccd6c7d13d - fk gazebo 2019-03-12 22:40:31 +08:00
  • b41289db2d - fk gazebo 2019-03-12 22:20:36 +08:00
  • ae2b01a5a3 - fk gazebo 2019-03-12 21:19:00 +08:00
  • aeddf01cbd - fk gazebo 2019-03-12 21:11:18 +08:00
  • 9bfdb782bf - only register callback on prod for dingding gazebo 2019-03-12 17:35:02 +08:00
  • 8ce4ee0be9 - user GetUserTag in jxcontext.Context.GetUserName gazebo 2019-03-12 17:08:41 +08:00
  • 6693bd4bf5 - update qty before price for updating jd store sku info gazebo 2019-03-12 17:06:04 +08:00
  • 3113e9d603 - replace literal 'admin' with const gazebo 2019-03-12 15:53:13 +08:00
  • c46f1597f1 - refactor bad comment gazebo 2019-03-12 15:40:08 +08:00
  • 87a25c893b - only one qrcode config for dingding gazebo 2019-03-11 17:33:08 +08:00
  • 08f36ebbee - add debug dingding app config gazebo 2019-03-11 17:24:13 +08:00
  • bec5eb85cc - fk gazebo 2019-03-11 15:45:27 +08:00
  • 61fd3b5a90 - fk gazebo 2019-03-11 15:39:24 +08:00
  • c8946137fd - auth2.GetTokenInfo兼容V1 token gazebo 2019-03-11 15:27:23 +08:00
  • cd4bc1c810 - fix mobile.VerifySecret gazebo 2019-03-11 15:12:15 +08:00
  • 4455e51b3f - export auth2.GetTokenInfo gazebo 2019-03-11 14:50:25 +08:00
  • 7bcf5f228a - use state as block in DingDingOAuth2 gazebo 2019-03-11 11:05:06 +08:00
  • 1012a855ea - refactor verify code gazebo 2019-03-11 10:37:57 +08:00
  • 899e0d8362 - 调整到家“新增或修改门店消息” gazebo 2019-03-11 09:40:24 +08:00
  • aeda2df6bd - authType for Login gazebo 2019-03-11 08:55:58 +08:00
  • 2e65154206 - v2 token format changed - DisableUser - clear all tokens when disable user - handle ding ding user leave event gazebo 2019-03-09 20:59:18 +08:00