YunaiV
|
5a4cc55917
|
【修复】字典类型逻辑删除时，唯一索引冲突的问题
|
3 years ago |
|
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
|
3 years ago |
|
YunaiV
|
fc49f000ce
|
trade：前端订单管理，联调接口
|
3 years ago |
|
YunaiV
|
7fc9689f07
|
trade：定义管理后台的订单分页接口
|
3 years ago |
xingyu4j
|
9d3bbdd8c4
|
v 1.6.5
|
3 years ago |
|
xingyu4j
|
2c8e2209e8
|
feat: 增加全局超长number序列化
|
3 years ago |
halfninety
|
cd62c4d220
|
秒杀时段相关
|
3 years ago |
|
xingyu
|
0d0f64e30a
|
feat: 删除过期方法
|
3 years ago |
|
YunaiV
|
35528e8267
|
trade：【交易售后】查询分页列表
|
3 years ago |
|
YunaiV
|
38f67d4130
|
将 mall 使用到 Date 的部分，迁移到 LocalDateTime 中
|
3 years ago |
|
YunaiV
|
89580e7903
|
合并 master 代码
|
3 years ago |
|
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
|
3 years ago |
|
YunaiV
|
ff1379d454
|
优化 README 说明~
|
3 years ago |
|
YunaiV
|
40ba456fde
|
1. 修复 MenuServiceTest 单元测试
|
3 years ago |
|
YunaiV
|
d3b6a0ca69
|
1. 修复 refund/index.vue 的报错
2. 优化 DateUtils 的工具类的方法命名
|
3 years ago |
|
xingyu4j
|
9c033d0104
|
DateUtils ==> LocalDateTime
|
3 years ago |
|
xingyu4j
|
cb006ddf2b
|
DateUtils.buildLocalDateTime ==> LocalDateTime.of
|
3 years ago |
|
xingyu4j
|
632a132a6a
|
refactor: Date ==> LocalDateTime
|
3 years ago |
|
YunaiV
|
edc5d0f1d0
|
promotion：增加获得优惠劵匹配结果的列表
|
3 years ago |
|
YunaiV
|
3c10058dbd
|
promotion：实现部分优惠劵模板的前端逻辑
|
3 years ago |
|
YunaiV
|
034de50999
|
完善多租户的注释与代码
|
4 years ago |
|
芋道源码
|
61b0624a59
|
!262 接口实现-交易订单创建(未完全实现)
Merge pull request !262 from LeeYan9/ly_uniapp
|
4 years ago |
|
YunaiV
|
833fd33844
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
Conflicts:
sql/optional/mall/mall.sql
|
4 years ago |
ex_yang.li@ca-nio.com
|
19a703b8c9
|
创建订单接口定义
|
4 years ago |
luowenfeng
|
0bc2ef1d39
|
feature(uniapp商品): 商品业务代码调整
|
4 years ago |
|
xingyu
|
e1b8ae09c9
|
增加手机号正则验证
|
4 years ago |
|
YunaiV
|
cfde3dcacb
|
mall：优化订单表的设计
|
4 years ago |
|
xingyu
|
a8ea50a059
|
update hutool 5.8.5
|
4 years ago |
|
YunaiV
|
e5a7b8474f
|
fix：短信验证码的每日发送条数不正确
|
4 years ago |
|
YunaiV
|
26a094a710
|
refactor：优化时间范围查询
|
4 years ago |
|
xingyu
|
9bdae339cc
|
update: hutool 5.6.1 ==> 5.7.22
|
4 years ago |
|
YunaiV
|
33a31cfb0f
|
优化文件的 type 识别与存储
|
4 years ago |
jiangqiang
|
2621f2195d
|
优化代码
|
4 years ago |
|
YunaiV
|
ed097e5ead
|
基于 tika 识别文件类型
|
4 years ago |
|
YunaiV
|
b69b74b770
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
Conflicts:
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImpl.java
|
4 years ago |
|
YunaiV
|
f0095a2c31
|
完善 YudaoSwaggerAutoConfiguration 注释
|
4 years ago |
|
芋道源码
|
569242d834
|
!198 修正文字说明
Merge pull request !198 from 枫叶/master
|
4 years ago |
|
YunaiV
|
e5f343a3e9
|
【重构】新增 `yudao-spring-boot-starter-biz-error-code` 错误码组件
|
4 years ago |
|
YunaiV
|
d3200910db
|
基于 Guava 实现 dict 字典数据的本地缓存
|
4 years ago |
leoxxx
|
6652883aee
|
doc修改
|
4 years ago |
|
leoxxx
|
0913b82a4c
|
修正说明文字
|
4 years ago |
xiaxiaoYY
|
247d299cca
|
Banner模块 for review
|
4 years ago |
|
YunaiV
|
c7a2916748
|
完成 system_oauth2_approve 相关的批准逻辑
|
4 years ago |
|
YunaiV
|
99ba7ccee8
|
完成 oauth2 code 授权码模式的实现
|
4 years ago |
|
YunaiV
|
6ca88277d8
|
完成 oauth2 implicit 简化模式的实现
|
4 years ago |
|
YunaiV
|
aa8fb4acf0
|
搭建 oauth/authorize 的初步逻辑
|
4 years ago |
|
YunaiV
|
97db4586a8
|
完成 OAuth2 的客户端模块
|
4 years ago |
|
YunaiV
|
8737674d74
|
去除 LoginUser 的 roleIds、deptId 字段，简化
|
4 years ago |
|
YunaiV
|
65a86e8d75
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.6.2-qcloud
Conflicts:
yudao-ui-admin/yarn.lock
|
4 years ago |
FinallySays
|
91f758c295
|
根据 code review 对腾讯云短信实现优化
|
4 years ago |