Commit Graph

352 Commits

Author SHA1 Message Date
gazebo
22ab40db16 - test. 2018-09-17 14:44:18 +08:00
gazebo
3f2a2f524a - test. 2018-09-17 14:42:34 +08:00
gazebo
2bc8500714 - support alpha deploy. 2018-09-17 14:38:02 +08:00
gazebo
d8e585e86d - don't register legacy order tables when GenerateLegacyJxOrder is not enabled. 2018-09-17 11:08:48 +08:00
gazebo
9c2c8e4b8e - ComposeSkuName. 2018-09-14 15:21:49 +08:00
gazebo
52041a142e - ebai 2018-09-11 22:22:13 +08:00
gazebo
60ea461e39 - disable call QuerySingleOrder when received DeliveryStatusAccepted msg. 2018-09-09 18:21:40 +08:00
gazebo
8add72eb34 ! remove all non order code. 2018-09-07 16:57:04 +08:00
gazebo
eeed813c46 - switch doamin to jx.scaqda 2018-09-07 13:56:09 +08:00
gazebo
6a4a84826e - jd unlockOrder msg added. 2018-09-07 11:50:04 +08:00
gazebo
686256be3e - change price store to 100961/163183405. 2018-09-07 10:37:34 +08:00
gazebo
f44f947629 - change mtps extra fee time from 11:30-13:00 to 11:00-14:00 2018-09-05 23:19:22 +08:00
gazebo
c52e8deade - fix calculateOrderDeliveryFee bug for weight. 2018-09-05 22:48:15 +08:00
gazebo
1ed1838802 - mtps Cancel reason all to merchant others. 2018-09-05 12:22:04 +08:00
gazebo
d9031612e1 - copy swagger files. 2018-09-04 22:02:37 +08:00
gazebo
deca8efb96 - auth for weixin. 2018-09-04 21:23:51 +08:00
gazebo
1dda77ee3a - redirect added. 2018-09-04 16:31:00 +08:00
gazebo
5966b397d0 - weixinsns. 2018-09-04 15:54:51 +08:00
gazebo
8f5288c771 - fix toke to token. 2018-09-03 18:30:32 +08:00
gazebo
de1622e0cc - use modified bee tool to automatically generate parameters validation code to avoid dirty work. 2018-08-31 15:23:25 +08:00
gazebo
3538371333 - make master compilable. 2018-08-30 00:32:57 +08:00
gazebo
f7f536078a - OrderAcceptOperate only return one result. 2018-08-29 23:25:06 +08:00
gazebo
0f68d904bd - treat DeliveryStatusFailedGetGoods as WaybillStatusFailed for jd waybill
- adjust defsch.
2018-08-29 21:37:48 +08:00
gazebo
55ef8e9ea3 - fix sync LockStatus bug in orderman.addOrderStatus. 2018-08-28 13:57:40 +08:00
gazebo
f7e655ec6b - add refresh param for api GetStoreOrderInfo to get realtime CurrentConsigneeMobile. 2018-08-27 14:31:11 +08:00
gazebo
9e515aff68 - enable store sku bind warning for 100928 and 100929. 2018-08-27 11:53:26 +08:00
gazebo
ffd85f9366 - fk3 2018-08-24 17:01:58 +08:00
gazebo
4dcd8b0fb8 - fk2. 2018-08-24 16:04:06 +08:00
gazebo
538c2dddd1 - fk. 2018-08-24 15:51:17 +08:00
gazebo
e2c5e467fc - fix bug. 2018-08-24 15:32:10 +08:00
gazebo
2f19dcf546 - fix bug. 2018-08-24 15:21:49 +08:00
gazebo
bc5e4a3449 - GetOrderInfo and GetOrderWaybillInfo added. 2018-08-24 15:16:30 +08:00
gazebo
54063d2f35 - num == 0. 2018-08-24 14:25:03 +08:00
gazebo
ec410563af - use table ede_skus and jde_sku_infos to display sku image. 2018-08-24 14:17:05 +08:00
gazebo
bb049bb28b - order.DeliveryFlag added. 2018-08-24 10:03:34 +08:00
gazebo
46bbb7418c Merge branch 'jxstore' 2018-08-23 21:08:06 +08:00
gazebo
7352ca409a - temp. 2018-08-23 21:07:29 +08:00
gazebo
dc3a14b448 - limit feasible order status for CreateWaybillOnProviders. 2018-08-23 16:16:18 +08:00
gazebo
6df89a17b5 - log for external api. 2018-08-23 15:53:26 +08:00
gazebo
3f426746cf - fix calculate order shop price bug(multiple skuCount).
- map DeliveryStatusCourierCanceled to WaybillStatusAcceptCanceled for jd.
2018-08-23 15:38:03 +08:00
gazebo
d4de5b4caf - token.
- don't treat DeliveryStatusFailedGetGoods as failed delivery(jd).
2018-08-23 15:05:04 +08:00
gazebo
471007a7e9 - handle ErrNoRows in LoadOrder. 2018-08-23 14:31:57 +08:00
gazebo
91bdcad933 - change wrong tag _ to - for json. 2018-08-23 12:11:36 +08:00
gazebo
5f10f01027 - status judge. 2018-08-23 11:51:20 +08:00
gazebo
1cb266d4d1 - change Switch2SelfDeliver to SelfDelivering. 2018-08-23 09:53:52 +08:00
gazebo
50f8ee12d6 - auto route info 2018-08-23 09:47:12 +08:00
gazebo
6ddb39eebb - SelfDeliveredAndUpdateStatus added. 2018-08-23 09:45:25 +08:00
gazebo
cdd603f6ed - SkuJdCategory added. 2018-08-22 17:41:17 +08:00
XJH-Rosy
b6f99c4cf0 Accept Merge Request #6: (jxstore -> master)
Merge Request: jxstore初始版本
Created By: @XJH-Rosy
Accepted By: @XJH-Rosy
URL: https://coding.net/u/XJH-Rosy/p/jx-callback/git/merge/6
2018-08-22 17:16:04 +08:00
gazebo
4ccb8ef402 - fixed bug (error msg should set on Desc, not Data). 2018-08-22 16:28:47 +08:00