168 Commits

Author SHA1 Message Date
cjh
de4cc4d73f 好友管理 2025-02-24 18:10:38 +08:00
pikachu1995@126.com
159fe37120 支持店铺通过excel批量更新商品库存功能 2024-06-27 17:09:25 +08:00
pikachu1995@126.com
6f9486f065 优化订单导出功能。 2024-06-26 11:50:45 +08:00
lele0521
6deed61311 fix: 增加商家订单备注功能 2024-05-11 09:21:27 +08:00
chc
a962939db8 库存预警功能 2024-01-18 11:44:08 +08:00
chc
085dad2107 库存预警功能回退 2024-01-16 10:10:07 +08:00
chc
6cea6af59b 分包裹发货,库存预警 2024-01-11 13:33:13 +08:00
misworga831
02dd37c87f fix: 优化商品单位不能为空 2023-09-19 17:12:28 +08:00
misworga831
63f1f0df21 fix: 修复权限更新后,登录用户权限没有更新问题。 2023-06-06 18:06:41 +08:00
misworga831
5d6e99dc8a fix: 移除@Resource注解,修复权限更新后,登录用户权限没有更新问题。 2023-06-06 17:26:04 +08:00
chc
49b2c2f7a3 fix: 导入商品增加填写验证 2023-05-08 18:35:57 +08:00
Chopper711
7b6a150bd2 fix: 用户被禁用、店铺被禁用、管理员被禁用,token未被清除问题处理。 2023-04-19 12:08:47 +08:00
pikachu1995@126.com
4737cc5ae8 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop 2023-03-27 11:01:21 +08:00
pikachu1995@126.com
97845bbaf5 修改订单金额不能小于等于0 2023-03-27 11:00:50 +08:00
chc
da28859398 fix: 关闭物流公司无效问题 2023-03-24 16:27:20 +08:00
chc
06fb54c65c feat: 集成顺丰开放平台功能,增加商家忘记密码,手机号登录功能 2023-03-08 10:32:47 +08:00
pikachu1995@126.com
98907b33aa 存储新增:腾讯云、华为云
短信新增:腾讯云、华为云
物流新增:快递100
物流查询方式新增:快递查询地图轨迹
2023-02-16 18:16:37 +08:00
chc
6df2b92bc6 增加IM接口 2023-01-31 18:03:14 +08:00
paulGao
5080cf65c7 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg 2023-01-10 14:34:52 +08:00
Chopper711
cc12cecc2a merge 自提、IM功能 2023-01-09 18:00:40 +08:00
paulGao
8ddba831f0 feat: 增加根据促销活动搜索商品索引。增加获取优惠券领取记录。增加优惠券关闭后同时作废所有会员领取的优惠券。 2023-01-05 14:39:23 +08:00
chc
54e04be768 im 2022-11-24 18:13:30 +08:00
chc
cfd292ef18 自提 2022-11-22 17:20:17 +08:00
paulGao
65d9efef94 fix: 增加店员错误信息回
2022-11-18 10:15:50 +08:00
Chopper711
66c0200457 '商家楼层装修权限放开' 2022-11-14 09:31:20 +08:00
Chopper711
e244883165 '两个装修类合并' 2022-11-14 09:21:35 +08:00
Chopper711
e78ea60644 '限制演示站点部分功能' 2022-11-11 15:18:48 +08:00
paulGao
9df9e33ce1 fix: 优化代码 2022-11-02 19:54:57 +08:00
paulGao
0b6aa9e857 fix: 优化代码 2022-11-02 19:43:38 +08:00
chc
e8e2e8e315 v4.2.5 2022-10-21 11:27:28 +08:00
chc
5a1c6b9e7f v4.2.5 2022-10-21 11:26:55 +08:00
paulGao
88db57c64b fix: 修复查询系统日志报错问题,修复添加直播商品报错问题 2022-09-20 19:06:21 +08:00
paulGao
cbdcb6f1ce fix: 修复查询满减活动和优惠券活动报错问题 2022-09-14 17:11:26 +08:00
chc
2d4cf29da8 导出功能,福禄清除 2022-09-02 10:31:35 +08:00
chc
2648a0b57e 店员,商品导入,sql 2022-09-01 18:53:12 +08:00
chc
b873ec2095 电子面单接口完善,商家导入商品功能 2022-08-31 17:37:07 +08:00
fengtianyangyang
05f29a264e 启动报错 2022-08-09 20:26:40 +08:00
fengtianyangyang
26dd8ed13a Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop into fengtianyangyang_clerk
 Conflicts:
	DB/version4.2.3toMASTER.sql
	common-api/src/main/java/cn/lili/controller/common/SiteController.java
	common-api/src/main/java/cn/lili/controller/common/UploadController.java
	config/application.yml
	framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java
	framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
	framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
	framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java
2022-08-09 18:54:19 +08:00
paulGao
7b535434ae 代码优化,修复订单投诉问题 2022-07-04 18:31:36 +08:00
caihongcheng
b91c8e34c2 电子面单 2022-05-09 09:27:30 +08:00
paulGao
37c5ce541b 优化楼层装修 2022-04-17 21:46:34 +08:00
fengtianyangyang
4cdb461c22 配置文件修改及sql 2022-04-07 17:35:22 +08:00
fengtianyangyang
6bef12b91b '合并' 2022-03-03 18:36:42 +08:00
fengtianyangyang
5b4113be4d Merge branch 'clerk' of https://gitee.com/beijing_hongye_huicheng/lilishop
 Conflicts:
	config/application.yml
2022-03-03 18:05:32 +08:00
fengtianyangyang
a82d3fe57c '店员权限bug处理合并' 2022-03-03 18:03:04 +08:00
fengtianyangyang
4d551366ed Merge branches 'clerk' and 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop into clerk 2022-03-03 17:44:53 +08:00
fengtianyangyang
441cb6ddcb '代码合并' 2022-03-03 17:22:13 +08:00
itheinjury@163.com
f14efa2612 BUG修改 2022-03-03 16:11:08 +08:00
itheinjury@163.com
a52b672e9b 更新,BUG修改 2022-03-02 15:17:06 +08:00
lifenlong
504ee766f8 店铺楼层装修 2022-02-28 09:08:43 +08:00