Commit Graph

361 Commits

Author SHA1 Message Date
gazebo
cf26f57b6c - change UpdateStore to FUpdateStore for a fucking bug. 2018-09-07 09:44:06 +08:00
gazebo
d575ed5cb0 - make gorm.DB singleton. 2018-09-06 22:29:08 +08:00
gazebo
5814b27af4 - return totalCount for GetStores. 2018-09-06 15:14:11 +08:00
gazebo
1e3715456d - comment 2018-09-06 09:50:17 +08:00
gazebo
88e1ba29e7 Merge branch 'master' into jxstore 2018-09-05 23:20:41 +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
0faaa6b366 - mobile sms verify added. 2018-09-05 18:03:53 +08:00
gazebo
76b03bf86f - funcs added to IPurchasePlatformHandler. 2018-09-05 16:24:07 +08:00
gazebo
e734fdb425 Merge branch 'master' into jxstore 2018-09-05 14:21:52 +08:00
gazebo
1ed1838802 - mtps Cancel reason all to merchant others. 2018-09-05 12:22:04 +08:00
gazebo
9e8ed7d600 - Login data fixed to formData 2018-09-05 11:46:51 +08:00
gazebo
26f5c26def - combile SearchStores and GetStores to one func. 2018-09-05 10:24:30 +08:00
gazebo
b6a8f22612 - localpass. 2018-09-05 10:06:12 +08:00
gazebo
ad6cabe89d - localpass added. 2018-09-05 10:04:00 +08:00
gazebo
64b5afb6e7 Merge branch 'master' into jxstore 2018-09-04 22:20:05 +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
d979b645bd Merge branch 'master' into jxstore 2018-09-03 18:30:56 +08:00
gazebo
8f5288c771 - fix toke to token. 2018-09-03 18:30:32 +08:00
gazebo
70d5ae5dd1 - cms store management. 2018-09-03 18:28:37 +08:00
gazebo
426fe7c570 - cms place ok. 2018-09-03 11:56:56 +08:00
gazebo
945431d566 - basic cms structure. 2018-09-02 19:11:54 +08:00
gazebo
d46bc8981a Merge branch 'master' into jxstore 2018-08-31 15:26:40 +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
29d358af5e - jd basic api(category, sku, store management) finished. 2018-08-30 15:22:26 +08:00
gazebo
7774fd0995 - remove fk. 2018-08-30 15:18:03 +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