|
|
28f927536c
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/main/java/com/gxwebsoft/shop/entity/ShopCoupon.java
|
2025-08-12 00:02:14 +08:00 |
|
|
|
cce8c76c86
|
feat(shop): 添加优惠券管理和用户优惠券管理功能
- 新增 ShopCoupon 和 ShopUserCoupon 实体类
- 实现优惠券和用户优惠券的 CRUD 操作
- 添加分页查询、批量操作等接口
- 集成权限控制和操作日志记录refactor(shop): 重构Shop模块的实体类和映射文件
- 更新了多个实体类的创建时间和修改时间字段类型，从Date改为LocalDateTime
- 优化了部分实体类的属性结构，移除了不必要的字段
- 更新了多个Mapper接口的作者信息
- 为ShopUserRefereeController添加了权限控制注解
|
2025-08-11 23:57:23 +08:00 |
|
|
|
cfc0b3ff38
|
新增优惠券使用
|
2025-08-11 20:36:19 +08:00 |
|
|
|
ba97d65f34
|
1、新增礼品卡模块
2、完善优惠券
|
2025-08-11 19:20:54 +08:00 |
|
|
|
753821c442
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/main/java/com/gxwebsoft/common/core/utils/WechatCertAutoConfig.java
# src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java
|
2025-08-11 12:24:26 +08:00 |
|
|
|
735f9b6f90
|
feat(shop): 添加优惠券管理和用户优惠券管理功能
- 新增 ShopCoupon 和 ShopUserCoupon 实体类
- 实现优惠券和用户优惠券的 CRUD 操作
- 添加分页查询、批量操作等接口
- 集成权限控制和操作日志记录
|
2025-08-11 09:49:27 +08:00 |
|
|
|
0c58ced973
|
新增：买家备注、商家备注字段
|
2025-08-11 00:17:35 +08:00 |
|
|
|
5804d7bbbf
|
优化：收货信息设计方案
|
2025-08-10 23:18:31 +08:00 |
|
|
|
0ba7c44d28
|
优化：订单模块、发货模块
|
2025-08-10 23:03:37 +08:00 |
|
|
|
864d52b43e
|
测试11
|
2025-08-10 14:31:53 +08:00 |
|
|
|
c02e280ba4
|
测试11
|
2025-08-10 14:31:06 +08:00 |
|
|
|
a5c9dda2a1
|
修复：商品描述过长导致支付失败的bug
|
2025-08-10 13:31:21 +08:00 |
|
|
|
4a1fa6911e
|
修复：商品描述过长导致支付失败的bug
|
2025-08-10 13:30:37 +08:00 |
|
|
|
7c3188fbf6
|
修复支付证书的路径拼接规则
|
2025-08-10 13:12:06 +08:00 |
|
|
|
5d55376ea7
|
新增分佣
|
2025-08-10 03:10:39 +08:00 |
|
|
|
22dbd529a6
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/main/resources/application-dev.yml
|
2025-08-10 02:52:10 +08:00 |
|
|
|
3cfc32aae2
|
修复支付证书的拼接规则。
|
2025-08-10 02:51:38 +08:00 |
|
|
|
d83becb7cb
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-08-10 02:34:22 +08:00 |
|
|
|
4623b6f5d1
|
修复支付证书的路径拼接规则
|
2025-08-10 02:32:24 +08:00 |
|
|
|
df72d20971
|
配置数据信息
|
2025-08-09 23:41:31 +08:00 |
|
|
|
41c95f2508
|
配置数据信息
|
2025-08-09 23:40:37 +08:00 |
|
|
|
93957ccf25
|
用新那台服务器的数据库
|
2025-08-09 23:19:41 +08:00 |
|
|
|
647299f906
|
配置数据信息
|
2025-08-09 20:52:04 +08:00 |
|
|
|
45faa257bc
|
数据信息
|
2025-08-09 20:48:05 +08:00 |
|
|
|
c75ae0b867
|
配置数据信息
|
2025-08-09 20:47:26 +08:00 |
|
|
|
c861e26f5c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-08-09 20:24:06 +08:00 |
|
|
|
e7276b3e98
|
数据信息
|
2025-08-09 20:23:48 +08:00 |
|
|
|
07a963b665
|
修复优惠券模块导致的bug运行不起来
|
2025-08-09 18:13:56 +08:00 |
|
|
|
8ef39e573b
|
运行不起来了
|
2025-08-09 17:18:30 +08:00 |
|
|
|
c93eeaa5e3
|
修复优惠券模块
|
2025-08-09 16:44:32 +08:00 |
|
|
|
d214e4b3cc
|
修复优惠券模块
|
2025-08-09 16:12:08 +08:00 |
|
|
|
a7b7589b2a
|
修复代码生成器
|
2025-08-09 15:51:45 +08:00 |
|
|
|
a036e65247
|
修复代码生成器
|
2025-08-09 15:42:06 +08:00 |
|
|
|
e3f3b4c4dd
|
修复代码生成器
|
2025-08-09 15:27:54 +08:00 |
|
|
|
d4eab27ab9
|
修复下单接口
|
2025-08-09 14:53:55 +08:00 |
|
|
|
dfa7791e25
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/main/java/com/gxwebsoft/shop/dto/OrderCreateRequest.java
# src/main/java/com/gxwebsoft/shop/service/OrderBusinessService.java
|
2025-08-09 14:46:00 +08:00 |
|
|
|
eb1f5efc10
|
修复下单接口
|
2025-08-09 14:43:47 +08:00 |
|
|
|
975a90792d
|
合并远程分支，解决房产模块排序功能冲突
|
2025-08-09 11:21:41 +08:00 |
|
|
|
b0f9eaefa1
|
并入后台管理端（vue）和小程序端的代码(template-10550)
|
2025-08-08 23:04:17 +08:00 |
|
|
|
a0f4fcc03f
|
1
|
2025-08-07 14:01:43 +08:00 |
|
|
|
7b108828a8
|
修改：uploadPath的配置值和的file路径拼接
|
2025-08-07 12:10:50 +08:00 |
|
|
|
61fbef5a48
|
删除：CmsOrder、CmsProduct系列、CmsComponents等模块
|
2025-08-06 13:40:47 +08:00 |
|
|
|
9695dc69b2
|
删除：CmsOrder、CmsProduct系列、CmsComponents等模块
|
2025-08-06 13:39:49 +08:00 |
|
|
|
013916230e
|
修复：订单查询条件
|
2025-08-05 21:34:55 +08:00 |
|
|
|
2611171407
|
修复房产模块的排序功能
|
2025-08-04 15:25:42 +08:00 |
|
|
|
fe03c3cd01
|
统计订单总金额
|
2025-08-04 07:09:01 +08:00 |
|
|
|
7883a7291f
|
统计订单总金额
|
2025-07-30 18:38:47 +08:00 |
|
|
|
2b761eb4b9
|
修复订单商品没有排序字段的bug
|
2025-07-30 15:41:45 +08:00 |
|
|
|
77713e9ad8
|
修复订单商品没有排序字段的bug
|
2025-07-30 02:21:41 +08:00 |
|
|
|
82c5c7f174
|
1、保存订单商品，2、验证参数是否合法
|
2025-07-30 01:52:37 +08:00 |
|
