liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
263 Commits 4 Branches 0 Tags
22e96a02322cb4ebeae51f353f3f98287c642fc8
Commit Graph

95 Commits

Author SHA1 Message Date
gazebo
22e96a0232 - refactor Infof for sku info update. 2018-08-10 23:11:58 +08:00
gazebo
5d66c1f6aa - change elm vendor_sku_id from skuId to vfoodId. 2018-08-10 15:53:35 +08:00
gazebo
dd9afa4248 - handle ShopPrice. 2018-08-10 15:21:33 +08:00
lyb
1eb7a1ff03 访问京东API，获取结账必要信息。 2018-08-10 11:13:51 +08:00
lyb
3bc6608e1f 访问京东API，获取结账必要信息。 2018-08-10 11:02:06 +08:00
lyb
c45858e4e9 重修代码 2018-08-10 10:17:21 +08:00
lyb
a873eb5a06 修改错误代码 2018-08-09 18:47:36 +08:00
lyb
f281f4e7ab 访问京东API，获取结账必要信息。 2018-08-09 16:43:36 +08:00
lyb
98c80cfb08 Merge remote-tracking branch 'remotes/origin/master' into jx-callback 2018-08-09 16:39:23 +08:00
lyb
0ef674c072 访问京东API，获取结账必要信息。 2018-08-09 16:37:38 +08:00
gazebo
8bb1badb2c - refactor cancel waybill reason. 2018-08-08 14:20:25 +08:00
gazebo
d0ed9cae4f - record cancel reason for dada. 
- revert Infof to Warnf when WaybillStatusFailed.
 2018-08-07 11:24:34 +08:00
gazebo
73223c5c11 - handle dada UpdateTime. 2018-08-07 11:06:23 +08:00
gazebo
70cc74893f - handle call ReaddOrder when second times Add waybill on dada. 2018-08-06 14:45:22 +08:00
gazebo
afe31e0db7 - reorganize purchase platform interface, split Swith2SelfDeliver and SelfDelivery. 2018-08-04 23:08:16 +08:00
gazebo
a3082910a2 - fix dada origin_mark_no error. 2018-08-04 15:18:14 +08:00
gazebo
423b087e70 - fix remark bug 
- write to temp_log when create mtps error.
 2018-08-03 16:39:07 +08:00
gazebo
4862649d77 - handle exceptional msg(e.g. userapplycancel, lock, unlock). 2018-08-03 15:55:00 +08:00
gazebo
a5fd029457 - auto call SelfDeliverDelievering in Swtich2SelfDeliver for elm. 2018-08-03 15:41:03 +08:00
gazebo
edd934233f - enable dada. 2018-08-03 11:38:57 +08:00
gazebo
1e4bbc3dd6 - ommit nowrow error. 2018-08-03 09:55:45 +08:00
gazebo
91e4638b70 - add orderID info. 2018-08-03 09:43:49 +08:00
gazebo
4ebd17e793 - fix bug, orm.Read need fields name. 2018-08-03 09:34:20 +08:00
gazebo
aedf0c7eeb - don't unrolling order status. 2018-08-03 09:22:11 +08:00
gazebo
fbef61c768 - add remark in orderstatus table. 
- check order.waybill vendor id in swtich2SelfDeliverWithRetry.
 2018-08-02 18:07:54 +08:00
gazebo
b6b41a703b - record addFee in temp_log. 2018-08-02 09:55:50 +08:00
gazebo
0d759218c1 - write important error msg to db. 2018-08-02 09:24:18 +08:00
gazebo
9fd340abfa - handle mtps create waybill error. 
- log accept or decline order error with info level.
 2018-08-01 12:13:27 +08:00
gazebo
7afa99620a - add poi_seq when creating mtps waybill. 
- cancel waybill in new msg when order status already end.
 2018-07-31 20:29:55 +08:00
gazebo
88470319f5 - systemd and ansbile files added. 2018-07-31 14:49:32 +08:00
gazebo
075e936dc0 - use actual price when creating waybill. 2018-07-31 09:57:30 +08:00
gazebo
2933392731 - retry logic in swtich2SelfDeliverWithRetry implemented. 
- when WaybillStatusCanceled received, will create new waybill when order.WaybillVendorID is unknown.
- don't treat mtps exception msg as failed.
- when waybill delivered msg received, set order delivered anyway.
 2018-07-30 21:02:16 +08:00
gazebo
0615758d9a - limit mtps max addfee to 200. 2018-07-30 17:45:38 +08:00
gazebo
a7d63caf08 - limit dada cargoprice to 63.99 2018-07-30 16:28:25 +08:00
gazebo
0464042d49 - comment modified for elm order price info. 2018-07-30 14:48:16 +08:00
gazebo
7fae4dd52a - renmae PickedUpGoods to PickupGoods. 2018-07-30 07:58:43 +08:00
gazebo
5c4d34554f - build version, git info added. 2018-07-29 20:43:25 +08:00
gazebo
58e91a8f5c - avoid duplicaated sku name when creating mtps bill. 2018-07-29 17:08:42 +08:00
gazebo
cbf72ac85d - fix early miscommit pendingOrderGapMax. 
- don't update order status when it's already finished.
 2018-07-28 22:20:24 +08:00
gazebo
5bcd49c1fa - scatter pending order when starting up(avoid access db simultaneously). 2018-07-28 13:15:15 +08:00
gazebo
7734399392 - elm self delivery support. 2018-07-28 12:03:21 +08:00
gazebo
ad93408e4c - change elm autoaccept delay to 270 seconds. 2018-07-27 17:01:17 +08:00
gazebo
7ac054afed - fix bug in onWaybillNew, jd and elm self waybillID always as orderID 2018-07-27 15:06:51 +08:00
gazebo
cdaae1c1fa - handle isPending in OnWaybillStatusChanged. 2018-07-26 22:28:36 +08:00
gazebo
96912cdcb9 - waybillStatus.Status > model.WaybillStatusUnknown in OnWaybillStatusChanged and OnOrderStatusChanged. 2018-07-26 21:27:01 +08:00
gazebo
5f4af9ced0 - fixed some price bug. 2018-07-26 16:49:21 +08:00
gazebo
2b481691bf - timer changed (TimerTypeBaseExpectedDeliveredTime). 2018-07-26 14:08:28 +08:00
gazebo
925fe454ac - fk. 2018-07-26 11:32:54 +08:00
gazebo
1e3cbbec50 - add OrderStatusFinishedPickup in legacyMapOrderStatus. 2018-07-26 11:16:25 +08:00
gazebo
33fb46040c - fixed get latest order status bug. 
- add GoodsOrder.VendorWaybillID.
 2018-07-26 09:38:21 +08:00