Commit Graph

354 Commits

Author SHA1 Message Date
lyb
dad4ab5d73 访问京东API,获取结账必要信息。 2018-08-10 10:19:03 +08:00
lyb
c45858e4e9 重修代码 2018-08-10 10:17:21 +08:00
gazebo
f5fd65f6ea - change generateLegacyJxOrder to false.
- move substore info from goods_order to order_sku.
2018-08-09 21:25:36 +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
ca40c54080 - change Warnf to Infof in model.WaybillStatusFailed. 2018-08-09 09:35:01 +08:00
gazebo
8bb1badb2c - refactor cancel waybill reason. 2018-08-08 14:20:25 +08:00
gazebo
702aac1b00 - change several abnormal case caused by out of order msg to Infof. 2018-08-08 14:03:49 +08:00
gazebo
c430b997f9 - change default value of Jxstorefeature. 2018-08-07 16:05:33 +08:00
gazebo
d0ed9cae4f - record cancel reason for dada.
- revert Infof to Warnf when WaybillStatusFailed.
2018-08-07 11:24:34 +08:00
gazebo
d3f4b0079f - change Warnf to Infof in WaybillStatusFailed. 2018-08-07 11:18:24 +08:00
gazebo
73223c5c11 - handle dada UpdateTime. 2018-08-07 11:06:23 +08:00
gazebo
937c889867 - fk. 2018-08-07 10:07:23 +08:00
gazebo
4fbe4ee6f5 - fk. 2018-08-07 09:45:40 +08:00
gazebo
4937119334 - fk. 2018-08-07 09:44:15 +08:00
gazebo
01acd04ed2 - fix deploy error. 2018-08-07 09:41:19 +08:00
gazebo
19ddce7834 - make root dir clean. 2018-08-07 09:35:38 +08:00
gazebo
460c4ab45b - treat purchase platform waybill come later as normal. 818810379000941 2018-08-06 17:40:24 +08:00
gazebo
70cc74893f - handle call ReaddOrder when second times Add waybill on dada. 2018-08-06 14:45:22 +08:00
gazebo
30e3c484b4 - change access freshfood timeout to 2 seconds. 2018-08-06 11:42:38 +08:00
gazebo
afe31e0db7 - reorganize purchase platform interface, split Swith2SelfDeliver and SelfDelivery. 2018-08-04 23:08:16 +08:00
gazebo
9d40bbc85b - handle OnWaybillStatusChanged Delivered order(%d, %s) bill(%d, %s), bill:%v shouldn't get here.
- 1223633660228537567
2018-08-04 20:39:37 +08:00
gazebo
a3082910a2 - fix dada origin_mark_no error. 2018-08-04 15:18:14 +08:00
gazebo
7e6293f514 - fix comment. 2018-08-03 17:54:01 +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
886d2b1f15 - OrderStatusFinishedPickup can call SelfDeliverDelievered. 2018-08-03 12:44:23 +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
ba98cf1e27 - don't treat multiple accept as warning.
- every time jd dada create new bill, must wait some time.
2018-08-02 17:12:35 +08:00
gazebo
02e50139e0 - allow create waybill in delivering status. 2018-08-02 12:09:50 +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
f0ea5f1186 - pickup error as info. 2018-08-01 17:55:01 +08:00
gazebo
ab6efb48ab - waybill retry count set to 3. 2018-08-01 15:30:43 +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
95e27e6803 - fix bug, calling resetTimer should give correct isPending. 2018-08-01 10:38:45 +08:00
gazebo
cd3a4b651a - change jx-callback.service Requires MySQL to Wants MySQL.
- don't treat CreateWaybill fail as warning.
2018-08-01 10:23:59 +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
4fd0e8d359 - bug output warning in addWaybill2Map fixed(reversed). 2018-07-31 16:21:56 +08:00
gazebo
45970ca08b - backup when copy files to remote to deploy. 2018-07-31 15:59:18 +08:00
gazebo
c7f35cd6a3 - rumode. 2018-07-31 15:25:00 +08:00
gazebo
85b7fcc05f - fix conf/app.conf 2018-07-31 15:22:50 +08:00