puhui999
							
						 
					 | 
					
						
						
							
						
						20100aa78b
					 | 
					
						
						
							
							fix:完善商品评论
						
						
						
						
						
						
					 | 
					
						2023-06-12 12:08:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						4f5ac0edbb
					 | 
					
						
						
							
							mall + promotion:增加营销活动的 mock 接口
						
						
						
						
						
						
					 | 
					
						2023-06-10 17:51:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						9e894e0430
					 | 
					
						
						
							
							mall + promotion:增加优惠劵的 mock 接口
						
						
						
						
						
						
					 | 
					
						2023-06-10 09:57:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						bb8e44a268
					 | 
					
						
						
							
							mall + product:增加评论 mock 逻辑
						
						
						
						
						
						
					 | 
					
						2023-06-10 00:17:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						1e1a22c256
					 | 
					
						
						
							
							mall + product:评论的 review
						
						
						
						
						
						
					 | 
					
						2023-06-09 22:41:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						84b365a707
					 | 
					
						
						
							
							mall + product:简化收藏逻辑,去掉 type 字段
						
						
						
						
						
						
					 | 
					
						2023-06-09 20:44:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						f2d803c111
					 | 
					
						
						
							
							mall + product:review 评论接口
						
						
						
						
						
						
					 | 
					
						2023-06-09 13:59:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						4126e37d91
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-module-mall/yudao-module-product-biz/pom.xml
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/AppProductSpuController.java 
						
						
					 | 
					
						2023-06-09 08:55:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						f75f4e8846
					 | 
					
						
						
							
							mall + product:完善商品详情接口
						
						
						
						
						
						
					 | 
					
						2023-06-09 08:54:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						91e357e59d
					 | 
					
						
						
							
							fix:移动 app 商品评论分页相关常量到 AppCommentPageReqVO 中
						
						
						
						
						
						
					 | 
					
						2023-06-08 17:15:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						8f7efbe4e2
					 | 
					
						
						
							
							fix:测试 app 商品评论页获取评论分页接口和相关评论分类数量接口,修复测试时发现的问题
						
						
						
						
						
						
					 | 
					
						2023-06-08 16:14:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						151e58daa1
					 | 
					
						
						
							
							fix:完善 app 商品评论页获取评论分页接口和相关评论分类数量接口
						
						
						
						
						
						
					 | 
					
						2023-06-08 11:37:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						db7e47faa2
					 | 
					
						
						
							
							fix:完善 TODO 提到的问题
						
						
						
						
						
						
					 | 
					
						2023-06-07 14:15:25 +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
							
						 
					 | 
					
						
						
							
						
						36ce968893
					 | 
					
						
						
							
							mall + trade:review 运费价格计算
						
						
						
						
						
						
					 | 
					
						2023-06-03 18:08:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jason
							
						 
					 | 
					
						
						
							
						
						f1fa8eadd2
					 | 
					
						
						
							
							mall - trade - 新增 TradeDeliveryPriceCalculator
						
						
						
						
						
						
					 | 
					
						2023-06-03 17:16:18 +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
							
						 
					 | 
					
						
						
							
						
						a70c7ca855
					 | 
					
						
						
							
							fix:完善 mall.sql
						
						
						
						
						
						
					 | 
					
						2023-05-23 11:59:48 +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
							
						 
					 | 
					
						
						
							
						
						8ed52701fd
					 | 
					
						
						
							
							调整商品收藏的命名
						
						
						
						
						
						
					 | 
					
						2023-05-16 19:14:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jason
							
						 
					 | 
					
						
						
							
						
						4b643a7b34
					 | 
					
						
						
							
							物流配送管理表结构修改
						
						
						
						
						
						
					 | 
					
						2023-05-15 23:05:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jason
							
						 
					 | 
					
						
						
							
						
						7a792a7d48
					 | 
					
						
						
							
							商品收藏相关修改
						
						
						
						
						
						
					 | 
					
						2023-05-14 23:39:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						7fef594390
					 | 
					
						
						
							
							订单接口的梳理
						
						
						
						
						
						
					 | 
					
						2023-05-14 17:35:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c21e88860f
					 | 
					
						
						
							
							REVIEW 物流管理相关的表
						
						
						
						
						
						
					 | 
					
						2023-05-14 17:35:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						467811a42e
					 | 
					
						
						
							
							REVIEW 商品收藏的逻辑 v2
						
						
						
						
						
						
					 | 
					
						2023-05-14 09:07:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jason
							
						 
					 | 
					
						
						
							
						
						0ffa7ff4c8
					 | 
					
						
						
							
							发货配送模块表结构
						
						
						
						
						
						
					 | 
					
						2023-05-12 19:39:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						0b3640a522
					 | 
					
						
						
							
							fix: required = true ==> requiredMode = Schema.RequiredMode.REQUIRED
						
						
						
						
						
						
					 | 
					
						2023-05-08 10:06:17 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						70816371e5
					 | 
					
						
						
							
							初步完成商品CRUD
						
						
						
						
						
						
					 | 
					
						2023-05-02 02:33:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						da162853ec
					 | 
					
						
						
							
							商城:完善购物车的逻辑
						
						
						
						
						
						
					 | 
					
						2023-04-30 20:32:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						15ced47b17
					 | 
					
						
						
							
							添加多租户
						
						
						
						
						
						
					 | 
					
						2023-04-30 17:35:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						c10ea9d9de
					 | 
					
						
						
							
							移除ProductSku相关的status属性,修改Property
						
						
						
						
						
						
					 | 
					
						2023-04-30 17:35:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						24a56bb45f
					 | 
					
						
						
							
							移除ProductSku相关的status属性,修改Property
						
						
						
						
						
						
					 | 
					
						2023-04-30 17:34:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						f56d394830
					 | 
					
						
						
							
							修改ProductSpuBaseVO第一版
						
						
						
						
						
						
					 | 
					
						2023-04-29 21:28:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						668d493b7f
					 | 
					
						
						
							
							Product相关Do添加TenantBaseDO
						
						
						
						
						
						
					 | 
					
						2023-04-29 21:22:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						2113e825d7
					 | 
					
						
						
							
							完善 App 商品详情逻辑的 10%
						
						
						
						
						
						
					 | 
					
						2023-04-27 22:43:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						3ced6a3240
					 | 
					
						
						
							
							完善 App 商品搜索的逻辑
						
						
						
						
						
						
					 | 
					
						2023-04-26 20:13:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						4068548c45
					 | 
					
						
						
							
							移除ProductSpuSpecTypeEnum及相关引用
						
						
						
						
						
						
					 | 
					
						2023-04-26 17:38:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |