p38192567
/
ruoyi-vue-pro1
mirror of https://gitee.com/zhijiantianya/ruoyi-vue-pro.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
5,795 Commits 8 Branches 31 Tags 233 MiB
Commit Graph

257 Commits

Author SHA1 Message Date
YunaiV 319c73feaf 🐛 修复微信小程序的一键登录时，缺少 state 参数 2023-12-03 19:15:21 +08:00
YunaiV eeeafcc10c 1.9.0 版本发布 2023-11-30 21:14:13 +08:00
YunaiV 6a61db8508 security: query string 支持传递 token 参数，解决 ws token 认证 2023-11-22 23:02:59 +08:00
YunaiV d048daf7d6 mq 重构：默认的 mq 实现，采用 event，减少对 redis、rocketmq 等消息队列的依赖 2023-10-30 12:53:54 +08:00
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
 2023-10-24 19:09:01 +08:00
YunaiV 07dbfc5546 code review：sign 签到逻辑 2023-10-24 19:08:08 +08:00
YunaiV dd2f5ba2c3 统一 boot 和 cloud 代码 2023-10-24 18:48:02 +08:00
YunaiV 7bff98b658 统一 boot 和 cloud 代码 2023-10-23 23:48:06 +08:00
puhui999 6723cae781 营销活动：完善 review 提到的问题 2023-10-23 12:02:13 +08:00
YunaiV 728308cbc0 member：优化部分变量的命名 2023-10-22 16:35:48 +08:00
YunaiV ec27a1bae5 修复报错的单元测试 2023-10-22 08:24:47 +08:00
YunaiV 0db4581030 code review：签到逻辑 2023-10-21 19:56:53 +08:00
puhui999 1bb2010dc0 签到记录：完善 review 提到的问题 2023-10-21 01:11:10 +08:00
puhui999 2f7371b4ea 签到记录：完善 review 提到的问题 2023-10-21 01:01:06 +08:00
YunaiV 979b484d7f saas：支持社交应用的多租户配置（wx 小程序） 2023-10-19 21:42:39 +08:00
YunaiV 6f757e5297 saas：支持社交应用的多租户配置（mp） 2023-10-19 12:54:44 +08:00
YunaiV d256275099 saas：支持社交应用的多租户配置 2023-10-18 23:48:14 +08:00
owen 6fbb7d6d6d 终端类型参数改为从Controller传入 2023-10-16 21:01:01 +08:00
zhijiantianya@gmail.com b6e63e885d code review：商城统计 2023-10-16 20:01:25 +08:00
owen 76f512fc7a 1. APP增加终端Header[terminal] 
2. 订单、会员注册记录来源终端
 2023-10-16 15:06:59 +08:00
owen 6f08645f61 会员：增加字段【注册终端】 2023-10-16 14:22:43 +08:00
YunaiV b0179457ce 重构：将订单的分支流程，抽到 TradeOrderHandler 实现类中（补全各种排重逻辑） 2023-10-11 07:49:23 +08:00
YunaiV 2e5cc0537b 重构：将订单的分支流程，抽到 TradeOrderHandler 实现类中 2023-10-10 19:20:12 +08:00
YunaiV df4716d5a1 code review：分销 2023-10-03 10:23:40 +08:00
owen 7fdd36d979 Review代码修改 2023-10-02 21:27:46 +08:00
YunaiV d4417d2474 code review：积分、优惠劵、佣金等逻辑 2023-10-01 23:31:07 +08:00
owen 2168145c3e 会员：会员配置的积分相关字段加上point前缀 2023-10-01 10:41:21 +08:00
owen ab35fcbe9b 会员：积分配置改为会员配置 2023-10-01 10:25:18 +08:00
owen 4f03635fcd 签到：签到后增加用户积分、经验 2023-10-01 09:53:54 +08:00
owen e7876b1520 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-30 22:09:49 +08:00
owen fc432ba073 优惠券：新人券使用 MQ 发放 2023-09-30 17:29:32 +08:00
owen 497ea2eee8 会员详情，修改会员积分 2023-09-30 15:50:13 +08:00
YunaiV 367b45e3bd code review：数据统计 2023-09-30 12:30:01 +08:00
owen 26628913cb 错误码分段 2023-09-29 21:34:38 +08:00
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
 2023-09-28 15:18:59 +08:00
YunaiV 9e3564bd6a code review：优惠劵逻辑 2023-09-28 09:23:42 +08:00
YunaiV ad535e674f trade：积分相关的价格计算 2023-09-26 20:11:54 +08:00
YunaiV e384b810bf code review：分销逻辑 2023-09-25 09:39:39 +08:00
dhb52 96d4e7bc56 fix: 需要填充错误信息中的参数 2023-09-24 22:23:31 +08:00
owen e9fd377772 分销：Review代码修改 2023-09-24 20:28:44 +08:00
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
 2023-09-24 10:10:53 +08:00
YunaiV 53e789dfdc trade：订单表，增加 vip 优惠字段 2023-09-23 23:58:22 +08:00
owen 052328c5fa 积分：完善积分获得、退还、使用 相关逻辑 2023-09-23 14:11:16 +08:00
YunaiV 1b477aaa0d trade：优化下单逻辑的实现 2023-09-20 20:21:41 +08:00
YunaiV be1ecf96d4 code review：会员签到逻辑 2023-09-18 22:18:42 +08:00
xiaqing d4a891e6c4 新增两个APP端接口 
1.获取用户个人签到信息
2.用户签到接接口
 2023-09-15 23:21:11 +08:00
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
 2023-09-15 15:27:59 +08:00
xiaqing 9d262e8e7f 新增两个APP端接口 
1.获取用户个人签到信息
2.用户签到接接口
 2023-09-15 15:20:39 +08:00
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
 2023-09-11 16:19:55 +08:00
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
 2023-09-10 23:56:00 +08:00