owen
							
						 
					 | 
					
						
						
							
						
						499a054eb9
					 | 
					
						
						
							
							trade: 分销业务后台功能:推广用户列表
						
						
						
						
						
						
					 | 
					
						2023-09-10 22:32:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						57f0ea04f7
					 | 
					
						
						
							
							mall-order: 完善活动商品库存扣减逻辑(并发更新库存下一提交实现)
						
						
						
						
						
						
					 | 
					
						2023-09-10 11:06:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						c023209aa5
					 | 
					
						
						
							
							订单管理:完善订单调价分摊逻辑
						
						
						
						
						
						
					 | 
					
						2023-09-10 00:50:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						51dab96889
					 | 
					
						
						
							
							支付订单错误码枚举类变量添加 PAY_ 前缀和交易订单区分开避免冲突
						
						
						
						
						
						
					 | 
					
						2023-09-10 00:48:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						50354462fe
					 | 
					
						
						
							
							spu:分佣属性和分佣保持一致
						
						
						
						
						
						
					 | 
					
						2023-09-09 23:18:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						95d8be0455
					 | 
					
						
						
							
							订单管理:完善订单聚合搜索
						
						
						
						
						
						
					 | 
					
						2023-09-09 23:04:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						4265441e1d
					 | 
					
						
						
							
							分销:增加商品的分佣金额计算 api mock
						
						
						
						
						
						
					 | 
					
						2023-09-09 22:28:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						a47d744f64
					 | 
					
						
						
							
							分销:绑定分销的 url 调整
						
						
						
						
						
						
					 | 
					
						2023-09-09 21:05:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						797680895b
					 | 
					
						
						
							
							trade: 分销业务后台功能:佣金格式化
						
						
						
						
						
						
					 | 
					
						2023-09-09 20:00:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						426594ae00
					 | 
					
						
						
							
							分销:调整 app 的 price 到 brokeragePrice
						
						
						
						
						
						
					 | 
					
						2023-09-09 19:34:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						643602d038
					 | 
					
						
						
							
							trade: 分销业务后台功能:修改上级推广人
						
						
						
						
						
						
					 | 
					
						2023-09-09 19:20:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						ca55e61dd2
					 | 
					
						
						
							
							trade: 分销业务后台功能:清除推广员、修改推广资格
						
						
						
						
						
						
					 | 
					
						2023-09-09 14:38:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						fcf8ec98a0
					 | 
					
						
						
							
							!608 Date转localDateTime
						
						
						
						
						
						
						
						Merge pull request !608 from GamePlayer-Joker/master 
						
						
					 | 
					
						2023-09-09 02:22:13 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						557b09a157
					 | 
					
						
						
							
							code review:分销逻辑
						
						
						
						
						
						
					 | 
					
						2023-09-09 09:41:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						3b5215db21
					 | 
					
						
						
							
							!611 分销用户管理、Review代码修改
						
						
						
						
						
						
						
						Merge pull request !611 from 疯狂的世界/brokerate 
						
						
					 | 
					
						2023-09-09 00:48:00 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						4e9be7a181
					 | 
					
						
						
							
							trade: 分销业务后台功能:修改推广资格
						
						
						
						
						
						
					 | 
					
						2023-09-09 01:58:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						259734964d
					 | 
					
						
						
							
							trade: 分销业务后台功能:清除推广员、修改推广员
						
						
						
						
						
						
					 | 
					
						2023-09-09 01:54:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						f97c7a0f6e
					 | 
					
						
						
							
							trade: 分销业务绑定推广员
						
						
						
						
						
						
					 | 
					
						2023-09-09 01:46:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dhb52
							
						 
					 | 
					
						
						
							
						
						d7488e70b0
					 | 
					
						
						
							
							使用下划线分割ErrorCodeConstants的ErrorCode
						
						
						
						
						
						
					 | 
					
						2023-09-09 01:30:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						87c55784c4
					 | 
					
						
						
							
							code review:营销活动+订单
						
						
						
						
						
						
					 | 
					
						2023-09-09 01:27:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						6ef36d5ca6
					 | 
					
						
						
							
							trade: 增加分销 API
						
						
						
						
						
						
					 | 
					
						2023-09-08 23:33:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						1ead368595
					 | 
					
						
						
							
							trade: 优化分销用户佣金字段名称
						
						
						
						
						
						
					 | 
					
						2023-09-08 23:10:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						4b43304c76
					 | 
					
						
						
							
							trade: 优化分销用户绑定用户编号、绑定时间字段名称
						
						
						
						
						
						
					 | 
					
						2023-09-08 22:51:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						f36a6c5d6c
					 | 
					
						
						
							
							trade: 优化修改推广员接口字段名称
						
						
						
						
						
						
					 | 
					
						2023-09-08 22:40:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						b85d660a5c
					 | 
					
						
						
							
							trade: 分销业务完善校验
						
						
						
						
						
						
					 | 
					
						2023-09-08 22:33:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						0a0c3c0ede
					 | 
					
						
						
							
							trade: 分销业务相关类型移除Trade前缀
						
						
						
						
						
						
					 | 
					
						2023-09-08 12:56:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						ddcebb1986
					 | 
					
						
						
							
							common: MoneyUtils 移到 common 模块
						
						
						
						
						
						
					 | 
					
						2023-09-08 12:46:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						1cc2dfc963
					 | 
					
						
						
							
							trade: 分销Review代码修改
						
						
						
						
						
						
					 | 
					
						2023-09-08 12:29:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						166b1b31c0
					 | 
					
						
						
							
							trade: 分销用户管理
						
						
						
						
						
						
					 | 
					
						2023-09-08 11:03:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						5d6bb84d25
					 | 
					
						
						
							
							Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
						
						
						
						
						
						
					 | 
					
						2023-09-08 00:59:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						0e8755972c
					 | 
					
						
						
							
							营销活动+订单:完善大部分 TODO 提到的问题
						
						
						
						
						
						
					 | 
					
						2023-09-08 00:35:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						5808f77ade
					 | 
					
						
						
							
							code review:订单分佣
						
						
						
						
						
						
					 | 
					
						2023-09-08 00:29:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								GamePlayer-Joker
							
						 
					 | 
					
						
						
							
						
						1bf182c341
					 | 
					
						
						
							
							补充
						
						
						
						
						
						
						
						Signed-off-by: GamePlayer-Joker <13317488+gameplayer-joker@user.noreply.gitee.com> 
						
						
					 | 
					
						2023-09-07 02:18:41 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								GamePlayer-Joker
							
						 
					 | 
					
						
						
							
						
						76a8fb8a0a
					 | 
					
						
						
							
							AppCombinationRecordRespVO中的expireTime过期时间是LocalDateTime, 现在用的是new Date()
						
						
						
						
						
						
					 | 
					
						2023-09-07 01:41:46 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						eb342d5abf
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-module-member/yudao-module-member-biz/src/test/resources/sql/create_tables.sql 
						
						
					 | 
					
						2023-09-06 23:50:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						62a4e8242b
					 | 
					
						
						
							
							分销:增加提现接口
						
						
						
						
						
						
					 | 
					
						2023-09-06 23:50:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						ea26691967
					 | 
					
						
						
							
							!607 member: 佣金解冻
						
						
						
						
						
						
						
						Merge pull request !607 from 疯狂的世界/brokerate_unfreeze 
						
						
					 | 
					
						2023-09-06 15:49:39 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						2591ab5d36
					 | 
					
						
						
							
							订单中心+营销活动:完善部分 TODO 提到的问题
						
						
						
						
						
						
					 | 
					
						2023-09-06 11:29:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						fa53a3b15e
					 | 
					
						
						
							
							trade: MemberBrokerageRecord 重命名为 TradeBrokerageRecord
						
						
						
						
						
						
					 | 
					
						2023-09-06 00:35:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						9336a0a102
					 | 
					
						
						
							
							trade: 分销业务从 member 模块 转移到 trade模块
						
						
						
						
						
						
					 | 
					
						2023-09-06 00:16:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						e4b153a866
					 | 
					
						
						
							
							分佣:增加获得分销排行分页 API mock
						
						
						
						
						
						
					 | 
					
						2023-09-05 23:49:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						a68691f2d9
					 | 
					
						
						
							
							trade: 增加分销用户表
						
						
						
						
						
						
					 | 
					
						2023-09-05 23:45:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						6474502738
					 | 
					
						
						
							
							trade: 增加交易中心配置表
						
						
						
						
						
						
					 | 
					
						2023-09-05 22:31:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						0329f13fbf
					 | 
					
						
						
							
							分佣:增加获得分销排行分页 API mock
						
						
						
						
						
						
					 | 
					
						2023-09-05 21:32:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						9eb7837b67
					 | 
					
						
						
							
							member: 佣金失效
						
						
						
						
						
						
					 | 
					
						2023-09-05 19:43:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						a58d7d63ed
					 | 
					
						
						
							
							!606 会员:分销佣金计算
						
						
						
						
						
						
						
						Merge pull request !606 from 疯狂的世界/brokerage 
						
						
					 | 
					
						2023-09-05 01:58:11 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						c7ef8519c8
					 | 
					
						
						
							
							member: 分销增加佣金
						
						
						
						
						
						
					 | 
					
						2023-09-05 08:56:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						6a819da0b6
					 | 
					
						
						
							
							分佣:增加用户分销统计 API mock
						
						
						
						
						
						
					 | 
					
						2023-09-03 21:21:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						482a84a6f1
					 | 
					
						
						
							
							603 mall: 优惠券退还优化
						
						
						
						
						
						
					 | 
					
						2023-09-03 18:06:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						670f2ef5da
					 | 
					
						
						
							
							!603 mall: 优惠券退还优化
						
						
						
						
						
						
						
						Merge pull request !603 from 疯狂的世界/mall_order_cancel 
						
						
					 | 
					
						2023-09-03 10:04:41 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |