puhui999
|
de828e3d04
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
# Conflicts:
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/BargainActivityController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/BargainActivityCreateReqVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/BargainActivityRespVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/BargainActivityUpdateReqVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/activity/BargainActivityCreateReqVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/activity/BargainActivityPageReqVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/product/BargainProductBaseVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/combination/vo/activity/CombinationActivityPageReqVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/bargain/BargainActivityConvert.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/combination/CombinationActivityConvert.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/seckill/seckillactivity/SeckillActivityConvert.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/bargain/BargainActivityDO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/bargain/BargainProductDO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationActivityMapper.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainActivityService.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainActivityServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityServiceImplTest.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
|
2023-08-14 21:42:11 +08:00 |
|
puhui999
|
e2a8f7b389
|
fix: 完善订单发货逻辑、重构砍价活动、完善拼团记录创建逻辑
|
2023-08-14 21:26:07 +08:00 |
|
puhui999
|
651725e3e8
|
fix: 完善订单发货逻辑、重构砍价活动、完善拼团记录创建逻辑
|
2023-08-14 21:20:03 +08:00 |
|
天天写BUG
|
a8223fc4f2
|
!1 fix: posgres sql
Merge pull request !1 from 天天写BUG/master
|
2023-08-13 17:35:01 +00:00 |
|
decan
|
e6f4d649aa
|
fix: postgres sql
|
2023-08-14 01:32:46 +08:00 |
|
YunaiV
|
36da5d69b0
|
1、增加 App 的文件上传接口
|
2023-08-13 22:02:29 +08:00 |
|
YunaiV
|
715c42574f
|
订单：
1、订单评价的接入
|
2023-08-13 21:44:48 +08:00 |
|
YunaiV
|
7dc398717a
|
订单：
1、实现确认收货接口
|
2023-08-13 20:27:19 +08:00 |
|
YunaiV
|
503c996acd
|
订单：
1、移除 deliverStatus 发货状态，暂时没作用
2、无需发货时，使用 logisticsId 进行实现
3、订单详情，增加 logisticsId 和 logisticsName 返回
|
2023-08-13 20:12:24 +08:00 |
|
YunaiV
|
e159b2e500
|
code review：砍价的代码
|
2023-08-13 00:49:35 +08:00 |
|
YunaiV
|
ba31d5f6fb
|
优化拼团活动的管理后台代码
|
2023-08-13 00:06:46 +08:00 |
|
xingyu
|
baa2e69cdf
|
fix: vben codegen
|
2023-08-12 18:31:16 +08:00 |
|
xingyu
|
1a999cbb75
|
chore: up mybatis-plus 3.5.3.2
|
2023-08-12 18:09:19 +08:00 |
|
xingyu
|
b55c1b942d
|
perf: vben 2.0 codegen
|
2023-08-12 17:31:33 +08:00 |
|
YunaiV
|
6fdd4da0b3
|
优化秒杀活动的管理后台代码
|
2023-08-12 16:05:47 +08:00 |
|
YunaiV
|
ebf4ac1d5a
|
优化 README.md，从 .image 读取图片
|
2023-08-12 00:43:12 +08:00 |
|
YunaiV
|
3bfaa3d5c3
|
优化 README.md，从 .image 读取图片
|
2023-08-12 00:27:04 +08:00 |
|
YunaiV
|
be2ee905df
|
code review：积分模块的实现
|
2023-08-11 23:49:20 +08:00 |
|
芋道源码
|
4177071758
|
!560 todo修改
Merge pull request !560 from QingX/feature/mall_product
|
2023-08-11 14:44:52 +00:00 |
|
YunaiV
|
5fcd0a21da
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
|
2023-08-11 22:44:20 +08:00 |
|
YunaiV
|
ee53d2ad51
|
修复租户套餐修改时，查询角色报错问题
|
2023-08-11 22:24:01 +08:00 |
|
YunaiV
|
9ff67b479f
|
!562 优化 redisCache
|
2023-08-11 21:46:53 +08:00 |
|
芋道源码
|
8960a82978
|
!562 优化 redisCache
Merge pull request !562 from wanwan/feature/redis_cache_optimize_20230810
|
2023-08-11 12:09:10 +00:00 |
|
YunaiV
|
b5515799dc
|
!557 修改创建菜单时permission为空，缓存KEY 为空的BUG
|
2023-08-11 19:32:26 +08:00 |
|
YunaiV
|
b53bfb0976
|
Merge branch 'feature/deps' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2023-08-11 19:21:44 +08:00 |
|
芋道源码
|
aadf2778fe
|
!556 修复表格固定列不设置宽度时布局错误问题
Merge pull request !556 from BladeX/master
|
2023-08-11 11:19:31 +00:00 |
|
芋道源码
|
815755fa3a
|
!557 修改创建菜单时permission为空，缓存KEY 为空的BUG
Merge pull request !557 from 杜继强/master
|
2023-08-11 11:12:32 +00:00 |
|
芋道源码
|
a97e06b460
|
!558 支付模块微信App统一下单返回值解析错误
Merge pull request !558 from 马铃薯头/master
|
2023-08-11 11:08:09 +00:00 |
|
芋道源码
|
1130434b02
|
!559 update yudao-ui-admin/src/views/infra/fileConfig/index.vue.
Merge pull request !559 from 账号已删除/N/A
|
2023-08-11 11:05:44 +00:00 |
|
芋道源码
|
4d0873374f
|
!561 fix:修复新建租户时由于data_scope_dept_ids为空值，产生的错误导致插入不成功。
Merge pull request !561 from 天天写BUG/master
|
2023-08-11 11:04:32 +00:00 |
|
YunaiV
|
27b8202053
|
微调支付收银界面，缺少 success 参数
|
2023-08-11 09:22:22 +08:00 |
|
wanwan
|
134e5ca20f
|
feat: 将 redisCache 的扫描策略设置成 scan
|
2023-08-10 15:27:19 +08:00 |
|
wanwan
|
64c8dd6292
|
feat: 拓展 支持自定义过期时间的 RedisCacheManager 使支持自定义过期时间单位
|
2023-08-10 15:27:03 +08:00 |
|
wanwan
|
c4a7da9233
|
Revert "feat: 拓展 支持自定义过期时间的 RedisCacheManager 使支持自定义过期时间单位"
This reverts commit 47698bfc6c.
|
2023-08-10 15:26:31 +08:00 |
|
wanwan
|
e1fe21f24c
|
Revert "feat: 将 redisCache 的扫描策略设置成 scan"
This reverts commit 72d2dcc68f.
|
2023-08-10 15:26:25 +08:00 |
|
jlc@yoc.tech
|
47698bfc6c
|
feat: 拓展 支持自定义过期时间的 RedisCacheManager 使支持自定义过期时间单位
|
2023-08-10 11:50:18 +08:00 |
|
jlc@yoc.tech
|
72d2dcc68f
|
feat: 将 redisCache 的扫描策略设置成 scan
|
2023-08-10 11:26:44 +08:00 |
|
天天写BUG
|
f221f58973
|
update sql/postgresql/ruoyi-vue-pro.sql.
fix:修复创建新租户，由于data_scope_dept_ids设置的是 not null 但是是空值时候产生错误，插入失败
Signed-off-by: 天天写BUG <decan_zheng@foxmail.com>
|
2023-08-09 15:29:09 +00:00 |
|
xiaqing
|
93effe8fa7
|
新版表结构
|
2023-08-09 22:43:14 +08:00 |
|
xiaqing
|
d397758dd1
|
还原配置文件
|
2023-08-09 22:39:12 +08:00 |
|
xiaqing
|
8f43fba629
|
会员积分针对代码格式、功能优化
1.修改积分抵扣单位
|
2023-08-09 22:31:55 +08:00 |
|
xiaqing
|
bae94d06ac
|
会员积分针对代码格式、功能优化
1.优化todo建议
2.删除无用代码
|
2023-08-09 20:59:45 +08:00 |
|
xiaqing
|
33323c1483
|
会员签到针对代码格式、功能优化
1.优化todo建议
2.删除无用代码
|
2023-08-09 16:13:35 +08:00 |
|
账号已删除
|
bcf7dd0917
|
update yudao-ui-admin/src/views/infra/fileConfig/index.vue.
FTP传输模式文字错误
Signed-off-by: 账号已删除 <1100014+leniy@user.noreply.gitee.com>
|
2023-08-09 00:27:59 +00:00 |
|
xlsea
|
ead8741393
|
调用微信App v3支付渠道返回参数解析错误
|
2023-08-08 09:12:50 +08:00 |
|
杜继强
|
14c7465bc6
|
修改创建菜单时permission为空，缓存KEY 为空的BUG ，判断 reqVO.permission 为空时，不做 @CacheEvict 的操作
|
2023-08-08 00:13:23 +08:00 |
|
zhijiantianya@gmail.com
|
ba59ec85e0
|
code review 各种活动
|
2023-08-07 19:30:26 +08:00 |
|
芋道源码
|
0219e6d907
|
!555 完善拼团、秒杀、砍价活动管理
Merge pull request !555 from puhui999/feature/mall_product
|
2023-08-07 10:58:30 +00:00 |
|
Wyl
|
b052c8457a
|
修复表格固定列不设置宽度时布局错位
|
2023-08-07 13:37:37 +08:00 |
|
puhui999
|
384359c9d4
|
fix: 完善拼团、秒杀、砍价活动管理
|
2023-08-06 20:21:53 +08:00 |
|