YunaiV
							
						 
					 | 
					
						
						
							
						
						eeeafcc10c
					 | 
					
						
						
							
							1.9.0 版本发布
						
						
						
						
						
						
					 | 
					
						2023-11-30 21:14:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c7a21b2a64
					 | 
					
						
						
							
							mall:优化商品收藏的分页接口
						
						
						
						
						
						
					 | 
					
						2023-11-19 00:58:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						867293a4f9
					 | 
					
						
						
							
							!724 会员中心商品收藏
						
						
						
						
						
						
						
						Merge pull request !724 from niou233/feature/mall_product_org 
						
						
					 | 
					
						2023-11-18 16:40:00 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						330380c2d0
					 | 
					
						
						
							
							营销:适配商城装修组件【商品卡片】
						
						
						
						
						
						
					 | 
					
						2023-11-17 09:56:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								niou233
							
						 
					 | 
					
						
						
							
						
						5a5a42463b
					 | 
					
						
						
							
							refactor: 会员商品收藏
						
						
						
						
						
						
					 | 
					
						2023-11-08 17:22:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								niou233
							
						 
					 | 
					
						
						
							
						
						92be763c6f
					 | 
					
						
						
							
							refactor: 会员商品收藏
						
						
						
						
						
						
					 | 
					
						2023-11-08 17:18:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								niou233
							
						 
					 | 
					
						
						
							
						
						670c0962a7
					 | 
					
						
						
							
							refactor: 会员商品收藏
						
						
						
						
						
						
					 | 
					
						2023-11-08 17:03:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								niou233
							
						 
					 | 
					
						
						
							
						
						cbaadc3a77
					 | 
					
						
						
							
							Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product_org
						
						
						
						
						
						
					 | 
					
						2023-11-08 14:39:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								niou233
							
						 
					 | 
					
						
						
							
						
						5facac7330
					 | 
					
						
						
							
							refactor: 会员商品收藏
						
						
						
						
						
						
					 | 
					
						2023-11-08 14:37:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								niou233
							
						 
					 | 
					
						
						
							
						
						daa7d14b09
					 | 
					
						
						
							
							reafactor: 会员商品收藏
						
						
						
						
						
						
					 | 
					
						2023-11-08 14:36:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dongshanshan
							
						 
					 | 
					
						
						
							
						
						98aae5ed1a
					 | 
					
						
						
							
							feat: 会员商品收藏
						
						
						
						
						
						
					 | 
					
						2023-10-31 16:51:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						52e735f360
					 | 
					
						
						
							
							Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/coupon/CouponTemplateApiImpl.java 
						
						
					 | 
					
						2023-10-24 19:09:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						3672d0f245
					 | 
					
						
						
							
							商品模块移除对营销模块的依赖
						
						
						
						
						
						
					 | 
					
						2023-10-23 17:29:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						a778c25075
					 | 
					
						
						
							
							product:优化代码实现,简化重复判空
						
						
						
						
						
						
					 | 
					
						2023-10-22 21:44:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						0db4581030
					 | 
					
						
						
							
							code review:签到逻辑
						
						
						
						
						
						
					 | 
					
						2023-10-21 19:56:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						283ca908b7
					 | 
					
						
						
							
							SPU: 完善选择优惠卷
						
						
						
						
						
						
					 | 
					
						2023-10-20 16:35:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						6e11154010
					 | 
					
						
						
							
							SPU: 添加选择优惠卷
						
						
						
						
						
						
					 | 
					
						2023-10-20 11:35:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						55eed1377a
					 | 
					
						
						
							
							营销活动: 新增文章管理
						
						
						
						
						
						
					 | 
					
						2023-10-15 16:16:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						d4417d2474
					 | 
					
						
						
							
							code review:积分、优惠劵、佣金等逻辑
						
						
						
						
						
						
					 | 
					
						2023-10-01 23:31:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						057952bdeb
					 | 
					
						
						
							
							Merge branch 'feature/mall_product' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/LocalDateTimeUtils.java 
						
						
					 | 
					
						2023-10-01 22:00:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						b74169acfc
					 | 
					
						
						
							
							trade:优化订单列表的查询
						
						
						
						
						
						
					 | 
					
						2023-10-01 21:59:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						d0d21b2787
					 | 
					
						
						
							
							优惠券:新增/修改时,校验对应的商品、分类是否存在
						
						
						
						
						
						
					 | 
					
						2023-09-30 19:39:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						d402bdb7e0
					 | 
					
						
						
							
							trade:优化售后取消订单的实现代码
						
						
						
						
						
						
					 | 
					
						2023-09-29 10:08:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |