221 Commits

Author SHA1 Message Date
linlinjava
c13ccea867 Merge branch 'dev' of https://github.com/linlinjava/litemall into dev 2021-01-14 23:54:03 +08:00
Longmain
46d2a4e080 完成收藏功能针对topic的实现 (#456) 2021-01-14 23:52:08 +08:00
linlinjava
35bf2e5492 feat[litemall-admin,litemall-admin-api]:订单收款 2020-11-29 14:16:58 +08:00
linlinjava
c4da8fb5b0 chore: druid升级1.2.1 2020-11-01 18:22:10 +08:00
lagelanren
a54ba21386 serverTimezone=UTC 导致数据库取出来时间早8个小时 (#420) 2020-07-28 21:53:41 +08:00
laiyingzeng
0262f38cf8 解决mysql-connector-java为8.0.16时MyBatis Generator无法生成XXXByPrimaryKey相关方法 (#418)
Co-authored-by: laiyingzeng <laiyingzeng@gmail.com>
2020-07-19 23:33:45 +08:00
linlinjava
2365bed6f4 chore: 数据库驱动名称更新 2020-07-05 13:30:49 +08:00
dependabot[bot]
25518ade9f build(deps): bump mysql-connector-java in /litemall-db (#411)
Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 5.1.46 to 8.0.16.
- [Release notes](https://github.com/mysql/mysql-connector-j/releases)
- [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES)
- [Commits](https://github.com/mysql/mysql-connector-j/compare/5.1.46...8.0.16)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-03 10:43:00 +08:00
Junling Bu
0395ecd391 Merge branch 'master' of https://github.com/linlinjava/litemall 2020-06-26 09:14:13 +08:00
Tyson
7836237d70 修复优惠券优惠金额计算错误bug (#406) 2020-06-26 09:12:14 +08:00
九月家的敖烈
2b481b4337 更正sql中litemall_aftersale表的deleted字段的注释 2020-06-22 21:50:59 +08:00
Tyson
d611977ca4 优惠券支持分类和指定商品使用 (#398) 2020-06-14 11:04:21 +08:00
Tyson
a2f77152d8 修复订单取消/退款之后优惠券没有返还问题 (#397) 2020-06-08 22:09:41 +08:00
Junling Bu
64d6621929 chore: 评论可以空 2020-05-29 00:14:41 +08:00
Junling Bu
48404a3cd8 chore[litemall-wx]: 海报 2020-05-21 23:29:41 +08:00
Junling Bu
13192ba320 #380 2020-05-03 21:34:48 +08:00
Junling Bu
cf6f59d811 feat[litemall-admin, litemall-admin-api]: 支持订单删除。 2020-03-22 20:12:46 +08:00
Junling Bu
6d35c40efc fix: #341 2020-02-15 15:06:55 +08:00
Junling Bu
5e0bd4c0af perf[litemall-admin,litemall-admin-api]: 订单页面可以查询订单时间 2020-02-13 11:19:41 +08:00
Junling Bu
11a95ac7ee feat[litemall-db]: 订单表增加售后状态字段 2020-02-12 21:07:04 +08:00
Junling Bu
62921c2e74 Merge branch 'pull/340' 2020-02-10 22:24:21 +08:00
Junling Bu
f692b26e25 Merge branch 'yinggang' of https://github.com/sunyinggang/litemall-1 into sunyinggang-yinggang 2020-02-10 22:23:55 +08:00
Junling Bu
84ce042c79 aaa 2020-02-10 22:22:59 +08:00
sunyinggang
4bbe33d799 商品评论回复功能 2020-02-10 20:59:54 +08:00
Junling Bu
f64f7d12f6 feat[litemall-db]: 数据库添加售后表 litemall_aftersale 2020-02-09 23:16:22 +08:00
Junling Bu
366a293412 feat[litemall-db]: SQL添加通知表和通知管理员表 2020-02-03 23:24:32 +08:00
Junling Bu
3487f5d6cb feat[litemall-core]: 支持数据库备份操作 2020-01-18 21:51:29 +08:00
Junling Bu
1aa9f87d7d feat[litemall-admin, litemall-admin-api]: 专题支持批量删除 2020-01-14 23:23:08 +08:00
Junling Bu
d5d6e481ae Merge branch 'master' into dev 2020-01-09 21:14:04 +08:00
wtune
91c74f8e5d add index on litemall_goods_product.goods_id (#330) 2020-01-09 21:13:04 +08:00
wtune
85bbb8d59e add index on litemall_groupon_rules.goods_id (#332) 2020-01-09 21:12:53 +08:00
wtune
983dfb6f1e add index on litemall_coupon.code (#334) 2020-01-09 21:12:37 +08:00
wtune
85aa4cab6d add index on litemall_storage.key (#328) 2020-01-09 21:12:15 +08:00
Junling Bu
d2ff854e25 chore[litemall-db]: 数据库脚本设置允许任意ip访问。 2020-01-08 21:32:24 +08:00
Junling Bu
35d874ef5e chore: 删除微信模板实现(微信官方已经不支持) 2019-12-31 21:11:24 +08:00
Junling Bu
4c46da9ba1 chore[litemall-core, litemall-db]: 两个模块的Application类移至测试目录 2019-12-29 18:17:44 +08:00
Junling Bu
613d2dba20 fix[litemall-db]: 手动mapper文件需设置订单退款相关字段 2019-12-17 00:14:33 +08:00
Junling Bu
0d017bde77 feat[litemall-db]: 订单表记录部分退款信息 2019-12-16 23:14:58 +08:00
Junling Bu
0735137816 fix[litemall-admin-api]: 更新操作有误 2019-12-14 10:38:38 +08:00
Junling Bu
d6f243d8d8 perf: 团购代码优化 2019-12-08 19:23:52 +08:00
Junling Bu
eff4862dc8 feat[litemall-db]: 团购litemall_groupn和litemall_groupon_rules表调整 2019-12-08 19:20:55 +08:00
Junling Bu
e9d284f595 fix[litemall-admin, litemall-admin-api]: #293 2019-12-01 22:26:59 +08:00
Junling Bu
e211b61ded #176 2019-11-24 15:17:06 +08:00
Junling Bu
285d164314 feat[litemall-wx-api]: 系统启动时,查询数据库,创建订单超时未支付任务 2019-11-13 23:04:49 +08:00
beaver383
69f9daefa9 团购拼团和超期取消 2019-10-12 13:51:22 +08:00
beaver383
898942fa82 修复订单确认页优惠券问题 2019-10-09 15:43:40 +08:00
Junling Bu
9aca5a86ae fix 2019-09-28 23:26:34 +08:00
Junling Bu
7f11a6a13f fix[litemall-db, litemall-wx-api]: #271 2019-09-28 23:12:26 +08:00
Junling Bu
dc5d017768 chore: #253 2019-08-15 22:56:05 +08:00
sober
23ef05ac76 bug fix (#221)
中文逗号
2019-06-30 13:12:07 +08:00