254 Commits (b47c4fbd8df97c6a5f8230f5a2fc8b71d43ba8ff)

Author SHA1 Message Date
YunaiV d048daf7d6 mq 重构:默认的 mq 实现,采用 event,减少对 redis、rocketmq 等消息队列的依赖 2 years ago
YunaiV 52e735f360 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/coupon/CouponTemplateApiImpl.java
2 years ago
YunaiV 07dbfc5546 code review:sign 签到逻辑 2 years ago
YunaiV dd2f5ba2c3 统一 boot 和 cloud 代码 2 years ago
YunaiV 7bff98b658 统一 boot 和 cloud 代码 2 years ago
puhui999 6723cae781 营销活动:完善 review 提到的问题 2 years ago
YunaiV 728308cbc0 member:优化部分变量的命名 2 years ago
YunaiV ec27a1bae5 修复报错的单元测试 2 years ago
YunaiV 0db4581030 code review:签到逻辑 2 years ago
puhui999 1bb2010dc0 签到记录:完善 review 提到的问题 2 years ago
puhui999 2f7371b4ea 签到记录:完善 review 提到的问题 2 years ago
YunaiV 979b484d7f saas:支持社交应用的多租户配置(wx 小程序) 2 years ago
YunaiV 6f757e5297 saas:支持社交应用的多租户配置(mp) 2 years ago
YunaiV d256275099 saas:支持社交应用的多租户配置 2 years ago
owen 6fbb7d6d6d 终端类型参数改为从Controller传入 2 years ago
zhijiantianya@gmail.com b6e63e885d code review:商城统计 2 years ago
owen 76f512fc7a 1. APP增加终端Header[terminal]
2. 订单、会员注册记录来源终端
2 years ago
owen 6f08645f61 会员:增加字段【注册终端】 2 years ago
YunaiV b0179457ce 重构:将订单的分支流程,抽到 TradeOrderHandler 实现类中(补全各种排重逻辑) 2 years ago
YunaiV 2e5cc0537b 重构:将订单的分支流程,抽到 TradeOrderHandler 实现类中 2 years ago
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