| 
							
							
								 lifenlong | c8ac7159cf | 采购单初期版本 | 2021-10-09 08:08:24 +08:00 |  | 
			
				
					| 
							
							
								 paulGao | 0440ecea23 | 优化logback日志 | 2021-09-30 14:48:53 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 50c08c0e01 | 解决买家未登录获取店铺详情403问题 | 2021-09-29 14:40:25 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 87c82ce4d3 | Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop 合并之前代码,解决部分参数校验问题,解决消息发送加入到两个mq队列通道问题,取消两个无效maven依赖 | 2021-09-27 14:31:25 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | ff24c95d02 | 连续签到积分无法正常获取问题。 | 2021-09-23 11:42:03 +08:00 |  | 
			
				
					| 
							
							
								 paulGao | d3e1de5620 | fix XSS and BAC, improve code style | 2021-09-09 16:47:14 +08:00 |  | 
			
				
					| 
							
							
								 OceansDeep | 7ac15d1abe | !21 升级spring boot 版本,完善Elasticsearch搜索 Merge pull request !21 from OceansDeep/feature/pg | 2021-09-02 03:44:14 +00:00 |  | 
			
				
					| 
							
							
								 Chopper | a9f0eac6f7 | 默认收货地址代码优化。 积分商品/砍价商品库存问题处理 | 2021-09-02 10:00:57 +08:00 |  | 
			
				
					| 
							
							
								 paulGao | 318cc04566 | add order by goods parameters field sort to aggregation elasticsearch | 2021-09-01 19:07:30 +08:00 |  | 
			
				
					| 
							
							
								 paulGao | 2e80478203 | upgrade spring boot 2.3 to 2.4 | 2021-09-01 19:03:36 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | d7e4948447 | 解决几个阿里规约相关的代码问题 | 2021-08-30 18:00:41 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | f8c1e9d8b8 | 去除jpa依赖,部分不相关的代码去除。 | 2021-08-30 14:32:49 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | e141d22504 | 促销相关代码批量提交 | 2021-08-20 15:47:54 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | ab118a8efc | 购物车价格计算全面优化,优惠券分布到每个订单,满减活动没有对参与商品进行判定问题处理。 | 2021-08-19 17:38:37 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 100d5d3317 | 解决分销佣金冻结错误 | 2021-08-12 00:35:39 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 64e45c10b1 | 增加店铺企业信息接口 增加删除商品
修复:修改订单金额售后金额不正确 | 2021-08-11 20:14:56 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | dd7af218a4 | Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop | 2021-08-11 12:19:44 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | f9a18ffbe1 | super权限无法获取问题处理,拼团表单校验问题,购物车渲染流程优化 | 2021-08-11 12:18:42 +08:00 |  | 
			
				
					| 
							
							
								 pikachu | 7b7bab44c7 | 删除积分修复数据 | 2021-08-10 19:25:30 +08:00 |  | 
			
				
					| 
							
							
								 pikachu | 0a17fa9f53 | 修复会员总获得积分api | 2021-08-10 19:21:11 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 829472c6a3 | Merge remote-tracking branch 'origin/qiuqiu' 合并砍价/积分相关
# Conflicts:
#	consumer/src/main/java/cn/lili/event/impl/MemberPointExecute.java
#	update-sql/version4.2to4.3.sql | 2021-07-30 15:50:36 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 0760c72ef8 | 热词获取改为根据数量,传递count获取系统热搜词语 | 2021-07-30 14:27:41 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | f00386c81d | 继续优化代码,调整依赖关系,缩减无效代码 | 2021-07-28 11:19:33 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 02f3bde2b4 | 积分订单、用户下单积分数值判断 | 2021-07-27 15:33:11 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 5a7440c5bf | 同步master,解决冲突 | 2021-07-27 10:00:34 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 58d41775cf | 店铺请求不记录PV统计 | 2021-07-22 17:26:10 +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 | 44fb0601a6 | 解决商品购买但是商品页面的库存显示不正确的问题 | 2021-07-20 20:25:57 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 6607506929 | 砍价订单实现 | 2021-07-20 16:18:54 +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 |  | 
			
				
					| 
							
							
								 lifenlong | 451d683c4f | Merge branch 'master' into qiuqiu | 2021-07-18 13:43:45 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 5d211c241d | 砍价活动商品购买 | 2021-07-17 14:02:34 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | a9c79eedd4 | 代码结构优化,缩减。一个多次判定问题处理 | 2021-07-16 10:40:44 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 4718ce292d | 修改砍价活动 | 2021-07-13 16:17:53 +08:00 |  | 
			
				
					| 
							
							
								 pikachu | 656e2a9307 | 合并 | 2021-07-12 23:41:23 +08:00 |  | 
			
				
					| 
							
							
								 pikachu | 7f08124afc | 砍价活动第一版本 | 2021-07-12 23:38:32 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 86f010b87e | maven 规范 | 2021-07-12 16:33:32 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | d29d166ce0 | banner 统一 | 2021-07-12 14:44:11 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 18d2379a19 | 采用阿里代码规约,对代码进行优化 | 2021-07-09 08:42:16 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 3e73257922 | 采用阿里代码规约,对代码进行优化 | 2021-07-09 01:56:24 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 931276f72b | 添加ResultCode | 2021-07-01 11:17:18 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | cce14b4794 | 同步 | 2021-07-01 08:35:18 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 079437100d | 版本好升级 | 2021-06-30 19:59:36 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 346465630c | 添加ResultCode | 2021-06-30 15:45:33 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 23388eff6b | 升级项目版本号 | 2021-06-30 14:53:26 +08:00 |  |