p38192567
/
ruoyi-vue-pro1
mirror of https://gitee.com/zhijiantianya/ruoyi-vue-pro.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
5,312 Commits 8 Branches 31 Tags 233 MiB
Commit Graph

89 Commits

Author SHA1 Message Date
YunaiV d4417d2474 code review：积分、优惠劵、佣金等逻辑 2023-10-01 23:31:07 +08:00
owen d0d21b2787 优惠券：新增/修改时，校验对应的商品、分类是否存在 2023-09-30 19:39:02 +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 ad535e674f trade：积分相关的价格计算 2023-09-26 20:11:54 +08:00
YunaiV e384b810bf code review：分销逻辑 2023-09-25 09:39:39 +08:00
owen 9856e17974 分销：根据商品，计算推广员可以得到的佣金 2023-09-24 22:27:24 +08:00
owen 052328c5fa 积分：完善积分获得、退还、使用 相关逻辑 2023-09-23 14:11:16 +08:00
YunaiV 1b477aaa0d trade：优化下单逻辑的实现 2023-09-20 20:21:41 +08:00
puhui999 af6016bba5 砍价活动: 完善 app 端获取活动分页、列表、详情接口 2023-09-19 16:35:21 +08:00
puhui999 a10d77cdfe mall+order: 完善部分 TODO 提到的问题 2023-09-13 12:04:13 +08:00
YunaiV e8bdd8349c code review：订单部分逻辑 2023-09-12 13:54:52 +08:00
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
 2023-09-11 16:19:55 +08:00
puhui999 50354462fe spu：分佣属性和分佣保持一致 2023-09-09 23:18:09 +08:00
dhb52 d7488e70b0 使用下划线分割ErrorCodeConstants的ErrorCode 2023-09-09 01:30:51 +08:00
YunaiV 5808f77ade code review：订单分佣 2023-09-08 00:29:25 +08:00
owen c7ef8519c8 member: 分销增加佣金 2023-09-05 08:56:39 +08:00
YunaiV 6fdd4da0b3 优化秒杀活动的管理后台代码 2023-08-12 16:05:47 +08:00
YunaiV b84f7825c5 review 拼团、秒杀活动的实现 2023-07-26 19:09:47 +08:00
puhui999 e7d8643665 fix：修复 mall review @puhui999 2023-07-10 16:35:49 +08:00
puhui999 78b3d2a20f fix：mall promotion Combination 2023-07-05 11:31:16 +08:00
YunaiV 2efdbf93cb mall + promotion：review 秒杀、评论代码 2023-06-23 21:14:36 +08:00
puhui999 ab30ff6480 fix：完善 mall seckill 相关 ② 2023-06-23 00:57:27 +08:00
puhui999 700d95a43d fix：完善商品评论 review 提到的问题 2023-06-20 18:12:39 +08:00
YunaiV 35df912be7 code review：商品评价哈 2023-06-17 21:57:52 +08:00
puhui999 20100aa78b fix：完善商品评论 2023-06-12 12:08:55 +08:00
YunaiV 84b365a707 mall + product：简化收藏逻辑，去掉 type 字段 2023-06-09 20:44:00 +08:00
jason 36c45bd44e review 价格运算修改. 2023-06-04 17:45:40 +08:00
YunaiV dd93215139 mall + trade：review 商品管理 2023-06-03 22:59:34 +08:00
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
 2023-06-03 20:55:45 +08:00
YunaiV 1452f6b231 mall + trade：增肌爱 TradeCouponPriceCalculator 的单元测试 2023-06-03 11:53:40 +08:00
YunaiV 2a9a869e01 mall + trade：获得订单结算信息，接入支付接口 2023-06-03 00:46:56 +08:00
puhui999 8d2bcc57aa fix: 完善商品管理 2023-06-01 11:41:26 +08:00
puhui999 e86214015d fix: 完善商品管理 2023-05-31 16:39:43 +08:00
puhui999 b065a2a741 fix:修复商品 review 提到的问题 2023-05-25 09:23:38 +08:00
YunaiV c62da6a056 mall：review 商品接口 2023-05-23 23:27:15 +08:00
puhui999 d08b9530a2 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 
# Conflicts:
#	sql/mysql/optional/mall.sql
 2023-05-23 11:08:32 +08:00
puhui999 cac5545762 fix：完善商品管理, 完善 mall.sql, 完善 product 测试相关sql, 完善 ProductSpuServiceImplTest 测试 2023-05-23 11:01:40 +08:00
YunaiV e942b52a67 mall：订单详情：调整售后字段 2023-05-21 12:18:52 +08:00
YunaiV 7fef594390 订单接口的梳理 2023-05-14 17:35:34 +08:00
jason 14d02bdfb3 商品收藏修改 2023-05-06 11:58:27 +08:00
YunaiV 96e2bf020f REVIEW 商品收藏的逻辑 2023-05-05 23:38:31 +08:00
YunaiV cd86620b74 REVIEW 商品管理的逻辑 2023-05-05 23:01:23 +08:00
jason 7345d80b53 新增商品收藏功能 2023-05-04 15:52:42 +08:00
puhui999 810c7ed040 完善商品管理 2023-05-04 01:32:25 +08:00
puhui999 c233ce1a20 合并分支修复差异 2023-05-03 22:18:27 +08:00
puhui999 e163ae8b70 完成商品保存和编辑数据回显 2023-05-03 02:31:50 +08:00
YunaiV f7fe9ad7b0 1. 商城：调整购物车的失效逻辑实现，基于 SPU 是否下架 
2. 商城：增加购物车失效的重选逻辑
 2023-05-01 16:00:37 +08:00
puhui999 6428f0fcaf 添加商品枚举 2023-05-01 14:47:00 +08:00
YunaiV da162853ec 商城：完善购物车的逻辑 2023-04-30 20:32:01 +08:00
puhui999 4068548c45 移除ProductSpuSpecTypeEnum及相关引用 2023-04-26 17:38:42 +08:00