YunaiV
|
3fdc132c17
|
1.8.3 版本发布
|
2 years ago |
|
YunaiV
|
df00126fa4
|
统一 boot 和 cloud 代码
|
2 years ago |
jason
|
89e847c8cd
|
钱包，转账 review 修改
|
2 years ago |
|
芋道源码
|
8bd1942083
|
!676 交易：核销订单
Merge pull request !676 from 疯狂的世界/feature/mall_product
|
2 years ago |
|
YunaiV
|
f8e4aece31
|
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
|
2 years ago |
|
YunaiV
|
d256275099
|
saas：支持社交应用的多租户配置
|
2 years ago |
|
zhijiantianya@gmail.com
|
00e18a480f
|
code review：钱包、充值、转账的实现
|
2 years ago |
owen
|
0c4713b7e0
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
# sql/mysql/mall.sql
|
2 years ago |
|
YunaiV
|
5842a361e2
|
同步最新 SQL 脚本
|
2 years ago |
|
owen
|
0612a13cce
|
交易：核销订单
|
2 years ago |
|
YunaiV
|
d2112458d2
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2 years ago |
|
YunaiV
|
1ff9bc6a71
|
code review：文章管理
|
2 years ago |
|
jason
|
34210d3534
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2 years ago |
|
jason
|
7d0bcf5d3b
|
wallet - 管理端钱包余额菜单脚本
|
2 years ago |
|
owen
|
6f08645f61
|
会员：增加字段【注册终端】
|
2 years ago |
|
owen
|
df70402484
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2 years ago |
|
owen
|
f5dac38ca5
|
商城：增加商城首页
|
2 years ago |
|
jason
|
3db7b30e66
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2 years ago |
|
jason
|
fcbbbc737d
|
wallet - 管理端, 充值套餐脚本
|
2 years ago |
|
YunaiV
|
ca5e3f7bd1
|
优化最新的商城的 sql
|
2 years ago |
|
jason
|
2e207019b3
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2 years ago |
|
jason
|
571961b4da
|
充值套餐修改
|
2 years ago |
|
owen
|
df16278a03
|
统计：会员统计
|
2 years ago |
|
YunaiV
|
6a04d6c458
|
promotion：新增助力记录列表
|
2 years ago |
|
YunaiV
|
d4417d2474
|
code review：积分、优惠劵、佣金等逻辑
|
2 years ago |
|
YunaiV
|
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
|
2 years ago |
|
YunaiV
|
b74169acfc
|
trade：优化订单列表的查询
|
2 years ago |
|
owen
|
2168145c3e
|
会员：会员配置的积分相关字段加上point前缀
|
2 years ago |
|
owen
|
ab35fcbe9b
|
会员：积分配置改为会员配置
|
2 years ago |
|
owen
|
4f03635fcd
|
签到：签到后增加用户积分、经验
|
2 years ago |
|
owen
|
e7876b1520
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2 years ago |
|
YunaiV
|
16cea61435
|
wallet：增加充值套餐
|
2 years ago |
|
owen
|
42a899c5d3
|
交易：订单增加字段 推广人编号
|
2 years ago |
|
owen
|
497ea2eee8
|
会员详情，修改会员积分
|
2 years ago |
|
owen
|
929ff4286a
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2 years ago |
|
owen
|
171161e6c7
|
统计：交易统计
|
2 years ago |
|
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
|
2 years ago |
|
jason
|
ce6f7ab1b1
|
Pay: 新增转账示例单
|
2 years ago |
|
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
|
2 years ago |
|
YunaiV
|
eeb8873b1d
|
trade：微调交易配置的注释
|
2 years ago |
|
owen
|
0a3a6825d5
|
优惠券：完善APP优惠券查询接口
|
2 years ago |
|
YunaiV
|
9b7c757942
|
1.8.2 版本发布
|
2 years ago |
|
owen
|
0b84c18736
|
分销：修正分享海报
|
2 years ago |
|
owen
|
967e578d54
|
分销：重命名提现类型字段
|
2 years ago |
dhb52
|
2a9aa357cb
|
fix: 对具有软删除的表去除UNIQUE INDEX
|
2 years ago |
|
owen
|
052328c5fa
|
积分：完善积分获得、退还、使用 相关逻辑
|
2 years ago |
|
owen
|
dc46dff62c
|
Merge remote-tracking branch 'origin/feature/mall_product' into brokerate
|
2 years ago |
|
owen
|
bbd18afbcc
|
分佣: 简化推广用户关系树查询方式
|
2 years ago |
|
owen
|
6e6486ccae
|
Trade: 完善配置
|
2 years ago |
|
jason
|
910ffa7a5a
|
钱包充值退款
|
2 years ago |