Commit Graph

1154 Commits

Author SHA1 Message Date
gazebo
09b2a14f4a - fix bug in CreateWaybillOnProvidersEx(forget return bills and err) 2019-01-31 09:48:47 +08:00
gazebo
d420aa68fe - add param valueMask to UpdateEntityLogicallyAndUpdateSyncStatus
- judge change content in UpdateSku
- support change sku spec
2019-01-31 09:46:23 +08:00
gazebo
a0cecdc4c6 - support modify sku spec (commented) 2019-01-30 18:18:25 +08:00
gazebo
8433a06ab3 - remove temp comment
- guard UpdateSkuBaseInfo by globals.EnableStoreWrite
2019-01-30 16:11:29 +08:00
gazebo
a6a4b3daa0 - must SkuFixedStatusOffline and then SkuFixedStatusDeleted when del spu 2019-01-30 15:31:43 +08:00
gazebo
db55aae19e - fix bug can not real del spu in syncSkuNameAsSpu. 2019-01-30 15:17:00 +08:00
gazebo
e68f246ad2 - try to refactor syncSkuNameAsSpu 2019-01-30 15:05:37 +08:00
gazebo
a4a46ac092 - try to remove useless code(fake skuid handler) in syncSkuNameAsSpu 2019-01-30 14:32:18 +08:00
gazebo
a61d047f5e - add dao.SetWeiXinsEmpty2Null
- call SetWeiXinsEmpty2Null in BindMobile2Store and AddMobile2Mobile
2019-01-30 14:13:58 +08:00
gazebo
735ec2faa5 - change 请忽略 to 无 2019-01-30 11:42:58 +08:00
gazebo
72b23a5b8a - return correct jdID and jdSyncStatus in GetSkuNames 2019-01-29 11:54:09 +08:00
gazebo
14b24bc110 - set WX_MINI_TO_SHOW_MSG = "pages/msg-page/main?msgID=%d&msgStatusID=%d" 2019-01-29 11:39:56 +08:00
gazebo
946164d138 - CreateWaybillOnProvidersEx use all possible courier vendor(not just MTPS). 2019-01-29 10:44:38 +08:00
gazebo
9ed9175938 - tiny refactor 2019-01-29 09:36:58 +08:00
gazebo
e3f91906a1 - fix bug in splitAddParams 2019-01-29 09:26:56 +08:00
gazebo
7463967398 - remove sku category sync for jd
- refactor addParams(spuAddParams, skuAddParams) for func syncSkuNameAsSpu
2019-01-29 09:06:59 +08:00
gazebo
97a3e53d22 - add param shopName to SendFilesToStores 2019-01-28 16:44:11 +08:00
gazebo
2f43aec72f - add cms.constant shopChineseNames 2019-01-28 16:23:15 +08:00
gazebo
a2fe9d8519 - fix bug in GetStoreSkus when store sku is not focused. 2019-01-28 15:10:21 +08:00
gazebo
a7167de7bf - order/GetOrders new param:orderID 2019-01-28 15:05:48 +08:00
gazebo
3787eabfc3 - only delete temp password whecn bind successfully 2019-01-28 14:32:45 +08:00
gazebo
33199f8dc8 - fk 2019-01-28 14:17:07 +08:00
gazebo
34533022c5 - BindMiniProgram bind mini program directly. 2019-01-28 14:06:21 +08:00
gazebo
d4ffffb593 - up 2019-01-28 13:46:36 +08:00
gazebo
bc1ac33874 - BindMiniProgram 2019-01-28 12:26:26 +08:00
gazebo
eaee327de2 - debu 2019-01-28 11:11:05 +08:00
gazebo
7e0ca7afef - debug 2019-01-28 11:09:44 +08:00
gazebo
0f61a15b97 - in RefreshMissingDadaStores, update dada shop when shop already exist. 2019-01-28 10:47:24 +08:00
gazebo
0fb0653818 Merge branch 'master' into jxstore 2019-01-27 19:13:30 +08:00
gazebo
f2e8b48f8e - restore new weixin msg to on new order msg 2019-01-27 19:12:36 +08:00
gazebo
600d66568c - add created_at, updated_at, last_operator to WeiXins 2019-01-26 16:53:14 +08:00
gazebo
51dd016bac - fix bug in getSNSInfoFromCache 2019-01-26 16:34:23 +08:00
gazebo
aba16383fe - refactor weixin and mini program login 2019-01-26 16:02:01 +08:00
gazebo
ab53a4b61d - wsc order expectDeliveryTime 2019-01-26 10:31:08 +08:00
gazebo
c3b8d54602 - set wsc order BusinessType to BusinessTypeImmediate 2019-01-26 10:18:26 +08:00
gazebo
574c68e479 - fk 2019-01-26 09:26:06 +08:00
gazebo
9ef7ead456 - fk 2019-01-26 09:18:09 +08:00
gazebo
b413a76bb1 - fk 2019-01-26 09:13:48 +08:00
gazebo
a3ee632843 - set correct OrderSeq for wsc order 2019-01-26 09:07:23 +08:00
gazebo
9f6d96f912 - return platform id and sync status in GetStore 2019-01-25 17:57:50 +08:00
gazebo
fcdc373848 - refactor order status for weimob 2019-01-25 17:05:58 +08:00
gazebo
088b613905 - first update shop id, then status, then other property for ebai shop, because shop property can not be changed after approved 2019-01-25 16:13:48 +08:00
gazebo
d6adfb23cc - fk 2019-01-25 15:28:06 +08:00
gazebo
a06c285c96 - fk 2019-01-25 15:26:14 +08:00
gazebo
f5bbd7914d - fix bug in GetStoreDeliveryType 2019-01-25 14:53:43 +08:00
gazebo
66121f135e - fk 2019-01-25 14:50:09 +08:00
gazebo
a322256a44 - move NotifyNewOrder for OnOrderNew to handleAutoAcceptOrder(to avoid send auto rejected order) 2019-01-25 14:41:37 +08:00
gazebo
0af50522a1 - try to fix index out of range bug in AddStoreVendorMap. 2019-01-25 14:16:02 +08:00
gazebo
547447caad - handle weimob order correctly in orderman_ext 2019-01-25 12:28:46 +08:00
gazebo
f3b7a0e84e ! format func EarthDistance params from lat, lng1... to lng1, lat1... 2019-01-25 11:41:33 +08:00