77 Commits (dcf6cc293e36754962c403d8f7612b72aeec7103)

Author SHA1 Message Date
YunaiV 59752d43b7 Member:修复社交登录时,自动创建 user 后,未进行绑定的问题 2 years ago
YunaiV 98697ee075 ⬆️ 2 years ago
YunaiV d048daf7d6 mq 重构:默认的 mq 实现,采用 event,减少对 redis、rocketmq 等消息队列的依赖 2 years ago
YunaiV 7bff98b658 统一 boot 和 cloud 代码 2 years ago
YunaiV 728308cbc0 member:优化部分变量的命名 2 years ago
YunaiV 979b484d7f saas:支持社交应用的多租户配置(wx 小程序) 2 years ago
YunaiV b0179457ce 重构:将订单的分支流程,抽到 TradeOrderHandler 实现类中(补全各种排重逻辑) 2 years ago
YunaiV 2e5cc0537b 重构:将订单的分支流程,抽到 TradeOrderHandler 实现类中 2 years ago
owen 7fdd36d979 Review代码修改 3 years ago
YunaiV d4417d2474 code review:积分、优惠劵、佣金等逻辑 3 years ago
owen 2168145c3e 会员:会员配置的积分相关字段加上point前缀 3 years ago
owen ab35fcbe9b 会员:积分配置改为会员配置 3 years ago
owen 4f03635fcd 签到:签到后增加用户积分、经验 3 years ago
owen fc432ba073 优惠券:新人券使用 MQ 发放 3 years ago
owen 497ea2eee8 会员详情,修改会员积分 3 years ago
owen 26628913cb 错误码分段 3 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
3 years ago
YunaiV ad535e674f trade:积分相关的价格计算 3 years ago
YunaiV e384b810bf code review:分销逻辑 3 years ago
owen e9fd377772 分销:Review代码修改 3 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
3 years ago
YunaiV 53e789dfdc trade:订单表,增加 vip 优惠字段 3 years ago
owen 052328c5fa 积分:完善积分获得、退还、使用 相关逻辑 3 years ago
YunaiV 1b477aaa0d trade:优化下单逻辑的实现 3 years ago
YunaiV be1ecf96d4 code review:会员签到逻辑 3 years ago
xiaqing d4a891e6c4 新增两个APP端接口
1.获取用户个人签到信息
2.用户签到接接口
3 years ago
dhb52 d7488e70b0 使用下划线分割ErrorCodeConstants的ErrorCode 3 years ago
owen 1cc2dfc963 trade: 分销Review代码修改 3 years ago
YunaiV 5808f77ade code review:订单分佣 3 years ago
owen 9336a0a102 trade: 分销业务从 member 模块 转移到 trade模块 3 years ago
owen 2f6092005b member: 佣金解冻 3 years ago
owen c7ef8519c8 member: 分销增加佣金 3 years ago
owen 991b53649b member: 分销配置 3 years ago
owen 02abe86253 member:
1.用户积分变动方法, 提取到单独的接口中
2.规范代码
3 years ago
YunaiV b75d777670 code review:订单评论、订单积分的变更 3 years ago
owen d4acacec60 trade: 1.支付成功后,增加用户积分;2.退款成功后,扣减用户积分 3 years ago
owen 9aee08ee0e 会员:修改Review的代码 3 years ago
YunaiV 9b6f5bd503 code review:会员等级 3 years ago
owen dc382d80bb 会员: 重构会员等级逻辑 3 years ago
owen bdb38c4157 会员: 修改会员等级,使用单独的表单、接口 3 years ago
owen 7fd497fcc9 会员: 修改重复的错误码 3 years ago
owen 9d9638b15b Merge remote-tracking branch 'origin/feature/mall_product' into member_dev
# Conflicts:
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/user/MemberUserConvert.java
3 years ago
owen 8ae3401452 会员: 增加会员分组功能 3 years ago
芋道源码 4cd5b5712b
!577 会员:修改会员标签名称唯一校验逻辑
Merge pull request !577 from 疯狂的世界/member_dev
3 years ago
owen 8ffbc15cec 会员:后台调整会员等级 3 years ago
owen f884054d2c 会员:完善会员等级校验、单元测试 3 years ago
YunaiV 281ba1e369 code review:调整错误码分段 3 years ago
YunaiV a83c156bf1 code review:签到记录 3 years ago
YunaiV 4257cad46a code review:会员积分 3 years ago
owen e2032e7e97 会员:增加会员等级增删改查 3 years ago