Commit Graph

27 Commits

Author SHA1 Message Date
5ac93618a6 日志记录 2024-04-29 09:59:48 +08:00
ecae487993 Merge remote-tracking branch 'origin/master' into feature
# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/config/MybatisPlusConfig.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/StorageVo.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbUserStorage.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbMerchantAccountMapper.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbProducSkutMapper.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbProductMapper.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbUserStorageMapper.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/rest/StorageController.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/ShopService.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/ShopServiceImpl.java
#	eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductSku.java
#	eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbMerchantRegisterServiceImpl.java
2024-04-29 09:46:09 +08:00
liuyingfang
19ff867dee 首页数据改正 2024-04-18 11:44:11 +08:00
34610aace9 支付统计 增加时间筛选 2024-04-03 15:26:47 +08:00
5f633fefb6 版本管理(控制LDBA-APP 零点八零)
字典复用
2024-04-02 14:27:06 +08:00
a3da1826fa redis key
订单管理 查询接口
2024-03-13 11:52:29 +08:00
0e1833fe32 商品删除时 删除库存缓存 2024-03-12 14:04:27 +08:00
liuyingfang
11af368005 首页相关逻辑,商品表中isShow给予不同含义,创建新用户更改 2024-03-12 10:05:09 +08:00
ce3ef6b8d3 库存记录 存入redis 2024-03-11 18:32:56 +08:00
liuyingfang
bcfa3f9984 增加时间方法,增加汇总部分数据,分类更改 2024-03-11 09:07:11 +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
2477e2171e 空值校验 2024-03-05 17:07:21 +08:00
liuyingfang
c6744bc012 更改商品bug 2024-03-05 16:38:12 +08:00
liuyingfang
4bfdc5546a Merge branch 'feature' of https://gitee.com/liuyingfang/cashier-admin into feature 2024-03-05 15:36:54 +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
b1f6a494e6 序列化 2024-03-04 10:36:47 +08:00
liuyingfang
0a70a66807 更改目录结构 2024-03-02 18:31:44 +08:00