huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-11-22 23:31:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,890 Commits 1 Branch 0 Tags 176 MiB
437131cc7a
Commit Graph

207 Commits

Author SHA1 Message Date
YunaiV
8b50cd9661 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
 Conflicts:
	yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationRecordController.java
	yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java
	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
	yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java
 2023-09-11 16:19:55 +08:00
YunaiV
40e1a879e3 登录：社交登录时，额外返回 openid 2023-09-10 18:01:53 +08:00
YunaiV
65d7b30011 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-09-09 10:35:14 +08:00
YunaiV
557b09a157 code review：分销逻辑 2023-09-09 09:41:57 +08:00
dhb52
d7488e70b0 使用下划线分割ErrorCodeConstants的ErrorCode 2023-09-09 01:30:51 +08:00
owen
6ef36d5ca6 trade: 增加分销 API 2023-09-08 23:33:02 +08:00
lemoncc
2fd201c7fa
🌈 style: 描述错误, 社交类型的枚举为 SocialTypeEnum 而不是 SysUserSocialTypeEnum 2023-09-08 16:33:49 +08:00
owen
1cc2dfc963 trade: 分销Review代码修改 2023-09-08 12:29:38 +08:00
owen
166b1b31c0 trade: 分销用户管理 2023-09-08 11:03:57 +08:00
YunaiV
5808f77ade code review：订单分佣 2023-09-08 00:29:25 +08:00
YunaiV
b8a4d8cab2 分销：避免报错 2023-09-07 12:29:50 +08:00
YunaiV
eb342d5abf Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 
# Conflicts:
#	yudao-module-member/yudao-module-member-biz/src/test/resources/sql/create_tables.sql
 2023-09-06 23:50:55 +08:00
芋道源码
ea26691967
!607 member: 佣金解冻 
Merge pull request !607 from 疯狂的世界/brokerate_unfreeze
 2023-09-06 15:49:39 +00:00
YunaiV
bf92727b27 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 
 Conflicts:
	yudao-module-member/yudao-module-member-biz/src/test/resources/sql/create_tables.sql
 2023-09-06 21:40:53 +08:00
owen
fa53a3b15e trade: MemberBrokerageRecord 重命名为 TradeBrokerageRecord 2023-09-06 00:35:40 +08:00
owen
9336a0a102 trade: 分销业务从 member 模块 转移到 trade模块 2023-09-06 00:16:47 +08:00
YunaiV
0329f13fbf 分佣：增加获得分销排行分页 API mock 2023-09-05 21:32:34 +08:00
owen
9eb7837b67 member: 佣金失效 2023-09-05 19:43:07 +08:00
owen
a708521b9d member: 佣金解冻 2023-09-05 19:05:01 +08:00
owen
2f6092005b member: 佣金解冻 2023-09-05 18:59:24 +08:00
芋道源码
a58d7d63ed
!606 会员：分销佣金计算 
Merge pull request !606 from 疯狂的世界/brokerage
 2023-09-05 01:58:11 +00:00
owen
090058a2ba member: 佣金不冻结时，直接就是结算状态 2023-09-05 09:27:12 +08:00
owen
c7ef8519c8 member: 分销增加佣金 2023-09-05 08:56:39 +08:00
YunaiV
eae8218f0d 分佣：增加获得分销排行分页 API mock 2023-09-05 00:11:41 +08:00
YunaiV
7389e4fb65 分佣：增加获得分销记录分页 API mock 2023-09-04 22:48:26 +08:00
YunaiV
fc56a15f76 分佣：增加用户分销记录、提现 API mock 2023-09-04 21:00:03 +08:00
YunaiV
6a819da0b6 分佣：增加用户分销统计 API mock 2023-09-03 21:21:33 +08:00
owen
991b53649b member: 分销配置 2023-09-03 21:19:42 +08:00
YunaiV
4809e9b462 修复单元测试报错的问题 2023-09-03 18:28:29 +08:00
YunaiV
9148170926 调整 mapper 命名，避免可能的冲突 2023-09-02 19:23:09 +08:00
YunaiV
e6f1e5d968 同步最新商城演示图 2023-09-01 00:28:39 +08:00
YunaiV
5a788af084 购物车：简化 cart 表命名 2023-08-30 08:43:07 +08:00
YunaiV
ddcb3e69f9 会员等级 app 接口 2023-08-28 21:01:46 +08:00
YunaiV
f5c5d38303 code review：商品评论 2023-08-26 21:23:01 +08:00
芋道源码
806228be8b
!593 商品评论表增加冗余 SKU 的图片地址, 规格 
Merge pull request !593 from 疯狂的世界/owen_dev
 2023-08-26 13:00:07 +00:00
YunaiV
99dd33c408 code review：会员中心的详情返回 totalPoint 积分 2023-08-26 20:57:49 +08:00
owen
1e2c83d90f mall: 商品评论表增加冗余 SKU 的图片地址, 规格 2023-08-26 14:40:16 +08:00
owen
02abe86253 member: 
1.用户积分变动方法, 提取到单独的接口中
2.规范代码
 2023-08-26 13:52:20 +08:00
绮梦
f10b638caf feat: 获得会员用户接口增加经验值字段 2023-08-26 12:55:11 +08:00
YunaiV
f6f33a07d0 code review：订单评论、订单积分的变更 2023-08-26 11:19:43 +08:00
YunaiV
b75d777670 code review：订单评论、订单积分的变更 2023-08-26 10:54:45 +08:00
芋道源码
f8952f8e34
!591 商品：完善商品评论功能 
Merge pull request !591 from 疯狂的世界/owen_dev
 2023-08-26 02:16:34 +00:00
YunaiV
583d34a801 code review：移除收件地址多余的方法 2023-08-26 01:51:47 +08:00
YunaiV
1b192b5032 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 2023-08-26 01:10:58 +08:00
YunaiV
61d51e54dc Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 
 Conflicts:
	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/user/MemberUserConvert.java
 2023-08-26 01:07:56 +08:00
owen
fd126ba2f7 member: 根据积分配置的比例，换算积分 2023-08-25 23:14:27 +08:00
owen
d4acacec60 trade: 1.支付成功后，增加用户积分；2.退款成功后，扣减用户积分 2023-08-25 23:07:54 +08:00
owen
9aee08ee0e 会员：修改Review的代码 2023-08-25 21:12:31 +08:00
绮梦
65eddc63af feat: 增加管理后台用户收件地址管理接口。 2023-08-24 17:04:08 +08:00
YunaiV
9b6f5bd503 code review：会员等级 2023-08-24 00:53:09 +08:00