huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-11-26 01:01:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,113 Commits 1 Branch 0 Tags 176 MiB
e7876b1520
Commit Graph

143 Commits

Author SHA1 Message Date
owen
e7876b1520 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-30 22:09:49 +08:00
YunaiV
16cea61435 wallet：增加充值套餐 2023-09-30 18:54:10 +08:00
owen
42a899c5d3 交易：订单增加字段 推广人编号 2023-09-30 17:49:38 +08:00
owen
497ea2eee8 会员详情，修改会员积分 2023-09-30 15:50:13 +08:00
owen
929ff4286a Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-29 21:08:49 +08:00
owen
171161e6c7 统计：交易统计 2023-09-29 21:08:15 +08:00
jason
57d782bc94 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 
# Conflicts:
#	yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java
 2023-09-29 14:06:12 +08:00
jason
ce6f7ab1b1 Pay: 新增转账示例单 2023-09-29 14:01:58 +08:00
YunaiV
5913ee0706 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
#	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/bargain/vo/activity/AppBargainActivityDetailRespVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityRespVO.java
#	yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementReqVO.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
#	yudao-server/src/main/resources/application-local.yaml
 2023-09-28 15:18:59 +08:00
YunaiV
eeb8873b1d trade：微调交易配置的注释 2023-09-28 15:10:56 +08:00
owen
0a3a6825d5 优惠券：完善APP优惠券查询接口 2023-09-26 20:44:22 +08:00
YunaiV
9b7c757942 1.8.2 版本发布 2023-09-24 23:24:24 +08:00
owen
0b84c18736 分销：修正分享海报 2023-09-24 23:18:51 +08:00
owen
967e578d54 分销：重命名提现类型字段 2023-09-24 22:32:13 +08:00
dhb52
2a9aa357cb fix: 对具有软删除的表去除UNIQUE INDEX 2023-09-24 08:29:56 +08:00
owen
052328c5fa 积分：完善积分获得、退还、使用 相关逻辑 2023-09-23 14:11:16 +08:00
owen
dc46dff62c Merge remote-tracking branch 'origin/feature/mall_product' into brokerate 2023-09-22 23:15:31 +08:00
owen
bbd18afbcc 分佣: 简化推广用户关系树查询方式 2023-09-22 23:13:39 +08:00
owen
6e6486ccae Trade: 完善配置 2023-09-22 22:51:46 +08:00
jason
910ffa7a5a 钱包充值退款 2023-09-22 19:04:59 +08:00
owen
a7de955926 trade: 分销业务 - 提现申请 2023-09-22 00:27:45 +08:00
jason
c880dbfa60 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-21 17:32:43 +08:00
jason
dbd7ab5f23 code review 修改 2023-09-21 17:31:58 +08:00
owen
32e1fc66ce trade: 分销业务 - 佣金提现后台管理 2023-09-19 22:03:28 +08:00
owen
a3e8b42be6 trade: 分销业务review代码修改 2023-09-19 16:37:51 +08:00
jason
0e1b8126dd 新增钱包充值。启动报错修复 2023-09-14 16:55:31 +08:00
jason
bcb3b19418 钱包充值 表结构设计 2023-09-13 17:28:42 +08:00
owen
cddeb37289 Merge remote-tracking branch 'origin/feature/mall_product' into brokerate 
# Conflicts:
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/record/BrokerageRecordConvert.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/user/BrokerageUserConvert.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/record/BrokerageRecordServiceImpl.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/user/BrokerageUserServiceImpl.java
 2023-09-10 23:56:00 +08:00
owen
6c193f723f trade: 分销业务后台功能：推广订单列表 2023-09-10 23:30:43 +08:00
jason
5858f57fe9 钱包 review 修改 2023-09-09 18:32:53 +08:00
owen
ca55e61dd2 trade: 分销业务后台功能：清除推广员、修改推广资格 2023-09-09 14:38:47 +08:00
owen
1ead368595 trade: 优化分销用户佣金字段名称 2023-09-08 23:10:04 +08:00
owen
4b43304c76 trade: 优化分销用户绑定用户编号、绑定时间字段名称 2023-09-08 22:51:05 +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
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
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
a68691f2d9 trade: 增加分销用户表 2023-09-05 23:45:53 +08:00
owen
6474502738 trade: 增加交易中心配置表 2023-09-05 22:31:36 +08:00
芋道源码
a58d7d63ed
!606 会员：分销佣金计算 
Merge pull request !606 from 疯狂的世界/brokerage
 2023-09-05 01:58:11 +00:00
owen
c7ef8519c8 member: 分销增加佣金 2023-09-05 08:56:39 +08:00
jason
cc4c924717 钱包 review DO 类修改 2023-09-04 14:54:38 +08:00
YunaiV
36b3cfafd2 同步 v1.8.1 SQL 脚本 2023-09-03 19:15:18 +08:00
YunaiV
26129b52a8 同步最新 SQL 脚本 2023-08-31 20:47:30 +08:00
YunaiV
d982a95fdd Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-08-31 20:38:59 +08:00
chenchen
73f1636daa 售后日志添加售前售后状态 2023-08-30 10:58:37 +08:00
YunaiV
cc71aabd3d 钱包：钱包流水 api 2023-08-29 00:31:54 +08:00
YunaiV
d82729e4c6 同步最新会员中心 SQL 2023-08-27 21:15:44 +08:00
YunaiV
f5c5d38303 code review：商品评论 2023-08-26 21:23:01 +08:00