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 |
|
owen
|
a7de955926
|
trade: 分销业务 - 提现申请
|
2 years ago |
|
jason
|
c880dbfa60
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2 years ago |
|
jason
|
dbd7ab5f23
|
code review 修改
|
2 years ago |
|
owen
|
32e1fc66ce
|
trade: 分销业务 - 佣金提现后台管理
|
2 years ago |
|
owen
|
a3e8b42be6
|
trade: 分销业务review代码修改
|
2 years ago |
|
jason
|
0e1b8126dd
|
新增钱包充值。启动报错修复
|
2 years ago |
|
jason
|
bcb3b19418
|
钱包充值 表结构设计
|
2 years ago |
|
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
|
2 years ago |
|
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
|
2 years ago |
|
owen
|
6c193f723f
|
trade: 分销业务后台功能：推广订单列表
|
2 years ago |
|
jason
|
5858f57fe9
|
钱包 review 修改
|
2 years ago |
|
owen
|
ca55e61dd2
|
trade: 分销业务后台功能：清除推广员、修改推广资格
|
2 years ago |
|
owen
|
1ead368595
|
trade: 优化分销用户佣金字段名称
|
2 years ago |
|
owen
|
4b43304c76
|
trade: 优化分销用户绑定用户编号、绑定时间字段名称
|
2 years ago |
|
owen
|
1cc2dfc963
|
trade: 分销Review代码修改
|
2 years ago |
|
owen
|
166b1b31c0
|
trade: 分销用户管理
|
2 years ago |
samisgod
|
a4d6d5e6c3
|
fix db creation error
|
2 years ago |
|
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
|
2 years ago |
|
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
|
2 years ago |
|
owen
|
fa53a3b15e
|
trade: MemberBrokerageRecord 重命名为 TradeBrokerageRecord
|
2 years ago |
|
owen
|
a68691f2d9
|
trade: 增加分销用户表
|
2 years ago |
|
owen
|
6474502738
|
trade: 增加交易中心配置表
|
2 years ago |
|
芋道源码
|
a58d7d63ed
|
!606 会员：分销佣金计算
Merge pull request !606 from 疯狂的世界/brokerage
|
2 years ago |
|
owen
|
c7ef8519c8
|
member: 分销增加佣金
|
2 years ago |
|
jason
|
cc4c924717
|
钱包 review DO 类修改
|
2 years ago |
|
YunaiV
|
36b3cfafd2
|
同步 v1.8.1 SQL 脚本
|
2 years ago |
|
YunaiV
|
26129b52a8
|
同步最新 SQL 脚本
|
2 years ago |
|
YunaiV
|
d982a95fdd
|
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2 years ago |
chenchen
|
73f1636daa
|
售后日志添加售前售后状态
|
2 years ago |
|
YunaiV
|
cc71aabd3d
|
钱包：钱包流水 api
|
2 years ago |
|
YunaiV
|
d82729e4c6
|
同步最新会员中心 SQL
|
2 years ago |
|
YunaiV
|
8b98d13d8b
|
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2 years ago |
|
芋道源码
|
40560f9618
|
!569 fix: posgres sql
Merge pull request !569 from 天天写BUG/master
|
2 years ago |
|
YunaiV
|
f5c5d38303
|
code review：商品评论
|
2 years ago |
|
owen
|
1e2c83d90f
|
mall: 商品评论表增加冗余 SKU 的图片地址, 规格
|
2 years ago |
|
jason
|
f33b66558c
|
新增查询钱包余额明细接口
|
2 years ago |
|
jason
|
1ffbd9399e
|
新增获得支付钱包接口
|
2 years ago |
|
YunaiV
|
9b6f5bd503
|
code review：会员等级
|
2 years ago |