| 
							
							
								 Chopper | 644de06172 | 订单平台佣金bug修复,价格计算相关优化 | 2021-08-02 18:44:05 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | f00386c81d | 继续优化代码,调整依赖关系,缩减无效代码 | 2021-07-28 11:19:33 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | abdc74c773 | Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop | 2021-07-23 19:45:21 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 2c8ac59628 | 优化商品显示逻辑 售后价格判断 | 2021-07-23 19:44:46 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | fdb55bc426 | Merge branch 'backup' # Conflicts:
#	framework/src/main/java/cn/lili/modules/goods/serviceimpl/DraftGoodsServiceImpl.java
#	framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java
#	framework/src/main/java/cn/lili/modules/order/order/serviceimpl/TradeServiceImpl.java
#	framework/src/main/java/cn/lili/modules/promotion/serviceimpl/FullDiscountServiceImpl.java | 2021-07-22 12:07:22 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 0ccdc94644 | Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop | 2021-07-21 17:46:58 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | bd3aceaeac | 完善方法注释 | 2021-07-21 17:46:46 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | bc6abdbf1a | 初步调整结构完成 | 2021-07-21 15:23:47 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | dd491e38e5 | 进行中的满减活动可以关闭 | 2021-07-21 15:13:50 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | fe021f8a11 | 暂时备份一下代码,准备切换master | 2021-07-20 15:44:09 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 4b7ab94ba4 | 批量调整目录结构 | 2021-07-19 16:07:02 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 06212c073d | 调整目录结构 | 2021-07-19 15:01:51 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | a9c79eedd4 | 代码结构优化,缩减。一个多次判定问题处理 | 2021-07-16 10:40:44 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 86f010b87e | maven 规范 | 2021-07-12 16:33:32 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 18d2379a19 | 采用阿里代码规约,对代码进行优化 | 2021-07-09 08:42:16 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 3e73257922 | 采用阿里代码规约,对代码进行优化 | 2021-07-09 01:56:24 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 00e93c91f5 | 优化订单商品类型 | 2021-07-07 16:17:38 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 079437100d | 版本好升级 | 2021-06-30 19:59:36 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 23388eff6b | 升级项目版本号 | 2021-06-30 14:53:26 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 63802a596b | 添加秒杀设置 | 2021-06-28 11:30:37 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | c9b7ee2c81 | 商品发布模块更新 | 2021-06-24 10:57:27 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 8d5d902550 | 管理端验证码登录校验 | 2021-06-23 16:47:16 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 7851e8af39 | 规格代码相关改版 | 2021-06-23 16:46:52 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | c7e4af6175 | 注释规范 | 2021-06-21 14:14:07 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | bfc76f7ceb | 同步master | 2021-06-18 10:03:34 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 7ce5b517fc | 商品评价场景,查询业务重构,代码复用增强,前端可以查看到后端设置隐藏的评价内容问题解决 | 2021-06-17 10:37:11 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | a159c0d0db | 下载批量发货订单列表 | 2021-06-13 15:53:19 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 3814b4a9a5 | 暂提 | 2021-06-13 14:51:39 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 5a4f8e2a72 | 同步 | 2021-06-13 09:03:16 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 34e5488b9d | 创建虚拟订单 由前台处理待发货订单导出 | 2021-06-10 16:25:40 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | da1863850a | 主要完善延时任务相关,缺失的注释信息,log记录的信息完善。目录结构优化。 sql数据过大,展示sql默认为false,需要打开手动打开就好。 | 2021-06-08 18:40:32 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | a51e86fd98 | 去除e.printStackTrace();使用slf4j实现 | 2021-06-07 16:49:59 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | bbe01e9e67 | 用户经验值设置 | 2021-06-05 17:13:04 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | e379a2eb34 | 导出售后单 | 2021-06-05 14:48:16 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | b7e439e177 | 店铺导出订单列表 | 2021-06-05 14:04:56 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 07b9e413d6 | 添加秒杀活动设置 | 2021-06-02 17:30:32 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | b70da68761 | Merge branch 'Bulbasaur' of https://gitee.com/beijing_hongye_huicheng/lilishop into Bulbasaur | 2021-06-01 15:51:30 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 0324951d9a | 微信小程序优化 | 2021-06-01 15:51:19 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 78aee87b45 | Merge branch 'Bulbasaur' of gitee.com:beijing_hongye_huicheng/lilishop into Bulbasaur | 2021-05-31 11:34:47 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | e09747c410 | 支持elk | 2021-05-31 11:34:43 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 3639ed731b | 虚拟订单核验 | 2021-05-29 12:31:38 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 814d118d77 | 运营后台可设置推荐直播间 | 2021-05-28 12:10:33 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | c58524cf94 | 创建直播商品VO,显示直播商品的库存以及店铺名称 | 2021-05-26 18:40:54 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 99b9e8cf91 | 导出订单发货Excel,上传Excel订单批量发货 | 2021-05-26 17:09:55 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | a9ec03f0a4 | 1.增加直播商品 2.同步直播商品状态
3.展示状态展示直播商品列表 | 2021-05-25 16:10:16 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 00a0edeade | 批量添加直播商品 | 2021-05-24 18:24:19 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 16cc989cdf | 设置秒杀活动为自动开启 | 2021-05-24 18:18:24 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 16498a6850 | Merge branch 'master' into Bulbasaur | 2021-05-21 17:25:15 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 4c200595a5 | 设置 app版本白名单 | 2021-05-21 14:18:07 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | a8a6506516 | 同步直播状态、直播间新增商品数量 | 2021-05-20 14:56:15 +08:00 |  |