huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-11-22 15:21:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,682 Commits 1 Branch 0 Tags 176 MiB
4dd2d80887
Commit Graph

282 Commits

Author SHA1 Message Date
owen
4dd2d80887 Merge remote-tracking branch 'origin/feature/mall_product' into member_dev 
# Conflicts:
#	sql/mysql/member_level.sql
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberExperienceLogService.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelLogService.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelLogServiceImpl.java
 2023-08-23 10:17:24 +08:00
YunaiV
54bf24b966 code review：会员等级 2023-08-22 21:59:00 +08:00
owen
ca51056c00 会员: 统一用户等级记录、用户经验记录 命名 2023-08-22 20:49:25 +08:00
owen
bdb38c4157 会员: 修改会员等级，使用单独的表单、接口 2023-08-22 11:23:09 +08:00
owen
9d9638b15b Merge remote-tracking branch 'origin/feature/mall_product' into member_dev 
# Conflicts:
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/user/MemberUserConvert.java
 2023-08-22 00:47:45 +08:00
owen
8ae3401452 会员: 增加会员分组功能 2023-08-22 00:43:36 +08:00
芋道源码
4cd5b5712b
!577 会员：修改会员标签名称唯一校验逻辑 
Merge pull request !577 from 疯狂的世界/member_dev
 2023-08-21 14:51:19 +00:00
owen
8ffbc15cec 会员：后台调整会员等级 2023-08-21 21:31:16 +08:00
owen
f884054d2c 会员：完善会员等级校验、单元测试 2023-08-21 00:23:45 +08:00
YunaiV
c3e4e23459 同步最新 Member 菜单 2023-08-20 20:01:18 +08:00
YunaiV
a83c156bf1 code review：签到记录 2023-08-20 19:34:28 +08:00
YunaiV
c5e85f3bfb code review：签到配置 2023-08-20 19:26:31 +08:00
YunaiV
4257cad46a code review：会员积分 2023-08-20 19:06:23 +08:00
owen
e2032e7e97 会员：增加会员等级增删改查 2023-08-20 15:54:06 +08:00
xiaqing
2e9dfac9ab 会员积分和会员签到模块todo修改 2023-08-19 14:09:22 +08:00
芋道源码
4177071758
!560 todo修改 
Merge pull request !560 from QingX/feature/mall_product
 2023-08-11 14:44:52 +00: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
congqing
1dee258c18 适配postgres数据库sql脚本 
infra_codegen_table表增加front_type字段
member_user表部分字段增加默认值
system_menu表permission增加默认值
 2023-07-26 01:22:42 +08:00
YunaiV
00e1c30f57 1. 修复创建支付应用，界面会报错的问题 
2. 同步最新 SQL 文件
 2023-07-24 12:51:14 +08:00
YunaiV
2485a5ebc9 mall + pay： 
1. 将 amount 统一都修改成 price
2. 将 payed 统一改成 payStatus
 2023-07-10 17:35:26 +08:00
YunaiV
5d2d52020e mall + pay：简化 pay 的复杂度 
1. 移除 merchant 表设计
2. 移除 app 和 channel 的导出
 2023-07-09 12:40:26 +08:00
YunaiV
23e3c4d0d9 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 2023-07-02 23:45:48 +08:00
芋道源码
2f42964a96
!524 会员中心合并至member 模块 
Merge pull request !524 from QingX/feature/mall_product
 2023-07-02 13:51:00 +00:00
jason
3a1e5c1b5f pay : 会员电子钱包表结构 2023-06-30 10:24:36 +08:00
xiaqing
c7ced55a6c 会员中心代码、sql脚本提交 
1.合并积分模块只member module
2.初始化sql放入mysql/member_point.sql
3.添加会员中/会员积分、会员签到/xxx层级目录
4.删除无用的接口代码
 2023-06-28 22:49:19 +08:00
jason
050f0bb6a2 页面装修 review 修改 2023-06-24 21:09:49 +08:00
jason
ad1f656dfa 页面装修修改,后端只负责存取 2023-06-24 00:11:04 +08:00
芋道源码
b16632ea41
!522 mall seckill 
Merge pull request !522 from puhui999/feature/mall_product
 2023-06-23 06:04:47 +00:00
jason
6b1d996b66 页面装修数据结构定义 2023-06-23 10:53:29 +08:00
puhui999
16f2a5b91a Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-06-17 21:19:02 +08:00
puhui999
32cca12cd2 fix：seckillTime => seckillConfig 2023-06-17 21:17:02 +08:00
芋道源码
798e322f08
!506 积分模块 
Merge pull request !506 from QingX/feature/mall_product
 2023-06-17 09:41:41 +00:00
芋道源码
74aebfca3e
Merge pull request #292 from aboutZZ/fix 
修复PG数据库部分字典数据缺失；修复PG数据库因字段无默认值无法直接运行生成的SQL
 2023-06-17 14:03:27 +08:00
YunaiV
1f4f8c0747 Merge branch 'dev-fix-sql4pg' of https://gitee.com/congqinggit/ruoyi-vue-pro 
 Conflicts:
	sql/postgresql/ruoyi-vue-pro.sql
 2023-06-17 12:45:31 +08:00
Zhe
ae8397422a 修复PG数据库部分字典数据缺失；修复因字段无默认值无法直接运行生成SQL问题 2023-06-14 16:16:56 +08:00
xingyu
573ad59edc Merge remote-tracking branch 'origin/master' into feature/mall_product 
# Conflicts:
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/string/StrUtils.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/ProductCategoryBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuSimpleRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuDetailRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuPageItemRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderBaseVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderItemBaseVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/base/sku/AppProductSkuBaseRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartDetailRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartItemUpdateSelectedReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartResetReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderCreateReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderDetailRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderGetCreateInfoRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderPageItemRespVO.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/vo/AppAddressBaseVO.java
 2023-06-14 15:18:12 +08:00
xiaqing
5f64fe052b 初始化sql 2023-06-10 20:45:31 +08:00
呵呵大
143bff909a
修复使用PG数据库时,站内信表、菜单权限表字段类型不一致问题 
在`NotifyMessageDO`实体类中`read_status`是布尔类型，因此数据库中也要定义为 `bool` 类型，否则查询报错。菜单权限表`system_menu`表同理。
 2023-06-10 03:57:47 +00:00
御码滴汉子
87d4f9b71a
将菜单表中的短信预置路径更改为最新路径 
Signed-off-by: 御码滴汉子 <1024@cong.zone>
 2023-06-04 15:57:02 +00:00
御码滴汉子
9af0aa5f7d
pg数据库脚本system_menu表always_show字段类型错误导致菜单编辑保存失败 
Signed-off-by: 御码滴汉子 <1024@cong.zone>
 2023-06-04 15:51:19 +00:00
御码滴汉子
87670265b2
update sql/postgresql/ruoyi-vue-pro.sql. 
read_status 类型修改为bool

Signed-off-by: 御码滴汉子 <1024@cong.zone>
 2023-06-04 15:15:19 +00:00
jason
894b19b8ec 新增自提门店管理 2023-05-30 21:18:30 +08:00
jason
55dbff7570 运费模板 review 修改. 运费模块可以选择多个区域 2023-05-27 11:20:43 +08:00
YunaiV
53e9be733f mall：review + mall：快递公司管理 2023-05-24 23:40:55 +08:00
puhui999
a70c7ca855 fix:完善 mall.sql 2023-05-23 11:59:48 +08:00
puhui999
d08b9530a2 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 
# Conflicts:
#	sql/mysql/optional/mall.sql
 2023-05-23 11:08:32 +08:00
puhui999
cac5545762 fix：完善商品管理, 完善 mall.sql, 完善 product 测试相关sql, 完善 ProductSpuServiceImplTest 测试 2023-05-23 11:01:40 +08:00
jason
01a67289a9 mall: 订单中心新增运费模板功能 2023-05-21 23:35:07 +08:00
jason
3da2eb89b2 新增快递公司功能 2023-05-18 23:37:56 +08:00