Commit Graph

787 Commits

Author SHA1 Message Date
gazebo
b2d365e36f - rf. 2018-09-15 09:15:40 +08:00
gazebo
da6c411c74 Merge remote-tracking branch 'origin/master' into jxstore 2018-09-14 15:44:24 +08:00
gazebo
9c2c8e4b8e - ComposeSkuName. 2018-09-14 15:21:49 +08:00
gazebo
f14112c030 - skuName place bind man. 2018-09-12 23:15:54 +08:00
gazebo
7f4c125279 - sku man. 2018-09-11 16:20:27 +08:00
gazebo
70bf5a522a - move some funcs from jxtools to dao. 2018-09-11 11:38:31 +08:00
gazebo
d71b0e6763 - handle store.Status. 2018-09-09 14:54:17 +08:00
gazebo
fc05f326b7 - store man almost ok. 2018-09-09 12:32:24 +08:00
gazebo
8c130a15a4 - all db orm use beego orm, don't use gorm anymore. 2018-09-08 12:55:39 +08:00
gazebo
b714e445a4 Merge branch 'master' into jxstore 2018-09-07 14:01:18 +08:00
gazebo
eeed813c46 - switch doamin to jx.scaqda 2018-09-07 13:56:09 +08:00
gazebo
64b5afb6e7 Merge branch 'master' into jxstore 2018-09-04 22:20:05 +08:00
gazebo
deca8efb96 - auth for weixin. 2018-09-04 21:23:51 +08:00
gazebo
70d5ae5dd1 - cms store management. 2018-09-03 18:28:37 +08:00
gazebo
3538371333 - make master compilable. 2018-08-30 00:32:57 +08:00
gazebo
0f68d904bd - treat DeliveryStatusFailedGetGoods as WaybillStatusFailed for jd waybill
- adjust defsch.
2018-08-29 21:37:48 +08:00
gazebo
bb049bb28b - order.DeliveryFlag added. 2018-08-24 10:03:34 +08:00
gazebo
643bcac0f8 - order manager added. 2018-08-21 17:18:08 +08:00
gazebo
2b4e2ee1e9 - fix bug in SplitSkuName. 2018-08-16 10:26:24 +08:00
gazebo
ea5a0c6428 - fk. 2018-08-15 14:12:42 +08:00
gazebo
f5f3805470 - send weixin msg more accurately. 2018-08-11 16:37:16 +08:00
gazebo
c0770e9ab5 - big refactor for scheduler. 2018-07-25 20:43:41 +08:00
gazebo
479ce46200 - fixed a bug in defsch.init, replace LoadOrder with GetOrder.
- dynamic table name for legacy order related table.
2018-07-23 17:30:22 +08:00
gazebo
ae214d38b9 - timer task shceuled to order goroutine to avoid concurrent problem. 2018-07-22 23:11:20 +08:00
gazebo
7ae0944fc9 - log msg refactor, add orderID to all logs. 2018-07-22 16:44:44 +08:00
gazebo
ae6198220c - min timeout scattered.
- fix LoadPendingOrders bug when there is no waybill.
2018-07-22 01:06:34 +08:00
gazebo
77c1dd07b5 - refactor
- load pending orders, fixed bug.
2018-07-22 00:19:38 +08:00
gazebo
1958f24705 - handle pending orders and waybills when starting. 2018-07-21 12:57:20 +08:00
gazebo
65eeef9966 - fix weixin push msg bug.
- handle jd out-of-order msg.
2018-07-20 23:22:31 +08:00
gazebo
6f0d27e54d - fix weixin bug. 2018-07-20 20:36:34 +08:00
gazebo
40aa67546c - send weixin msg to me. 2018-07-20 18:39:26 +08:00
gazebo
6ec928611d - avoid openid is null. 2018-07-20 18:21:10 +08:00
gazebo
da46c3396e - weixin msg added.
- elm sometimes have no delivery msg
- elm sometimes delivery msg arrvied before finished pickup
- the gap between finished pickup and first delivery msg is big
2018-07-20 18:10:14 +08:00
gazebo
fb2cd82e20 - move some funcs from controller to jxutils. 2018-07-19 21:20:18 +08:00
gazebo
a56cb64f8e - delivery fee added.
- fixed scheduler bug
2018-07-19 18:05:40 +08:00
gazebo
3098740dce - bug fix. 2018-07-19 12:18:36 +08:00
gazebo
cc9e1dc5d2 - first version of order schedule. 2018-07-18 22:52:30 +08:00