Commit Graph

479 Commits

Author SHA1 Message Date
liuyingfang
827cad38b4 Merge branch 'feature' of https://gitee.com/liuyingfang/cashier-admin into feature
# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbShopCategoryQueryCriteria.java
#	eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbShopCategoryServiceImpl.java
2024-03-11 09:11:04 +08:00
liuyingfang
bcfa3f9984 增加时间方法,增加汇总部分数据,分类更改 2024-03-11 09:07:11 +08:00
1eef8f2c5c 修改店铺登录密码 2024-03-08 19:59:51 +08:00
3b59b87cf5 订单管理 付款统计
手动修改密码的示例 readme.md
2024-03-08 16:38:02 +08:00
2c96f2835a 订单分类 注解 2024-03-08 11:57:38 +08:00
cdf85e3940 异常响应
订单管理 查询支付统计
2024-03-08 10:38:40 +08:00
e0291db00d 异常打印 2024-03-07 18:30:46 +08:00
ebbf0ba08d 商品分类
异常打印
2024-03-07 18:27:35 +08:00
liuyingfang
ee8f860b13 汇总部分数据,分类逻辑更改,规格去空格 2024-03-07 18:01:20 +08:00
liuyingfang
55ca50ad1b 新增规格逻辑修改,新增激活码到期时间,激活码时间校验 2024-03-07 09:00:14 +08:00
45d9319811 接口拦截 日志打印 自定义异常输出 2024-03-06 19:12:45 +08:00
245c7b706d 请求日志打印 2024-03-06 15:56:50 +08:00
liuyingfang
0f46ddf8c9 新增规格逻辑修改,新增激活码到期时间,激活码时间校验 2024-03-06 14:42:56 +08:00
liuyingfang
cfbabc1fb3 解决数组越界 2024-03-05 19:54:58 +08:00
liuyingfang
c6744bc012 更改商品bug 2024-03-05 16:38:12 +08:00
liuyingfang
5463204fb5 Merge branch 'feature' of https://gitee.com/liuyingfang/cashier-admin into feature 2024-03-05 16:13:28 +08:00
2c29f26fc8 实体类转换 2024-03-05 16:11:02 +08:00
liuyingfang
4bfdc5546a Merge branch 'feature' of https://gitee.com/liuyingfang/cashier-admin into feature 2024-03-05 15:36:54 +08:00
bb3fcfa769 订单信息表修改 2024-03-05 15:35:14 +08:00
d1fd229bf4 商品分组 2024-03-05 15:19:57 +08:00
liuyingfang
4b56000c7d Merge branch 'feature' of https://gitee.com/liuyingfang/cashier-admin into feature 2024-03-05 13:43:30 +08:00
c092c469b3 订单管理 导出 2024-03-05 13:42:31 +08:00
liuyingfang
ec17ff6f8d Merge branch 'feature' of https://gitee.com/liuyingfang/cashier-admin into feature
# Conflicts:
#	eladmin-common/src/main/java/cn/ysk/cashier/config/RedisConfig.java
#	eladmin-system/src/main/java/cn/ysk/cashier/controller/order/TbOrderInfoController.java
#	eladmin-system/src/main/java/cn/ysk/cashier/dto/order/TbOrderInfoDto.java
2024-03-05 09:57:41 +08:00
liuyingfang
66f5c82c9d redis更改,登录部分修改 2024-03-05 09:53:19 +08:00
c6103ca00f redis key过期 业务处理 2024-03-05 09:41:41 +08:00
48f43f7c4d redis key过期 监听 2024-03-04 19:25:37 +08:00
1b1c69cfa4 redis key失效监听 2024-03-04 15:58:05 +08:00
liuyingfang
ebe5c2123b 更改员工相关逻辑,支付方式部分调整 2024-03-04 13:52:15 +08:00
liuyingfang
0a70a66807 更改目录结构 2024-03-02 18:31:44 +08:00