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

Commit Graph

  • 735ec2faa5 - change 请忽略 to 无 gazebo 2019-01-30 11:42:58 +08:00
  • 72b23a5b8a - return correct jdID and jdSyncStatus in GetSkuNames gazebo 2019-01-29 11:54:09 +08:00
  • 14b24bc110 - set WX_MINI_TO_SHOW_MSG = "pages/msg-page/main?msgID=%d&msgStatusID=%d" gazebo 2019-01-29 11:39:56 +08:00
  • 946164d138 - CreateWaybillOnProvidersEx use all possible courier vendor(not just MTPS). gazebo 2019-01-29 10:44:38 +08:00
  • 9ed9175938 - tiny refactor gazebo 2019-01-29 09:36:58 +08:00
  • e3f91906a1 - fix bug in splitAddParams gazebo 2019-01-29 09:26:56 +08:00
  • 7463967398 - remove sku category sync for jd - refactor addParams(spuAddParams, skuAddParams) for func syncSkuNameAsSpu gazebo 2019-01-29 09:06:59 +08:00
  • 97a3e53d22 - add param shopName to SendFilesToStores gazebo 2019-01-28 16:44:11 +08:00
  • 2f43aec72f - add cms.constant shopChineseNames gazebo 2019-01-28 16:23:15 +08:00
  • a2fe9d8519 - fix bug in GetStoreSkus when store sku is not focused. gazebo 2019-01-28 15:10:21 +08:00
  • a7167de7bf - order/GetOrders new param:orderID gazebo 2019-01-28 15:05:48 +08:00
  • 3787eabfc3 - only delete temp password whecn bind successfully gazebo 2019-01-28 14:32:45 +08:00
  • 33199f8dc8 - fk gazebo 2019-01-28 14:17:07 +08:00
  • 34533022c5 - BindMiniProgram bind mini program directly. gazebo 2019-01-28 14:06:21 +08:00
  • d4ffffb593 - up gazebo 2019-01-28 13:46:36 +08:00
  • bc1ac33874 - BindMiniProgram gazebo 2019-01-28 12:26:26 +08:00
  • eaee327de2 - debu gazebo 2019-01-28 11:11:05 +08:00
  • 7e0ca7afef - debug gazebo 2019-01-28 11:09:44 +08:00
  • 0f61a15b97 - in RefreshMissingDadaStores, update dada shop when shop already exist. gazebo 2019-01-28 10:47:24 +08:00
  • 0fb0653818 Merge branch 'master' into jxstore gazebo 2019-01-27 19:13:30 +08:00
  • f2e8b48f8e - restore new weixin msg to on new order msg gazebo 2019-01-27 19:12:36 +08:00
  • 600d66568c - add created_at, updated_at, last_operator to WeiXins gazebo 2019-01-26 16:53:14 +08:00
  • 51dd016bac - fix bug in getSNSInfoFromCache gazebo 2019-01-26 16:34:23 +08:00
  • aba16383fe - refactor weixin and mini program login gazebo 2019-01-26 16:02:01 +08:00
  • ab53a4b61d - wsc order expectDeliveryTime gazebo 2019-01-26 10:31:08 +08:00
  • c3b8d54602 - set wsc order BusinessType to BusinessTypeImmediate gazebo 2019-01-26 10:18:26 +08:00
  • 574c68e479 - fk gazebo 2019-01-26 09:26:06 +08:00
  • 9ef7ead456 - fk gazebo 2019-01-26 09:18:09 +08:00
  • b413a76bb1 - fk gazebo 2019-01-26 09:13:48 +08:00
  • a3ee632843 - set correct OrderSeq for wsc order gazebo 2019-01-26 09:07:23 +08:00
  • 9f6d96f912 - return platform id and sync status in GetStore gazebo 2019-01-25 17:57:50 +08:00
  • fcdc373848 - refactor order status for weimob gazebo 2019-01-25 17:05:58 +08:00
  • 088b613905 - first update shop id, then status, then other property for ebai shop, because shop property can not be changed after approved gazebo 2019-01-25 16:13:48 +08:00
  • d6adfb23cc - fk gazebo 2019-01-25 15:28:06 +08:00
  • a06c285c96 - fk gazebo 2019-01-25 15:26:14 +08:00
  • f5bbd7914d - fix bug in GetStoreDeliveryType gazebo 2019-01-25 14:53:43 +08:00
  • 66121f135e - fk gazebo 2019-01-25 14:50:09 +08:00
  • a322256a44 - move NotifyNewOrder for OnOrderNew to handleAutoAcceptOrder(to avoid send auto rejected order) gazebo 2019-01-25 14:41:37 +08:00
  • 0af50522a1 - try to fix index out of range bug in AddStoreVendorMap. gazebo 2019-01-25 14:16:02 +08:00
  • 547447caad - handle weimob order correctly in orderman_ext gazebo 2019-01-25 12:28:46 +08:00
  • f3b7a0e84e ! format func EarthDistance params from lat, lng1... to lng1, lat1... gazebo 2019-01-25 11:41:33 +08:00
  • 367fff9321 - debug wsc.arrangeSaleStore gazebo 2019-01-25 11:28:50 +08:00
  • 028fe25424 - DeliveryOrder in wsc gazebo 2019-01-25 10:59:10 +08:00
  • 963d2e2622 - only set status.Status = model.OrderStatusNew when status.Status > model.OrderStatusNew in OnOrderNew gazebo 2019-01-25 10:26:21 +08:00
  • 8100e2be88 - add new order status OrderStatusWait4Pay - handle weimob wsc order status OrderStatusWait4Pay gazebo 2019-01-25 09:14:40 +08:00
  • 052170c1cb - create dada store as BusinessTypeConvStore gazebo 2019-01-24 21:41:09 +08:00
  • bd92371e84 - wsc schedule. gazebo 2019-01-24 18:19:38 +08:00
  • ac291b287c - refactor temp op gazebo 2019-01-24 17:58:00 +08:00
  • ee5f522be3 - debug gazebo 2019-01-24 16:23:48 +08:00
  • aabfe99fdd - update wsc editStockNum correctly gazebo 2019-01-24 16:08:44 +08:00
  • 0379b59a24 - update WscID2 in SyncStoreSkus gazebo 2019-01-24 15:42:09 +08:00
  • 9c3bb08834 - dao.SetStoreCategorySyncStatus - call SetStoreCategorySyncStatus in wsc.FullSyncStoreSkus gazebo 2019-01-24 15:25:52 +08:00
  • 8903eafb67 - fix Str2Int64 error in wsc.SyncStoreSkus gazebo 2019-01-24 15:16:49 +08:00
  • 16a3261bd1 - refactor CalculateOrderDeliveryFee - use QueryDeliverFee and AddOrderAfterQuery for dada gazebo 2019-01-24 14:34:49 +08:00
  • 3bceb5b6b0 - return UpdateEntity error in SyncSku gazebo 2019-01-24 10:53:55 +08:00
  • 20500cf1db - set weimobapi client timeout to 120 seconds to upload img. gazebo 2019-01-24 10:52:59 +08:00
  • 3cc9433b46 - add param nameIDs to UploadWeimobImg4SkuName gazebo 2019-01-24 10:52:24 +08:00
  • 55385ab563 - change SendFilesToStores.title to optional. gazebo 2019-01-23 19:59:57 +08:00
  • 3a0f47790f - refactor order deliveryType gazebo 2019-01-23 18:31:34 +08:00
  • fb894c94f8 - don't limit sku status in GetStoreSkus - add deleted_at limit for some func gazebo 2019-01-23 15:22:50 +08:00
  • 7882fac0fd - miss use table store_courier_map in GetMissingDadaStores gazebo 2019-01-23 14:31:08 +08:00
  • 84d696fbe5 - up gazebo 2019-01-23 14:06:33 +08:00
  • 148b64f659 - avoid "Transaction has already been committed or rolled back" in RefreshMissingDadaStores gazebo 2019-01-23 14:02:58 +08:00
  • 083c837a78 - fk gazebo 2019-01-23 12:01:40 +08:00
  • 97407eb339 - fk gazebo 2019-01-23 11:29:23 +08:00
  • dcf2072efa - debug msg for auth gazebo 2019-01-23 11:17:08 +08:00
  • d745e3899c - RefreshMissingDadaStores - auto acreate dada store when link jd store gazebo 2019-01-23 11:08:42 +08:00
  • c354b28960 - upc for jd UpdateSkuBaseInfo gazebo 2019-01-22 17:20:13 +08:00
  • a8a047d577 - fix bug, we place upc on skuname, but jd is on sku gazebo 2019-01-22 16:49:36 +08:00
  • 41165851db - change beta jd token gazebo 2019-01-22 15:23:44 +08:00
  • 1bd26ec1fb - change all msg to miniprogram. gazebo 2019-01-22 14:52:43 +08:00
  • a051912b20 - arrange weimob wsc order (to local store) gazebo 2019-01-22 14:45:24 +08:00
  • d0bed4f40a - refactor GetJxStoreIDFromOrder - add IsOrderPlatformWaybill gazebo 2019-01-22 10:19:37 +08:00
  • d21bdd4aec - enable miniprogram test store gazebo 2019-01-21 23:13:36 +08:00
  • 64f2c371af - wsc gazebo 2019-01-21 22:46:46 +08:00
  • 9c3e9a89df - fix miniPageURL bug in SendMsgToStore gazebo 2019-01-21 18:28:41 +08:00
  • b8074d1990 - fk gazebo 2019-01-21 18:21:19 +08:00
  • 670283a152 - comment gazebo 2019-01-21 17:08:53 +08:00
  • 3df42afb7e - add test miniprogram gazebo 2019-01-21 16:42:09 +08:00
  • f096b1da8e - test test miniprogram - support WSC vendor order id gazebo 2019-01-21 16:16:11 +08:00
  • 35b39816b3 - remove a space gazebo 2019-01-20 10:14:51 +08:00
  • ae65388913 - change weimob callback gazebo 2019-01-19 11:36:12 +08:00
  • c675ac56b0 - change content type for callback msg weimob gazebo 2019-01-19 11:29:33 +08:00
  • a41686fb56 - weimob order callback gazebo 2019-01-19 11:06:20 +08:00
  • 267a13d166 - stop jd promotion.scheduleRoutine gazebo 2019-01-18 18:43:35 +08:00
  • 0e01ba8f8a - raise error when modify not created ebai sku. gazebo 2019-01-18 18:36:07 +08:00
  • 870dc9cc8c - order by sku spec in SyncSku gazebo 2019-01-18 17:30:14 +08:00
  • 2169484361 - refactor SyncSku, group by skuName gazebo 2019-01-18 16:50:05 +08:00
  • b46326672a - fix bug in syncSkuNameAsSpu near IsFakeID gazebo 2019-01-18 15:10:09 +08:00
  • 915c115a5b - only update weimob token on prod env. gazebo 2019-01-18 11:13:13 +08:00
  • 1ca8ca6751 - only handle dirty sku in SyncSku gazebo 2019-01-18 10:58:07 +08:00
  • 249fdadf9a - SendFilesToStores add param title gazebo 2019-01-18 10:39:00 +08:00
  • 4105497874 - sync.SyncSku add param isContinueWhenError gazebo 2019-01-18 10:33:28 +08:00
  • 7d1f0e294d - first edition of weimob wsc. gazebo 2019-01-18 09:56:19 +08:00
  • 8ea6a9a339 - partner.DeleteRemoteStoreSkus gazebo 2019-01-17 11:15:11 +08:00
  • 46c01bdac2 - restrict t3.deleted_at in jd.SyncStoreSkus gazebo 2019-01-16 17:30:56 +08:00
  • d4328040f8 - fk gazebo 2019-01-16 12:00:35 +08:00
  • aa4e2ce7de - fk. gazebo 2019-01-16 11:56:36 +08:00
  • 8d267069b0 - force ignore DeleteRemoteSkus error in ebai.FullSyncStoreSkus gazebo 2019-01-16 11:45:33 +08:00
  • ec31b69982 - handle weimob token expire is not 7200 gazebo 2019-01-15 16:19:53 +08:00