YunaiV
							
						 
					 | 
					
						
						
							
						
						b1ce971a2f
					 | 
					
						
						
							
							code review:解决分佣的 npe 问题
						
						
						
						
						
						
					 | 
					
						2023-09-28 16:39:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						e384b810bf
					 | 
					
						
						
							
							code review:分销逻辑
						
						
						
						
						
						
					 | 
					
						2023-09-25 09:39:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						b4587fd79e
					 | 
					
						
						
							
							product:订单表,增加 vip 优惠字段
						
						
						
						
						
						
					 | 
					
						2023-09-24 00:45:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						a10d77cdfe
					 | 
					
						
						
							
							mall+order: 完善部分 TODO 提到的问题
						
						
						
						
						
						
					 | 
					
						2023-09-13 12:04:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						50354462fe
					 | 
					
						
						
							
							spu:分佣属性和分佣保持一致
						
						
						
						
						
						
					 | 
					
						2023-09-09 23:18:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						f28b960319
					 | 
					
						
						
							
							调整最新图片 url
						
						
						
						
						
						
					 | 
					
						2023-08-31 20:06:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						059202a588
					 | 
					
						
						
							
							购物车:调整购物车接口
						
						
						
						
						
						
					 | 
					
						2023-08-30 19:14:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						f5c5d38303
					 | 
					
						
						
							
							code review:商品评论
						
						
						
						
						
						
					 | 
					
						2023-08-26 21:23:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						1e2c83d90f
					 | 
					
						
						
							
							mall: 商品评论表增加冗余 SKU 的图片地址, 规格
						
						
						
						
						
						
					 | 
					
						2023-08-26 14:40:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						b75d777670
					 | 
					
						
						
							
							code review:订单评论、订单积分的变更
						
						
						
						
						
						
					 | 
					
						2023-08-26 10:54:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						2132de9dd1
					 | 
					
						
						
							
							商品:完善后台商品评论功能
						
						
						
						
						
						
					 | 
					
						2023-08-25 21:02:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						94a32d34b2
					 | 
					
						
						
							
							1. 会员用户,增加 point 积分字段
						
						
						
						
						
						
						
						2. 增加获得优惠劵、收藏数量的 API 接口 
						
						
					 | 
					
						2023-08-19 17:00:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						6fdd4da0b3
					 | 
					
						
						
							
							优化秒杀活动的管理后台代码
						
						
						
						
						
						
					 | 
					
						2023-08-12 16:05:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						5e2fa48f20
					 | 
					
						
						
							
							code review:拼团、秒杀活动的代码
						
						
						
						
						
						
					 | 
					
						2023-08-05 20:51:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						d156d43d63
					 | 
					
						
						
							
							fix:完善 review 拼团、秒杀活动的实现提到的问题
						
						
						
						
						
						
					 | 
					
						2023-07-31 18:34:56 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						c563051841
					 | 
					
						
						
							
							feat:mall product 新增通过 spuIds 获取相关 spu 详情列表的接口
						
						
						
						
						
						
					 | 
					
						2023-07-03 14:44:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						409ec555e8
					 | 
					
						
						
							
							feat:mall CombinationActivity
						
						
						
						
						
						
					 | 
					
						2023-07-03 08:07:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						5ffea93731
					 | 
					
						
						
							
							mall + product:
						
						
						
						
						
						
						
						1、完善商品评论列表的 mock 
						
						
					 | 
					
						2023-06-28 00:25:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						5c9a99c83e
					 | 
					
						
						
							
							mall + promotion:
						
						
						
						
						
						
						
						1、mock 优惠劵模版分页
2、mock 批量删除收藏 
						
						
					 | 
					
						2023-06-25 17:40:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						bb0bb2a4fa
					 | 
					
						
						
							
							mall + promotion:商品列表
						
						
						
						
						
						
					 | 
					
						2023-06-25 11:25:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						b582206003
					 | 
					
						
						
							
							mall + promotion:review 页面装修
						
						
						
						
						
						
					 | 
					
						2023-06-24 12:54:59 +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
							
						 
					 | 
					
						
						
							
						
						666925da6e
					 | 
					
						
						
							
							fix:mall vo @Schema required = true => requiredMode = Schema.RequiredMode.REQUIRED
						
						
						
						
						
						
					 | 
					
						2023-06-21 08:41:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						700d95a43d
					 | 
					
						
						
							
							fix:完善商品评论 review 提到的问题
						
						
						
						
						
						
					 | 
					
						2023-06-20 18:12:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						9517ffdfb8
					 | 
					
						
						
							
							fix:修复 mall product promotion 测试 sql
						
						
						
						
						
						
					 | 
					
						2023-06-20 09:06:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						fc570b6062
					 | 
					
						
						
							
							mall + promotion:完善秒杀活动的 mock 返回
						
						
						
						
						
						
					 | 
					
						2023-06-18 21:23:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						35df912be7
					 | 
					
						
						
							
							code review:商品评价哈
						
						
						
						
						
						
					 | 
					
						2023-06-17 21:57:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						08535d6019
					 | 
					
						
						
							
							!509 完善商品评论
						
						
						
						
						
						
						
						Merge pull request !509 from puhui999/feature/mall_product 
						
						
					 | 
					
						2023-06-17 13:39:35 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						e23fb5024a
					 | 
					
						
						
							
							fix: required = true 已过期
						
						
						
						
						
						
					 | 
					
						2023-06-14 15:21:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						573ad59edc
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into feature/mall_product
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/string/StrUtils.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/ProductCategoryBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuSimpleRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuDetailRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuPageItemRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderBaseVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderItemBaseVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/base/sku/AppProductSkuBaseRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartDetailRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartItemUpdateSelectedReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartResetReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderCreateReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderDetailRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderGetCreateInfoRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderPageItemRespVO.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/vo/AppAddressBaseVO.java 
						
						
					 | 
					
						2023-06-14 15:18:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						60172274ec
					 | 
					
						
						
							
							fix:合并代码后修改差异完善商品评论相关
						
						
						
						
						
						
					 | 
					
						2023-06-12 17:02:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						5cfcaa1a6e
					 | 
					
						
						
							
							Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/comment/AppCommentController.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/comment/vo/AppProductCommentBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/comment/vo/AppProductCommentRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/AppProductSpuController.java
#	yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/comment/ProductCommentServiceImplTest.java 
						
						
					 | 
					
						2023-06-12 12:18:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						9ff873fe53
					 | 
					
						
						
							
							fix:完善商品评论测试 sql
						
						
						
						
						
						
					 | 
					
						2023-06-12 12:09:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |