Commit Graph

15 Commits

Author SHA1 Message Date
6ba4aadccb 字典管理
资源管理
资源类型管理
团购卷订单管理
团购卷订单退款
团购卷商品(套餐商品修改与保存)
2024-05-15 16:32:34 +08:00
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
f8f3212bdb 登录时增加shopName,logo;增加支付笔数;支付笔数饼图只判断完成的订单, 2024-03-14 09:44:22 +08:00
liuyingfang
6568318806 日志增加shopId,改动打印机,增加注册时默认四种支付方式 2024-03-13 10:57:00 +08:00
3b59b87cf5 订单管理 付款统计
手动修改密码的示例 readme.md
2024-03-08 16:38:02 +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
45d9319811 接口拦截 日志打印 自定义异常输出 2024-03-06 19:12:45 +08:00
245c7b706d 请求日志打印 2024-03-06 15:56:50 +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
liuyingfang
0a70a66807 更改目录结构 2024-03-02 18:31:44 +08:00