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 |
|
gazebo
|
79ed0a7929
|
- cancel waybill reason added.
- api operator added.
- token added.
|
2018-08-22 16:06:47 +08:00 |
|
gazebo
|
5afe95d422
|
- fix some annotation.
|
2018-08-22 14:14:10 +08:00 |
|
gazebo
|
72f468b580
|
- fixed panic bug in GetStoreOrderCountInfo.
|
2018-08-22 12:01:56 +08:00 |
|
gazebo
|
5bcba91308
|
- auto gen router info.
|
2018-08-22 10:57:18 +08:00 |
|
gazebo
|
0b9189cb87
|
- paging added for GetStoreOrderInfo.
- GetStoreOrderCountInfo added.
|
2018-08-22 09:41:02 +08:00 |
|
gazebo
|
d44950d6db
|
- consider status wrong as normal for in defsch.
|
2018-08-21 20:56:49 +08:00 |
|
gazebo
|
d18e53e9f4
|
- handle num == 0 in GetOrderSkuInfo.
|
2018-08-21 18:16:59 +08:00 |
|
gazebo
|
c1db460666
|
- fixed wrong image in GetOrderSkuInfo.
|
2018-08-21 17:36:20 +08:00 |
|
gazebo
|
643bcac0f8
|
- order manager added.
|
2018-08-21 17:18:08 +08:00 |
|
gazebo
|
c29bcea27c
|
- refactor.
|
2018-08-20 18:07:02 +08:00 |
|
gazebo
|
b74a5e4379
|
- update courier_name and courier_mobile on event >= model.WaybillStatusAccepted and < model.WaybillStatusEndBegin.
|
2018-08-20 15:30:59 +08:00 |
|
gazebo
|
b69bac1182
|
- use auto router for callback msg.
- first normal demo api FinishedPickup added.
|
2018-08-20 15:08:36 +08:00 |
|
gazebo
|
eeeab319fa
|
- rough sku.
|
2018-08-20 10:58:45 +08:00 |
|
gazebo
|
c5db19045d
|
- continue refactoring...
|
2018-08-17 16:42:16 +08:00 |
|
gazebo
|
d40186e930
|
- refactor file structure.
|
2018-08-17 13:59:15 +08:00 |
|
gazebo
|
d872d4d0ec
|
- fix bug in resetTimer(wrong place for handling autoPickupTimeoutMinute > 1).
|
2018-08-17 09:41:16 +08:00 |
|
gazebo
|
78c7409631
|
- autopickup config to store.
|
2018-08-16 14:37:30 +08:00 |
|
gazebo
|
2b4e2ee1e9
|
- fix bug in SplitSkuName.
|
2018-08-16 10:26:24 +08:00 |
|
gazebo
|
d27caab804
|
- fix create waybill fail msg.
|
2018-08-16 09:59:40 +08:00 |
|
gazebo
|
97c9955ed8
|
- disable manually click delivery finished warning.
|
2018-08-15 22:08:29 +08:00 |
|
gazebo
|
ea5a0c6428
|
- fk.
|
2018-08-15 14:12:42 +08:00 |
|
gazebo
|
da889ff944
|
- fix bug in order.addOrderStatus.
|
2018-08-13 18:26:41 +08:00 |
|
gazebo
|
bd3a51b0a9
|
- avoid panic in setOrederDetailFee.
|
2018-08-13 15:50:11 +08:00 |
|
gazebo
|
ff1d223933
|
- don't cancel master waybill when received order delivered msg.
|
2018-08-13 11:59:07 +08:00 |
|
gazebo
|
41d2d4bce9
|
- Info to Infof.
|
2018-08-13 11:34:34 +08:00 |
|
gazebo
|
ef78e9f64b
|
- it's normal when order finished mesg comes before purchase platform waybill delivered msg.
|
2018-08-13 09:05:29 +08:00 |
|
gazebo
|
bb14ae6e72
|
- disable store sku price related warning(too many).
|
2018-08-12 19:03:49 +08:00 |
|
gazebo
|
f5f3805470
|
- send weixin msg more accurately.
|
2018-08-11 16:37:16 +08:00 |
|
gazebo
|
75a0f77c6f
|
- change call freshfodd timeout to 2.5 seconds.
|
2018-08-11 08:31:31 +08:00 |
|
gazebo
|
27682fe85f
|
- fixed sql error.
|
2018-08-11 08:29:11 +08:00 |
|
gazebo
|
e9f6ae07df
|
- fix format error.
|
2018-08-10 23:49:09 +08:00 |
|
gazebo
|
030e364b06
|
Merge remote-tracking branch 'refs/remotes/origin/master'
|
2018-08-10 23:13:38 +08:00 |
|
gazebo
|
22e96a0232
|
- refactor Infof for sku info update.
|
2018-08-10 23:11:58 +08:00 |
|
XJH-Rosy
|
21f33b7e5a
|
Accept Merge Request #3: (lyb -> master)
Merge Request: 实时从饿了么平台API获取数据。
Created By: @LYB-Rosy
Accepted By: @XJH-Rosy
URL: https://coding.net/u/XJH-Rosy/p/jx-callback/git/merge/3
|
2018-08-10 17:38:26 +08:00 |
|