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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						c3e36ba9da
					 | 
					
						
						
							
							修正相关问题让服务正常启动,改动位置都已加上TODO记录
						
						
						
						
						
						
					 | 
					
						2023-04-24 10:50:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						b30fc28021
					 | 
					
						
						
							
							商城:product:完善 ProductSpuDO 表
						
						
						
						
						
						
					 | 
					
						2023-04-19 10:55:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangzhs
							
						 
					 | 
					
						
						
							
						
						6fe5f4bc0d
					 | 
					
						
						
							
							[新增][商品评价]管理后台/APP端
						
						
						
						
						
						
					 | 
					
						2023-03-21 11:09:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangzhs
							
						 
					 | 
					
						
						
							
						
						cbf5ef5953
					 | 
					
						
						
							
							[新增][商品评价]管理后台
						
						
						
						
						
						
						
						1. 显示 / 隐藏评论
2. 商家回复 
						
						
					 | 
					
						2023-03-19 22:07:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangzhs
							
						 
					 | 
					
						
						
							
						
						da53a041da
					 | 
					
						
						
							
							[新增][商品评价]管理后台分页查询
						
						
						
						
						
						
					 | 
					
						2023-03-19 18:59:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						652428a723
					 | 
					
						
						
							
							product:完善 App 商品详情接口
						
						
						
						
						
						
					 | 
					
						2022-12-14 22:02:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						2f9eef589b
					 | 
					
						
						
							
							product:优化商品分类的代码
						
						
						
						
						
						
					 | 
					
						2022-12-14 20:32:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						98ca807d4b
					 | 
					
						
						
							
							product:优化商品属性项的代码
						
						
						
						
						
						
					 | 
					
						2022-12-12 22:25:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						fe1ae23b71
					 | 
					
						
						
							
							trade:增加管理后台的订单分页接口
						
						
						
						
						
						
					 | 
					
						2022-12-09 00:20:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						fac3e7c726
					 | 
					
						
						
							
							product:商品规格,调整成商品属性,避免和 sku 概念冲突
						
						
						
						
						
						
					 | 
					
						2022-12-08 21:12:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						73b92190c6
					 | 
					
						
						
							
							trade:【交易售后】增加申请售后的单元测试
						
						
						
						
						
						
					 | 
					
						2022-11-19 14:34:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						af71a19241
					 | 
					
						
						
							
							trade:【商品】sku 表增加 spu_name 字段,冗余
						
						
						
						
						
						
					 | 
					
						2022-11-19 12:25:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						84f6ec10bc
					 | 
					
						
						
							
							trade:增加优惠劵使用、商品库存的扣减
						
						
						
						
						
						
					 | 
					
						2022-11-10 00:32:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						16f5d0f5a4
					 | 
					
						
						
							
							trade:增加优惠劵使用、商品库存的扣减
						
						
						
						
						
						
					 | 
					
						2022-11-09 23:56:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						01d10b518c
					 | 
					
						
						
							
							trade:优化创建订单接口的后端实现
						
						
						
						
						
						
					 | 
					
						2022-11-08 22:50:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c00ded3ed3
					 | 
					
						
						
							
							优化商品的 index 界面
						
						
						
						
						
						
					 | 
					
						2022-10-24 21:27:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |