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 |
|
wangzhs
|
f9569f910f
|
切换 Mybatis-plus-join 依赖
|
2023-03-13 18:32:43 +08:00 |
|
wangzhs
|
7e0fb6cb56
|
调整Mybaits Plus Join的SQL注入器到YudaoMybatisAutoConfiguration
|
2023-03-12 17:43:42 +08:00 |
|
YunaiV
|
ef510f9478
|
增加 mybatis plus join 集成的修改建议
|
2023-03-11 18:23:07 +08:00 |
|
wangzhs
|
670f67e551
|
新增 mybatis-plus-join
|
2023-03-11 17:47:15 +08:00 |
|
YunaiV
|
ae3ee95cdd
|
站内信模块：整体功能实现
|
2023-01-28 20:10:19 +08:00 |
|
YunaiV
|
c744e115e3
|
简化本地缓存的实现，萌新更容易看懂！
|
2023-01-25 10:11:16 +08:00 |
|
xingyu
|
3df825034b
|
chore: update deps
|
2023-01-12 13:58:32 +08:00 |
|
YunaiV
|
92632c046c
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/PayNotifyServiceImpl.java
# yudao-ui-admin/src/views/mall/trade/order/index.vue
|
2022-12-23 19:12:45 +08:00 |
|
gaibu
|
766b74f040
|
fix: SQL 条件表达式缺少括号问题
|
2022-12-14 08:57:52 +08:00 |
|
gaibu
|
453603b6ad
|
fix: SQL 条件表达式缺少括号问题
|
2022-12-13 10:37:41 +08:00 |
|
xingyu
|
3937004d5b
|
fix: mysql warn
|
2022-12-09 18:34:34 +08:00 |
|
halfninety
|
abbb076859
|
完成秒杀时段，秒杀活动相关todo
|
2022-12-02 22:33:07 +08:00 |
|
xingyu
|
283aae1da2
|
feat: 适配springboot 2.7 configuration ==> AutoConfiguration
|
2022-11-30 01:20:20 +08:00 |
|
xingyu
|
1aa05e0198
|
feat: 适配 springboot 2.7
|
2022-11-30 01:03:56 +08:00 |
|
YunaiV
|
afc76973ce
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
# Conflicts:
# yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/DateUtils.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponBaseVO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponExcelVO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponExportReqVO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponPageReqVO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponRespVO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteBaseVO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteExcelVO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteExportReqVO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempletePageReqVO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteRespVO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/CouponTemplete/CouponTempleteDO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/coupon/CouponDO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuPageReqVO.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-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/discount/DiscountProductDO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/reward/RewardActivityDO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/cart/TradeCartItemDO.java
# yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/dto/UserInfoDTO.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java
# yudao-server/pom.xml
# yudao-server/src/main/resources/application-local.yaml
# yudao-server/src/main/resources/application.yaml
# yudao-ui-admin/src/views/mall/CouponTemplete/index.vue
# yudao-ui-admin/src/views/mall/product/property/index.vue
# yudao-ui-admin/src/views/mall/product/spu/index.vue
# yudao-ui-admin/src/views/mall/product/spu/save.vue
# yudao-ui-admin/src/views/system/role/index.vue
|
2022-11-13 12:07:59 +08:00 |
|
YunaiV
|
f5ef87094d
|
优化，使用 @Configuration(proxyBeanMethods = false) 提升启动速度
|
2022-11-12 20:17:58 +08:00 |
|
YunaiV
|
ce3aefadd7
|
移除 jasypt-spring-boot-starter 依赖，使用 hutool AES 替代
|
2022-11-12 09:15:02 +08:00 |
|
xingyu4j
|
632a132a6a
|
refactor: Date ==> LocalDateTime
|
2022-11-09 11:14:46 +08:00 |
|
YunaiV
|
3c10058dbd
|
promotion：实现部分优惠劵模板的前端逻辑
|
2022-11-01 00:37:07 +08:00 |
|
YunaiV
|
38e88b02f5
|
🐛修复数据权限，不支持隐式内连接的问题
|
2022-09-10 21:37:16 +08:00 |
|
xingyu
|
e5bd517829
|
perf: final方法改为大写命名
|
2022-08-11 11:45:34 +08:00 |
|
YunaiV
|
26a094a710
|
refactor：优化时间范围查询
|
2022-07-27 00:15:59 +08:00 |
|
xingyu
|
611e11ae23
|
增加区间查询字段判断
|
2022-07-25 19:14:33 +08:00 |
|
xingyu
|
c7a64fc8b4
|
时间区间查询 betweenIfPresent 支持传入数组
|
2022-07-21 23:16:48 +08:00 |
|