| 
							
							
								 YunaiV | c87bc084e6 | promotion:RewardActivityServiceImpl 的 getMatchRewardActivities 逻辑 | 2022-11-06 16:36:14 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 941782fb10 | promotion:完善限时折扣的修改逻辑 | 2022-11-06 12:38:13 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 6d48bd1ed8 | promotion:完善限时折扣的添加逻辑 | 2022-11-06 00:48:07 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 544597d6e2 | promotion:完善限时折扣,补充相关的单元测试 | 2022-11-05 19:57:50 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | d4b7f4aaa0 | promotion:增加限时折扣的基础代码 | 2022-11-05 19:13:43 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 00f90e75d9 | promotion:增加满减送活动的关闭功能 | 2022-11-05 10:52:09 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 79304b3a73 | promotion:增加满减送活动的排重校验、单元测试 | 2022-11-05 09:57:45 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 0e5b7734ac | promotion:增加满减送活动的后端 20% | 2022-11-04 23:19:28 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 873b530652 | promotion:增加优惠劵的回收操作 | 2022-11-04 21:17:37 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 47c2dfa623 | promotion:增加优惠劵的前端分页界面 100% | 2022-11-04 19:17:17 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | a89d5a83db | promotion:增加优惠劵的后端分页接口 | 2022-11-03 22:40:19 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 2c39405bce | promotion:完善的优惠卷的实体 | 2022-11-03 00:05:13 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 8ae8a4a652 | promotion:完善优惠劵模板的单元测试、禁用功能 | 2022-11-02 22:44:37 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | bd661296c0 | promotion:完善优惠劵模板的功能 | 2022-11-02 22:19:33 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 2aaeb7af88 | promotion:实现部分优惠劵模板的前端表单 80% | 2022-11-02 00:35:53 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | dc51a93533 | promotion:实现部分优惠劵模板的前端列表 | 2022-11-01 22:31:07 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 3c10058dbd | promotion:实现部分优惠劵模板的前端逻辑 | 2022-11-01 00:37:07 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 979ba0f916 | promotion:实现优惠劵模板的逻辑 | 2022-10-31 23:47:06 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 035c2cf28c | promotion:完善 优惠劵模板 表~ | 2022-10-31 21:19:18 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | e6acdf7098 | 将 market 模块,调整成 promotion 模块 | 2022-10-30 17:37:07 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 829bbf58b5 | price:完成优惠劵的价格计算~ | 2022-10-30 17:32:59 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 160d619d59 | price:完成满减送的价格计算~ | 2022-10-30 13:20:07 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 4e9fe4bc54 | price:完成限时折扣的价格计算~ | 2022-10-29 22:23:48 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 084d4baba2 | price:完成会员价格的计算~ | 2022-10-29 21:46:19 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | a88eda340b | 调整 price 接口,参考 taobao 的技术文档 | 2022-10-28 23:49:15 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 3b506006dd | Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp | 2022-10-28 22:44:18 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 5c4b61f5ff | 暂存调整 Price 接口 | 2022-10-28 22:44:12 +08:00 |  | 
			
				
					| 
							
							
								 luowenfeng | d91655f3c4 | feature(商城): 修改单元测试 | 2022-10-27 11:00:14 +08:00 |  | 
			
				
					| 
							
							
								 luowenfeng | 7dd12a3e81 | Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp | 2022-10-27 10:30:27 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | e1d5cfe8fe | 微调 trade 交易表的设计 | 2022-10-26 21:25:29 +08:00 |  | 
			
				
					| 
							
							
								 luowenfeng | 20c79b7053 | Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp | 2022-10-26 14:57:45 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 356642ecea | review 商品的 save 界面 | 2022-10-25 22:13:31 +08:00 |  | 
			
				
					| 
							
							
								 luowenfeng | d92d257619 | Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp  Conflicts:
	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java
	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java | 2022-10-25 11:15:17 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 7bf37fcb64 | 优化管理后台的商品分页的查询 | 2022-10-24 22:12:47 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | c00ded3ed3 | 优化商品的 index 界面 | 2022-10-24 21:27:13 +08:00 |  | 
			
				
					| 
							
							
								 luowenfeng | 8c4e3db32b | feature(商城): 商城review改 | 2022-10-24 10:28:07 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 2bd2cb56a1 | Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp  Conflicts:
	yudao-module-mall/yudao-module-trade-biz/pom.xml | 2022-10-23 22:16:54 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 412c017f21 | code review 商品模块 | 2022-10-23 22:15:26 +08:00 |  | 
			
				
					| 
							
							
								 luowenfeng | aea763e96e | feature(单元测试): ProductSpuServiceImpl单元测试 | 2022-10-22 17:51:26 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | a13fb61359 | 优化 pom.xml 文件,减少无用的多租户引用 | 2022-10-18 23:32:42 +08:00 |  | 
			
				
					| 
							
							
								 luowenfeng | 31f5b27d01 | feature(uniapp分类): review | 2022-10-17 19:55:46 +08:00 |  | 
			
				
					| 
							
							
								 zhijiantianya | 8940375efa | fix mall build error | 2022-10-17 13:44:54 +08:00 |  | 
			
				
					| 
							
							
								 zhijiantianya@gmail.com | 67436ea4c6 | mall: 下单的代码 review | 2022-09-30 09:53:45 +00:00 |  | 
			
				
					| 
							
							
								 芋道源码 | 952e6aa4a8 | !266 接口实现-交易订单 单元测试 Merge pull request !266 from LeeYan9/ly_uniapp | 2022-09-30 08:56:13 +00:00 |  | 
			
				
					| 
							
							
								 zhijiantianya@gmail.com | fbee21de5f | mall: 商品的代码 review | 2022-09-30 08:54:28 +00:00 |  | 
			
				
					| 
							
							
								 zhijiantianya@gmail.com | c25791047f | mall: 商品的代码 review | 2022-09-30 08:30:04 +00:00 |  | 
			
				
					| 
							
							
								 luowenfeng | d3c37c41d2 | feature(管理后台): 商品管理 | 2022-09-22 11:41:18 +08:00 |  | 
			
				
					| 
							
							
								 luowenfeng | 77a676ee07 | feature(管理后台): 商品列表 | 2022-09-21 19:40:07 +08:00 |  | 
			
				
					| 
							
							
								 luowenfeng | fdb2d7339f | feature(管理后台): 商品列表 | 2022-09-21 15:57:32 +08:00 |  | 
			
				
					| 
							
							
								 xingyu | 9054a772b0 | feat: 升级依赖 | 2022-09-20 18:00:43 +08:00 |  |