hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-11-04 20:28:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
6,072 Commits 20 Branches 0 Tags
11ce24ad1efe771b260161fe17badbd3d521905d
Commit Graph

120 Commits

Author SHA1 Message Date
YunaiV
16fd1a9639 🐛 oracle limit 查询不正确 2024-01-20 18:46:51 +08:00
YunaiV
bbba83ef61 📖 MALL：code review 商品统计的代码 2024-01-07 16:23:02 +08:00
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
 2024-01-06 21:52:10 +08:00
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
 2023-12-30 20:11:07 +08:00
YunaiV
829965e50a 🐛 fix(websocket): 修复 websocket 失效的问题 2023-12-29 12:54:52 +08:00
YunaiV
08ff391f78 🐛 Websocket 断开时，未删除会话缓存 bug 2023-12-29 12:48:36 +08:00
owen
4a007f0c98 统计：增加商品统计 2023-12-16 23:48:10 +08:00
YunaiV
23df8633f4 📖 CRM：code review 数据权限的实现 2023-12-09 10:50:47 +08:00
puhui999
5c395fc1c4 CRM: 完善 code review 数据权限提到的问题，重新封装 CrmQueryWrapperUtils 2023-12-08 15:27:58 +08:00
YunaiV
98697ee075 ⬆️ 2023-12-07 20:48:11 +08:00
YunaiV
30fef09eee 🔧 简化 errorLog 和 accessLog 模块的 VO 2023-12-03 18:32:47 +08:00
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
 2023-11-19 18:39:55 +08:00
YunaiV
c7a21b2a64 mall：优化商品收藏的分页接口 2023-11-19 00:58:12 +08:00
zhijiantianya@gmail.com
7e6b084f77 Merge branch 'feature/vo-optimize' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/sub-table 2023-11-15 21:02:22 +08:00
YunaiV
ddb5bce0a2 vo 简化：post 重构 2023-11-14 22:37:46 +08:00
YunaiV
06649624e5 代码生成：支持设置主子表的信息 2023-11-14 12:57:55 +08:00
YunaiV
256c560d43 代码生成：增加主子表的示例 2023-11-12 22:33:18 +08:00
YunaiV
01b62a9b0c Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/sub-table 2023-11-08 22:29:31 +08:00
zhijiantianya@gmail.com
2f6456e2b0 代码生成器：主子表，支持多个从字段 50% 2023-11-08 21:00:34 +08:00
niou233
daa7d14b09 reafactor: 会员商品收藏 2023-11-08 14:36:44 +08:00
YunaiV
2afc2caf1d 代码生成：主子表的部分实现 2023-11-08 09:42:16 +08:00
YunaiV
9762a2a7c3 优化：默认只引入 mysql driver，减少打包大小 2023-11-06 21:17:27 +08:00
YunaiV
c162b39e1e 多租户：调整 tenant 表的 domain 字段为 website，避免 dm 数据库的关键字冲突 2023-11-06 19:04:01 +08:00
dongshanshan
98aae5ed1a feat: 会员商品收藏 2023-10-31 16:51:56 +08:00
owen
0612a13cce 交易：核销订单 2023-10-17 23:18:08 +08:00
YunaiV
c8f1269d6e promotion：修复砍价活动返回的 combinationPrice 为空的问题 2023-10-06 22:29:11 +08:00
YunaiV
1bda3c8b53 promotion：完善砍价 API ~ 提交下，准备出门吃饭！！！！ 2023-10-05 17:22:17 +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
YunaiV
a5e33f6d3a 引入 mybatis plus join 作为基类 2023-09-09 14:56:30 +08:00
YunaiV
5808f77ade code review：订单分佣 2023-09-08 00:29:25 +08:00
YunaiV
7d99c6dbe8 Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro 2023-08-27 10:52:37 +08:00
芋道源码
544e650e15 Merge pull request #326 from Lemon-cc-hang/base 
fix: 在调用 selectList() 的时候 如果 Collection 参数为空会报错 sql 异常
 2023-08-27 10:52:15 +08:00
YunaiV
acee734554 Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro 2023-08-27 10:44:48 +08:00
JUNHAO
5cc3e6510b 使用Parenthesis为原有表达式添加括号 2023-08-24 14:38:47 +08:00
lemoncc
5b9106fdb5 fix: 在调用 selectList() 的时候 如果 Collection 参数为空会报错 sql 异常 2023-08-15 17:54:55 +08:00
YunaiV
5e2fa48f20 code review：拼团、秒杀活动的代码 2023-08-05 20:51:48 +08:00
YunaiV
5e7e3d816c 彻底移除 RedisKeyDefine 2023-07-29 07:16:10 +08:00
wcz
a6ffb5d650 BaseMapperX.java少了几个方法，TradeCartMapper.java方法调整，BpmProcessInstanceServiceImpl.java多了 2023-07-28 19:33:23 +08:00
YunaiV
859cf74a6c 对齐 boot 与 cloud 的代码 2023-07-27 13:00:52 +08:00
YunaiV
d9522808eb 优化 LambdaQueryWrapperX 的 inIfPresent 判空逻辑 2023-07-25 20:58:44 +08:00
YunaiV
b582206003 mall + promotion：review 页面装修 2023-06-24 12:54:59 +08:00
jason
ad1f656dfa 页面装修修改,后端只负责存取 2023-06-24 00:11:04 +08:00
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
 2023-06-14 15:18:12 +08:00
YunaiV
4f5ac0edbb mall + promotion：增加营销活动的 mock 接口 2023-06-10 17:51:15 +08:00
YunaiV
0631c51d93 mall + trade：review 配置管理列表 2023-05-28 23:16:11 +08:00
jason
55dbff7570 运费模板 review 修改. 运费模块可以选择多个区域 2023-05-27 11:20:43 +08:00
LiuZijian
8ec0be01a8 新增：达梦数据库驱动，KeyGenerator 2023-05-09 14:03:45 +08:00
YunaiV
da162853ec 商城：完善购物车的逻辑 2023-04-30 20:32:01 +08:00
YunaiV
5c0161d762 修复租户名的重复问题 2023-04-09 11:12:24 +08:00
shizhong
8d2c33e9b0 解决字符串型字段等值查询条件前端传空字符串不能正常忽略问题 2023-03-29 21:19:18 +08:00