|
|
9762a2a7c3
|
优化：默认只引入 mysql driver，减少打包大小
|
2023-11-06 21:17:27 +08:00 |
|
|
|
d48a236d4c
|
!720 1. 完善达梦的兼容性；2. 增加域名解析租户编号
Merge pull request !720 from 芋道源码/feature/dameng
|
2023-11-06 11:57:57 +00:00 |
|
|
|
c162b39e1e
|
多租户：调整 tenant 表的 domain 字段为 website，避免 dm 数据库的关键字冲突
|
2023-11-06 19:04:01 +08:00 |
|
|
|
24b9688894
|
doc: 添加达梦数据库适配指引
|
2023-11-06 00:15:16 +08:00 |
|
|
|
f9e64a9f0a
|
同步最新 SQL
|
2023-11-04 20:43:18 +08:00 |
|
|
|
f4d600398c
|
转账 - 管理后台增加转账单查询
|
2023-11-03 08:43:21 +08:00 |
|
|
|
48b1c19f28
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-10-29 23:36:26 +08:00 |
|
|
|
ccccd9f226
|
转账 - 转账代码修改，新增转账示例
|
2023-10-29 23:36:06 +08:00 |
|
|
|
b5f9ed9edf
|
营销：装修SQL调整
|
2023-10-29 22:04:21 +08:00 |
|
|
|
3a2ccc9d6b
|
营销：装修模板、装修页面
|
2023-10-27 14:58:04 +08:00 |
|
|
|
626bd0bd55
|
转账 - code review 修改
|
2023-10-25 23:41:59 +08:00 |
|
|
|
86598dd177
|
转账 - 动态收款人字段修改
|
2023-10-24 08:44:30 +08:00 |
|
|
|
89e847c8cd
|
钱包，转账 review 修改
|
2023-10-21 15:28:07 +08:00 |
|
|
|
8bd1942083
|
!676 交易：核销订单
Merge pull request !676 from 疯狂的世界/feature/mall_product
|
2023-10-19 15:59:00 +00:00 |
|
|
|
f8e4aece31
|
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
|
2023-10-19 23:31:21 +08:00 |
|
|
|
d256275099
|
saas：支持社交应用的多租户配置
|
2023-10-18 23:48:14 +08:00 |
|
|
|
00e18a480f
|
code review：钱包、充值、转账的实现
|
2023-10-18 18:39:05 +08:00 |
|
|
|
0c4713b7e0
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
# sql/mysql/mall.sql
|
2023-10-17 23:29:11 +08:00 |
|
|
|
5842a361e2
|
同步最新 SQL 脚本
|
2023-10-17 23:23:17 +08:00 |
|
|
|
0612a13cce
|
交易：核销订单
|
2023-10-17 23:18:08 +08:00 |
|
|
|
d2112458d2
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-10-16 22:51:28 +08:00 |
|
|
|
1ff9bc6a71
|
code review：文章管理
|
2023-10-16 22:51:19 +08:00 |
|
|
|
34210d3534
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-10-16 22:43:54 +08:00 |
|
|
|
7d0bcf5d3b
|
wallet - 管理端钱包余额菜单脚本
|
2023-10-16 22:43:39 +08:00 |
|
|
|
6f08645f61
|
会员：增加字段【注册终端】
|
2023-10-16 14:22:43 +08:00 |
|
|
|
df70402484
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-10-16 09:55:17 +08:00 |
|
|
|
f5dac38ca5
|
商城：增加商城首页
|
2023-10-16 09:51:20 +08:00 |
|
|
|
3db7b30e66
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-10-16 08:46:44 +08:00 |
|
|
|
fcbbbc737d
|
wallet - 管理端, 充值套餐脚本
|
2023-10-16 08:46:27 +08:00 |
|
|
|
ca5e3f7bd1
|
优化最新的商城的 sql
|
2023-10-14 22:00:30 +08:00 |
|
|
|
2e207019b3
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-10-12 22:21:17 +08:00 |
|
|
|
571961b4da
|
充值套餐修改
|
2023-10-12 22:20:42 +08:00 |
|
|
|
df16278a03
|
统计：会员统计
|
2023-10-09 23:27:10 +08:00 |
|
|
|
6a04d6c458
|
promotion：新增助力记录列表
|
2023-10-05 12:43:14 +08:00 |
|
|
|
d4417d2474
|
code review：积分、优惠劵、佣金等逻辑
|
2023-10-01 23:31:07 +08:00 |
|
|
|
057952bdeb
|
Merge branch 'feature/mall_product' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product
# Conflicts:
# yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/LocalDateTimeUtils.java
|
2023-10-01 22:00:31 +08:00 |
|
|
|
b74169acfc
|
trade：优化订单列表的查询
|
2023-10-01 21:59:51 +08:00 |
|
|
|
2168145c3e
|
会员：会员配置的积分相关字段加上point前缀
|
2023-10-01 10:41:21 +08:00 |
|
|
|
ab35fcbe9b
|
会员：积分配置改为会员配置
|
2023-10-01 10:25:18 +08:00 |
|
|
|
4f03635fcd
|
签到：签到后增加用户积分、经验
|
2023-10-01 09:53:54 +08:00 |
|
|
|
e7876b1520
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-09-30 22:09:49 +08:00 |
|
|
|
16cea61435
|
wallet：增加充值套餐
|
2023-09-30 18:54:10 +08:00 |
|
|
|
42a899c5d3
|
交易：订单增加字段 推广人编号
|
2023-09-30 17:49:38 +08:00 |
|
|
|
497ea2eee8
|
会员详情，修改会员积分
|
2023-09-30 15:50:13 +08:00 |
|
|
|
929ff4286a
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-09-29 21:08:49 +08:00 |
|
|
|
171161e6c7
|
统计：交易统计
|
2023-09-29 21:08:15 +08:00 |
|
|
|
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 |
|
|
|
ce6f7ab1b1
|
Pay: 新增转账示例单
|
2023-09-29 14:01:58 +08:00 |
|
|
|
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 |
|
|
|
eeb8873b1d
|
trade：微调交易配置的注释
|
2023-09-28 15:10:56 +08:00 |
|
