122 Commits (ec1ce2f358ec47777743fca1dea25765ede7e7c1)

Author SHA1 Message Date
YunaiV 722223c659 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
# Conflicts:
#	yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/comment/ProductCommentServiceImplTest.java
2 years ago
YunaiV 16fd1a9639 🐛 oracle limit 查询不正确 2 years ago
YunaiV fcef0f7f50 升级最新依赖 2 years ago
YunaiV bbba83ef61 📖 MALL:code review 商品统计的代码 2 years ago
YunaiV eb048532f7 Merge branch 'develop' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into develop
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/article/AppArticleController.java
2 years ago
YunaiV 290f45dd6e Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
# Conflicts:
#	yudao-server/src/main/resources/application-local.yaml
2 years ago
YunaiV 829965e50a 🐛 fix(websocket): 修复 websocket 失效的问题 2 years ago
YunaiV 08ff391f78 🐛 Websocket 断开时,未删除会话缓存 bug 2 years ago
owen 4a007f0c98 统计:增加商品统计 2 years ago
YunaiV 23df8633f4 📖 CRM:code review 数据权限的实现 2 years ago
puhui999 5c395fc1c4 CRM: 完善 code review 数据权限提到的问题,重新封装 CrmQueryWrapperUtils 2 years ago
YunaiV 98697ee075 ⬆️ 2 years ago
YunaiV 30fef09eee 🔧 简化 errorLog 和 accessLog 模块的 VO 2 years ago
YunaiV e40c0e3057 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	pom.xml
#	sql/mysql/pay_wallet.sql
#	yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/mapper/BaseMapperX.java
2 years ago
YunaiV c7a21b2a64 mall:优化商品收藏的分页接口 2 years ago
zhijiantianya@gmail.com 7e6b084f77 Merge branch 'feature/vo-optimize' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/sub-table 2 years ago
YunaiV ddb5bce0a2 vo 简化:post 重构 2 years ago
YunaiV 06649624e5 代码生成:支持设置主子表的信息 2 years ago
YunaiV 256c560d43 代码生成:增加主子表的示例 2 years ago
YunaiV 01b62a9b0c Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/sub-table 2 years ago
zhijiantianya@gmail.com 2f6456e2b0 代码生成器:主子表,支持多个从字段 50% 2 years ago
niou233 daa7d14b09 reafactor: 会员商品收藏 2 years ago
YunaiV 2afc2caf1d 代码生成:主子表的部分实现 2 years ago
YunaiV 9762a2a7c3 优化:默认只引入 mysql driver,减少打包大小 2 years ago
YunaiV c162b39e1e 多租户:调整 tenant 表的 domain 字段为 website,避免 dm 数据库的关键字冲突 2 years ago
dongshanshan 98aae5ed1a feat: 会员商品收藏 2 years ago
owen 0612a13cce 交易:核销订单 2 years ago
YunaiV c8f1269d6e promotion:修复砍价活动返回的 combinationPrice 为空的问题 2 years ago
YunaiV 1bda3c8b53 promotion:完善砍价 API ~ 提交下,准备出门吃饭!!!! 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
YunaiV a5e33f6d3a 引入 mybatis plus join 作为基类 2 years ago
YunaiV 5808f77ade code review:订单分佣 2 years ago
YunaiV 7d99c6dbe8 Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro 2 years ago
芋道源码 544e650e15
Merge pull request #326 from Lemon-cc-hang/base
fix: 在调用 selectList() 的时候 如果 Collection 参数为空会报错 sql 异常
2 years ago
YunaiV acee734554 Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro 2 years ago
JUNHAO 5cc3e6510b 使用Parenthesis为原有表达式添加括号 2 years ago
lemoncc 5b9106fdb5
fix: 在调用 selectList() 的时候 如果 Collection 参数为空会报错 sql 异常 3 years ago
YunaiV 5e2fa48f20 code review:拼团、秒杀活动的代码 3 years ago
YunaiV 5e7e3d816c 彻底移除 RedisKeyDefine 3 years ago
wcz a6ffb5d650 BaseMapperX.java少了几个方法,TradeCartMapper.java方法调整,BpmProcessInstanceServiceImpl.java多了 3 years ago
YunaiV 859cf74a6c 对齐 boot 与 cloud 的代码 3 years ago
YunaiV d9522808eb 优化 LambdaQueryWrapperX 的 inIfPresent 判空逻辑 3 years ago
YunaiV b582206003 mall + promotion:review 页面装修 3 years ago
jason ad1f656dfa 页面装修修改,后端只负责存取 3 years ago
xingyu 573ad59edc Merge remote-tracking branch 'origin/master' into feature/mall_product
# Conflicts:
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/string/StrUtils.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/ProductCategoryBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuSimpleRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuDetailRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuPageItemRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderBaseVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderItemBaseVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/base/sku/AppProductSkuBaseRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartDetailRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartItemUpdateSelectedReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartResetReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderCreateReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderDetailRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderGetCreateInfoRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderPageItemRespVO.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/vo/AppAddressBaseVO.java
3 years ago
YunaiV 4f5ac0edbb mall + promotion:增加营销活动的 mock 接口 3 years ago
YunaiV 0631c51d93 mall + trade:review 配置管理列表 3 years ago
jason 55dbff7570 运费模板 review 修改. 运费模块可以选择多个区域 3 years ago
LiuZijian 8ec0be01a8 新增:达梦数据库驱动,KeyGenerator 3 years ago
YunaiV da162853ec 商城:完善购物车的逻辑 3 years ago