YunaiV
|
1d00261c77
|
【优化】demo 功能，使用 yudao 作为表前缀，避免影响理解
|
2 years ago |
|
YunaiV
|
fe5c5e4223
|
✨ MALL：调整商品 SPU 字段，简化部分接口
|
2 years ago |
|
YunaiV
|
98697ee075
|
⬆️
|
2 years ago |
|
YunaiV
|
a778c25075
|
product：优化代码实现，简化重复判空
|
2 years ago |
puhui999
|
6e11154010
|
SPU: 添加选择优惠卷
|
2 years ago |
|
YunaiV
|
d4417d2474
|
code review：积分、优惠劵、佣金等逻辑
|
3 years ago |
owen
|
d0d21b2787
|
优惠券：新增/修改时，校验对应的商品、分类是否存在
|
3 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
|
3 years ago |
|
YunaiV
|
ad535e674f
|
trade：积分相关的价格计算
|
3 years ago |
|
YunaiV
|
e384b810bf
|
code review：分销逻辑
|
3 years ago |
|
owen
|
9856e17974
|
分销：根据商品，计算推广员可以得到的佣金
|
3 years ago |
|
owen
|
052328c5fa
|
积分：完善积分获得、退还、使用 相关逻辑
|
3 years ago |
|
YunaiV
|
1b477aaa0d
|
trade：优化下单逻辑的实现
|
3 years ago |
|
puhui999
|
af6016bba5
|
砍价活动: 完善 app 端获取活动分页、列表、详情接口
|
3 years ago |
|
puhui999
|
a10d77cdfe
|
mall+order: 完善部分 TODO 提到的问题
|
3 years ago |
|
YunaiV
|
e8bdd8349c
|
code review：订单部分逻辑
|
3 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
|
3 years ago |
|
puhui999
|
50354462fe
|
spu：分佣属性和分佣保持一致
|
3 years ago |
dhb52
|
d7488e70b0
|
使用下划线分割ErrorCodeConstants的ErrorCode
|
3 years ago |
|
YunaiV
|
5808f77ade
|
code review：订单分佣
|
3 years ago |
|
owen
|
c7ef8519c8
|
member: 分销增加佣金
|
3 years ago |
|
YunaiV
|
6fdd4da0b3
|
优化秒杀活动的管理后台代码
|
3 years ago |
|
YunaiV
|
b84f7825c5
|
review 拼团、秒杀活动的实现
|
3 years ago |
|
puhui999
|
e7d8643665
|
fix：修复 mall review @puhui999
|
3 years ago |
|
puhui999
|
78b3d2a20f
|
fix：mall promotion Combination
|
3 years ago |
|
YunaiV
|
2efdbf93cb
|
mall + promotion：review 秒杀、评论代码
|
3 years ago |
|
puhui999
|
ab30ff6480
|
fix：完善 mall seckill 相关 ②
|
3 years ago |
|
puhui999
|
700d95a43d
|
fix：完善商品评论 review 提到的问题
|
3 years ago |
|
YunaiV
|
35df912be7
|
code review：商品评价哈
|
3 years ago |
|
puhui999
|
20100aa78b
|
fix：完善商品评论
|
3 years ago |
|
YunaiV
|
84b365a707
|
mall + product：简化收藏逻辑，去掉 type 字段
|
3 years ago |
jason
|
36c45bd44e
|
review 价格运算修改.
|
3 years ago |
|
YunaiV
|
dd93215139
|
mall + trade：review 商品管理
|
3 years ago |
|
puhui999
|
ba380ea615
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
# Conflicts:
# yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/price/PriceServiceTest.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateRespBO.java
# yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/aftersale/TradeAfterSaleServiceTest.java
|
3 years ago |
|
YunaiV
|
1452f6b231
|
mall + trade：增肌爱 TradeCouponPriceCalculator 的单元测试
|
3 years ago |
|
YunaiV
|
2a9a869e01
|
mall + trade：获得订单结算信息，接入支付接口
|
3 years ago |
|
puhui999
|
8d2bcc57aa
|
fix: 完善商品管理
|
3 years ago |
|
puhui999
|
e86214015d
|
fix: 完善商品管理
|
3 years ago |
|
puhui999
|
b065a2a741
|
fix:修复商品 review 提到的问题
|
3 years ago |
|
YunaiV
|
c62da6a056
|
mall：review 商品接口
|
3 years ago |
|
puhui999
|
d08b9530a2
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
# Conflicts:
# sql/mysql/optional/mall.sql
|
3 years ago |
|
puhui999
|
cac5545762
|
fix：完善商品管理, 完善 mall.sql, 完善 product 测试相关sql, 完善 ProductSpuServiceImplTest 测试
|
3 years ago |
|
YunaiV
|
e942b52a67
|
mall：订单详情：调整售后字段
|
3 years ago |
|
YunaiV
|
7fef594390
|
订单接口的梳理
|
3 years ago |
|
jason
|
14d02bdfb3
|
商品收藏修改
|
3 years ago |
|
YunaiV
|
96e2bf020f
|
REVIEW 商品收藏的逻辑
|
3 years ago |
|
YunaiV
|
cd86620b74
|
REVIEW 商品管理的逻辑
|
3 years ago |
|
jason
|
7345d80b53
|
新增商品收藏功能
|
3 years ago |
|
puhui999
|
810c7ed040
|
完善商品管理
|
3 years ago |
|
puhui999
|
c233ce1a20
|
合并分支修复差异
|
3 years ago |