234 Commits (2c10dde19514c1189d17faeada3e2c7cdf30e5bf)

Author	SHA1	Message	Date
YunaiV	df4716d5a1	code review：分销	2 years ago
owen	7fdd36d979	Review代码修改	2 years ago
YunaiV	d4417d2474	code review：积分、优惠劵、佣金等逻辑	2 years ago
owen	2168145c3e	会员：会员配置的积分相关字段加上point前缀	2 years ago
owen	ab35fcbe9b	会员：积分配置改为会员配置	2 years ago
owen	4f03635fcd	签到：签到后增加用户积分、经验	2 years ago
owen	e7876b1520	Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product	2 years ago
owen	fc432ba073	优惠券：新人券使用 MQ 发放	2 years ago
owen	497ea2eee8	会员详情，修改会员积分	2 years ago
YunaiV	367b45e3bd	code review：数据统计	2 years ago
owen	26628913cb	错误码分段	2 years ago
YunaiV	5913ee0706	Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product ... # Conflicts: # yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java # yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityDetailRespVO.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityRespVO.java # yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementReqVO.java # yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java # yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java # yudao-server/src/main/resources/application-local.yaml	2 years ago
YunaiV	9e3564bd6a	code review：优惠劵逻辑	2 years ago
YunaiV	ad535e674f	trade：积分相关的价格计算	2 years ago
YunaiV	e384b810bf	code review：分销逻辑	2 years ago
dhb52	96d4e7bc56	fix: 需要填充错误信息中的参数	2 years ago
owen	e9fd377772	分销：Review代码修改	2 years ago
owen	f7296d18b9	Merge remote-tracking branch 'origin/feature/mall_product' into brokerate ... # Conflicts: # yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/common/PromotionTypeEnum.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderItemDO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateRespBO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradePriceCalculatorHelper.java # yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/dto/MemberUserRespDTO.java	2 years ago
YunaiV	53e789dfdc	trade：订单表，增加 vip 优惠字段	2 years ago
owen	052328c5fa	积分：完善积分获得、退还、使用 相关逻辑	2 years ago
YunaiV	1b477aaa0d	trade：优化下单逻辑的实现	2 years ago
YunaiV	be1ecf96d4	code review：会员签到逻辑	2 years ago
xiaqing	d4a891e6c4	新增两个APP端接口 ... 1.获取用户个人签到信息 2.用户签到接接口	2 years ago
xiaqing	e893cfd757	Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product ... # Conflicts: # yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java # yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/signin/MemberSignInRecordConvert.java # yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/signin/MemberSignInRecordMapper.java # yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordService.java # yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordServiceImpl.java	2 years ago
xiaqing	9d262e8e7f	新增两个APP端接口 ... 1.获取用户个人签到信息 2.用户签到接接口	2 years ago
YunaiV	8b50cd9661	Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro ... Conflicts: yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationRecordController.java yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java	2 years ago
owen	cddeb37289	Merge remote-tracking branch 'origin/feature/mall_product' into brokerate ... # Conflicts: # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/record/BrokerageRecordConvert.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/user/BrokerageUserConvert.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/record/BrokerageRecordServiceImpl.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/user/BrokerageUserServiceImpl.java	2 years ago
owen	dffdd471d5	member: 修正 查询用户列表方法，传入的ID集合为空时，会导致异常的问题	2 years ago
YunaiV	40e1a879e3	登录：社交登录时，额外返回 openid	2 years ago
YunaiV	65d7b30011	Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro	2 years ago
YunaiV	557b09a157	code review：分销逻辑	2 years ago
dhb52	d7488e70b0	使用下划线分割ErrorCodeConstants的ErrorCode	2 years ago
owen	6ef36d5ca6	trade: 增加分销 API	2 years ago
lemoncc	2fd201c7fa	🌈 style: 描述错误, 社交类型的枚举为 SocialTypeEnum 而不是 SysUserSocialTypeEnum	2 years ago
owen	1cc2dfc963	trade: 分销Review代码修改	2 years ago
owen	166b1b31c0	trade: 分销用户管理	2 years ago
YunaiV	5808f77ade	code review：订单分佣	2 years ago
YunaiV	b8a4d8cab2	分销：避免报错	2 years ago
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	2 years ago
芋道源码	ea26691967	!607 member: 佣金解冻 ... Merge pull request !607 from 疯狂的世界/brokerate_unfreeze	2 years ago
YunaiV	bf92727b27	Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product ... Conflicts: yudao-module-member/yudao-module-member-biz/src/test/resources/sql/create_tables.sql	2 years ago
owen	fa53a3b15e	trade: MemberBrokerageRecord 重命名为 TradeBrokerageRecord	2 years ago
owen	9336a0a102	trade: 分销业务从 member 模块 转移到 trade模块	2 years ago
YunaiV	0329f13fbf	分佣：增加获得分销排行分页 API mock	2 years ago
owen	9eb7837b67	member: 佣金失效	2 years ago
owen	a708521b9d	member: 佣金解冻	2 years ago
owen	2f6092005b	member: 佣金解冻	2 years ago
芋道源码	a58d7d63ed	!606 会员：分销佣金计算 ... Merge pull request !606 from 疯狂的世界/brokerage	2 years ago
owen	090058a2ba	member: 佣金不冻结时，直接就是结算状态	2 years ago
owen	c7ef8519c8	member: 分销增加佣金	2 years ago