puhui999
|
384359c9d4
|
fix: 完善拼团、秒杀、砍价活动管理
|
2023-08-06 20:21:53 +08:00 |
|
puhui999
|
5f9184904a
|
fix: 完善拼团、秒杀、砍价活动管理
|
2023-08-06 17:46:16 +08:00 |
|
YunaiV
|
222d1cf69b
|
增加对比新老数组的 C/U/D 对象
|
2023-08-06 00:25:23 +08:00 |
|
YunaiV
|
5e2fa48f20
|
code review:拼团、秒杀活动的代码
|
2023-08-05 20:51:48 +08:00 |
|
puhui999
|
92b10e2ecf
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
2023-07-31 18:37:13 +08:00 |
|
puhui999
|
d156d43d63
|
fix:完善 review 拼团、秒杀活动的实现提到的问题
|
2023-07-31 18:34:56 +08:00 |
|
puhui999
|
446951bd11
|
fix:封装函数 convertCDUMap 作用:数据划分为需要新增的、还是删除的、还是更新的。
|
2023-07-28 16:30:38 +08:00 |
|
YunaiV
|
c33186569d
|
优化 mp 账号的刷新机制,使用 Job 轮询,替换 MQ 广播
|
2023-07-27 20:25:15 +08:00 |
|
YunaiV
|
114f1e4833
|
对齐 boot 与 cloud 的代码
|
2023-07-26 22:36:34 +08:00 |
|
YunaiV
|
b84f7825c5
|
review 拼团、秒杀活动的实现
|
2023-07-26 19:09:47 +08:00 |
|
puhui999
|
d80bf5a368
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
2023-07-18 09:06:02 +08:00 |
|
YunaiV
|
518e89dc4b
|
mall + pay:
1. 重构支付回调的逻辑,将回调解析改成 PayOrderRespDTO,为后续轮询做铺垫
2. 调整退款单的表结构
3. 调整退款调用的实现
|
2023-07-15 10:35:41 +08:00 |
|
puhui999
|
e7d8643665
|
fix:修复 mall review @puhui999
|
2023-07-10 16:35:49 +08:00 |
|
YunaiV
|
efb221b1fe
|
mall + pay:调整异常的处理
1. 如果是业务异常,则统一转换成 ServiceException
2. 如果是系统异常,则使用 PayException 包装成无需 check 的异常
|
2023-07-08 19:26:42 +08:00 |
|
YunaiV
|
1dfbe45913
|
mall + order:review 售后日志
|
2023-06-23 21:50:57 +08:00 |
|
YunaiV
|
07884ef423
|
Merge branch 'mall_trade_aftersalelog' of https://gitee.com/chen934298133/ruoyi-vue-pro into feature/mall_product
Conflicts:
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/aftersale/vo/AppTradeAfterSaleCreateReqVO.java
|
2023-06-23 21:37:21 +08:00 |
|
jason
|
6b1d996b66
|
页面装修数据结构定义
|
2023-06-23 10:53:29 +08:00 |
|
chenchen
|
2f0aaee823
|
售后日志优化
|
2023-06-19 17:04:07 +08:00 |
|
chenchen
|
a93b9a616f
|
售后日志优化
|
2023-06-19 10:19:29 +08:00 |
|
YunaiV
|
60b24e36d5
|
code review:售后日志逻辑
|
2023-06-17 22:15:03 +08:00 |
|
陈賝
|
59e16795be
|
!514 mall交易日志封装
* 交易日志封装
* 交易日志封装
* 交易日志模块
|
2023-06-17 14:00:10 +00:00 |
|
YunaiV
|
8ec3733882
|
mall + trade:mock 拼团记录列表的接口
|
2023-06-16 20:32:03 +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 |
|
jason
|
644d976a78
|
快递100 快递查询实现
|
2023-06-11 18:15:33 +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 |
|
崔家辉
|
fbeaa06100
|
bugfix: 解决不同模块错误码区间冲突、部分错误码重复错误
|
2023-05-19 10:47:23 +08:00 |
|
芋道源码
|
12d6c14b1c
|
!469 修复 vue3 代码生成 api 模版错误 && 修复过期属性
Merge pull request !469 from xingyu/fix/vue3_codegen
|
2023-05-15 14:36:53 +00:00 |
|
jian.li
|
e4a5a5672f
|
StrUtils.maxLength会强制给后面加三个点,哪怕长度没有超过,优化长度不超过不加...
|
2023-05-12 16:36:55 +08:00 |
|
xingyu
|
0b3640a522
|
fix: required = true ==> requiredMode = Schema.RequiredMode.REQUIRED
|
2023-05-08 10:06:17 +08:00 |
|
YunaiV
|
e5fcc7a387
|
boot3:适合 ServletUtils
|
2023-04-16 21:40:56 +08:00 |
|
冰是睡着的水
|
fbbd3bc66c
|
优化大陆手机号验证。以19013896321为例,原来的正则匹配结果为false。
Signed-off-by: 冰是睡着的水 <850083043@qq.com>
|
2023-04-01 03:34:22 +00:00 |
|
YunaiV
|
1b6124a0db
|
集成 Go-View 大屏设计器
|
2023-02-07 22:56:33 +08:00 |
|
xingyu
|
ffb0358ce2
|
Merge remote-tracking branch 'origin/master' into feature/springdoc
|
2023-01-29 16:11:51 +08:00 |
|
YunaiV
|
c0b029b244
|
邮箱模块:完善 template 的单元测试
|
2023-01-26 23:32:18 +08:00 |
|
xingyu
|
13afc3d57a
|
feat: springdoc
|
2023-01-17 21:25:06 +08:00 |
|
xingyu
|
3d390d0d8f
|
feat: knife4j
|
2023-01-17 20:42:18 +08:00 |
|
xingyu
|
4d35bcef65
|
feat: springdoc success
|
2023-01-16 22:58:56 +08:00 |
|
xingyu
|
1c0d8fc1eb
|
Merge remote-tracking branch 'origin/dev' into feature/springdoc
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-framework/yudao-spring-boot-starter-web/pom.xml
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/config/YudaoSwaggerAutoConfiguration.java
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/core/SpringFoxHandlerProviderBeanPostProcessor.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/captcha/CaptchaController.java
|
2023-01-16 14:25:03 +08:00 |
|
xingyu
|
fffe3008b5
|
refactor: captcha-plus
|
2023-01-16 10:47:39 +08:00 |
|
xingyu
|
7b98a3f3f3
|
Merge remote-tracking branch 'origin/master' into feature/springdoc
# Conflicts:
# README.md
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/ProductPropertyController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/ProductPropertyValueController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyViewRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyAndValueRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyBaseVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyCreateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyListReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyPageReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyUpdateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueBaseVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueCreateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValuePageReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueUpdateReqVO.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/sku/vo/ProductSkuCreateOrUpdateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/ProductSpuController.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/ProductSpuDetailRespVO.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/app/spu/AppProductSpuController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuPageReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuPageRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/base/property/AppProductPropertyValueDetailRespVO.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/controller/app/order/vo/AppTradeOrderPageReqVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/TradeOrderItemRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/TradeOrderRespVO.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/order/AppPayOrderController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/vo/PayNotifyOrderReqVO.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/vo/PayRefundOrderReqVO.java
# yudao-server/pom.xml
# yudao-server/src/main/java/cn/iocoder/yudao/module/shop/controller/app/AppShopOrderController.java
|
2023-01-04 10:48:18 +08:00 |
|
YunaiV
|
5a4cc55917
|
【修复】字典类型逻辑删除时,唯一索引冲突的问题
|
2022-12-29 12:52:37 +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 |
|
xingyu
|
cacefb4eea
|
feat: knife4j springdoc
|
2022-12-22 00:25:22 +08:00 |
|
YunaiV
|
fc49f000ce
|
trade:前端订单管理,联调接口
|
2022-12-10 11:52:11 +08:00 |
|
xingyu4j
|
88ce5e540e
|
refactor: springdoc 替换 springfox
|
2022-12-09 14:24:09 +08:00 |
|
xingyu4j
|
9fc6e0f00b
|
refactor: springdoc 替换 springfox
|
2022-12-09 13:43:15 +08:00 |
|
YunaiV
|
7fc9689f07
|
trade:定义管理后台的订单分页接口
|
2022-12-08 00:07:14 +08:00 |
|
xingyu4j
|
9d3bbdd8c4
|
v 1.6.5
|
2022-12-01 09:39:20 +08:00 |
|
xingyu4j
|
2c8e2209e8
|
feat: 增加全局超长number序列化
|
2022-11-30 12:32:56 +08:00 |
|
halfninety
|
cd62c4d220
|
秒杀时段相关
|
2022-11-29 23:25:00 +08:00 |
|
xingyu
|
0d0f64e30a
|
feat: 删除过期方法
|
2022-11-23 22:54:44 +08:00 |
|
YunaiV
|
35528e8267
|
trade:【交易售后】查询分页列表
|
2022-11-19 20:43:59 +08:00 |
|
YunaiV
|
38f67d4130
|
将 mall 使用到 Date 的部分,迁移到 LocalDateTime 中
|
2022-11-13 21:23:38 +08:00 |
|
YunaiV
|
89580e7903
|
合并 master 代码
|
2022-11-13 12:21:17 +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
|
ff1379d454
|
优化 README 说明~
|
2022-11-12 18:57:41 +08:00 |
|
YunaiV
|
40ba456fde
|
1. 修复 MenuServiceTest 单元测试
|
2022-11-11 01:24:39 +08:00 |
|
YunaiV
|
d3b6a0ca69
|
1. 修复 refund/index.vue 的报错
2. 优化 DateUtils 的工具类的方法命名
|
2022-11-10 12:55:26 +08:00 |
|
xingyu4j
|
9c033d0104
|
DateUtils ==> LocalDateTime
|
2022-11-09 12:43:54 +08:00 |
|
xingyu4j
|
cb006ddf2b
|
DateUtils.buildLocalDateTime ==> LocalDateTime.of
|
2022-11-09 12:38:01 +08:00 |
|
xingyu4j
|
632a132a6a
|
refactor: Date ==> LocalDateTime
|
2022-11-09 11:14:46 +08:00 |
|
YunaiV
|
edc5d0f1d0
|
promotion:增加获得优惠劵匹配结果的列表
|
2022-11-08 00:40:53 +08:00 |
|
YunaiV
|
3c10058dbd
|
promotion:实现部分优惠劵模板的前端逻辑
|
2022-11-01 00:37:07 +08:00 |
|
YunaiV
|
034de50999
|
完善多租户的注释与代码
|
2022-09-24 21:54:03 +08:00 |
|
芋道源码
|
61b0624a59
|
!262 接口实现-交易订单创建(未完全实现)
Merge pull request !262 from LeeYan9/ly_uniapp
|
2022-09-05 13:16:11 +00:00 |
|
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
|
2022-09-04 21:06:28 +08:00 |
|
ex_yang.li@ca-nio.com
|
19a703b8c9
|
创建订单接口定义
|
2022-08-26 17:47:43 +08:00 |
|
luowenfeng
|
0bc2ef1d39
|
feature(uniapp商品): 商品业务代码调整
|
2022-08-24 14:08:32 +08:00 |
|
xingyu
|
e1b8ae09c9
|
增加手机号正则验证
|
2022-08-11 11:32:38 +08:00 |
|
YunaiV
|
cfde3dcacb
|
mall:优化订单表的设计
|
2022-08-05 00:28:40 +08:00 |
|
xingyu
|
a8ea50a059
|
update hutool 5.8.5
|
2022-08-03 13:38:02 +08:00 |
|
YunaiV
|
e5a7b8474f
|
fix:短信验证码的每日发送条数不正确
|
2022-07-29 00:56:17 +08:00 |
|
YunaiV
|
26a094a710
|
refactor:优化时间范围查询
|
2022-07-27 00:15:59 +08:00 |
|
xingyu
|
9bdae339cc
|
update: hutool 5.6.1 ==> 5.7.22
|
2022-07-22 12:08:59 +08:00 |
|
YunaiV
|
33a31cfb0f
|
优化文件的 type 识别与存储
|
2022-07-10 00:02:21 +08:00 |
|
jiangqiang
|
2621f2195d
|
优化代码
|
2022-07-09 17:46:29 +08:00 |
|
YunaiV
|
ed097e5ead
|
基于 tika 识别文件类型
|
2022-07-08 21:26:34 +08:00 |
|
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
|
2022-07-04 19:56:54 +08:00 |
|
YunaiV
|
f0095a2c31
|
完善 YudaoSwaggerAutoConfiguration 注释
|
2022-07-03 17:25:11 +08:00 |
|
芋道源码
|
569242d834
|
!198 修正文字说明
Merge pull request !198 from 枫叶/master
|
2022-06-30 05:30:07 +00:00 |
|
YunaiV
|
e5f343a3e9
|
【重构】新增 yudao-spring-boot-starter-biz-error-code 错误码组件
|
2022-06-18 00:04:26 +08:00 |
|
YunaiV
|
d3200910db
|
基于 Guava 实现 dict 字典数据的本地缓存
|
2022-06-17 19:44:28 +08:00 |
|
leoxxx
|
6652883aee
|
doc修改
|
2022-06-16 17:20:37 +08:00 |
|
leoxxx
|
0913b82a4c
|
修正说明文字
|
2022-06-12 14:40:04 +08:00 |
|
xiaxiaoYY
|
247d299cca
|
Banner模块 for review
|
2022-05-31 16:08:10 +08:00 |
|
YunaiV
|
c7a2916748
|
完成 system_oauth2_approve 相关的批准逻辑
|
2022-05-16 00:00:36 +08:00 |
|
YunaiV
|
99ba7ccee8
|
完成 oauth2 code 授权码模式的实现
|
2022-05-15 15:59:49 +08:00 |
|
YunaiV
|
6ca88277d8
|
完成 oauth2 implicit 简化模式的实现
|
2022-05-14 23:47:34 +08:00 |
|
YunaiV
|
aa8fb4acf0
|
搭建 oauth/authorize 的初步逻辑
|
2022-05-14 20:10:06 +08:00 |
|
YunaiV
|
97db4586a8
|
完成 OAuth2 的客户端模块
|
2022-05-12 01:09:16 +08:00 |
|
YunaiV
|
8737674d74
|
去除 LoginUser 的 roleIds、deptId 字段,简化
|
2022-05-07 00:39:39 +08:00 |
|
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
|
2022-04-09 11:27:47 +08:00 |
|
FinallySays
|
91f758c295
|
根据 code review 对腾讯云短信实现优化
|
2022-04-07 00:08:29 +08:00 |
|
YunaiV
|
9726560318
|
code review 腾讯短信的实现
|
2022-04-06 01:05:52 +08:00 |
|
YunaiV
|
d60be0bb53
|
优化 test 组件的封装,内置 Redis、DB 等多种快速测试的基类
|
2022-04-04 20:28:59 +08:00 |
|
FinallySays
|
6fd52dfbb6
|
接入腾讯云短信
|
2022-04-04 17:30:58 +08:00 |
|
YunaiV
|
18a5c46284
|
完成 FileConfig 的后端模块
|
2022-03-15 22:30:52 +08:00 |
|
YunaiV
|
3d40fc81dd
|
完善 yudao-spring-boot-starter-file 组件,支持 S3 对接云存储、local、ftp、sftp 等协议
|
2022-03-14 22:09:41 +08:00 |
|
YunaiV
|
ed53ca3de9
|
封装 yudao-spring-boot-starter-file 组件,初步实现 S3 对接云存储的能力
|
2022-03-13 21:23:03 +08:00 |
|
YunaiV
|
882660a3a7
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/flowable
|
2022-02-27 13:47:34 +08:00 |
|
YunaiV
|
66ebb71b8a
|
Redis 最低版本 5.0.0 检测,解决搭建环境过程中无法理解 XREADGROUP 指令的报错
|
2022-02-26 00:41:27 +08:00 |
|
YunaiV
|
e4be51b14a
|
1. 新建租户、修改租户、修改租户套餐时,自动修改角色的权限
2. 租户的本地缓存,提升访问性能
3. 精简本地缓存的实现逻辑
|
2022-02-23 00:38:49 +08:00 |
|
YunaiV
|
2598c033a9
|
【新增】【优化】新建租户时,自动创建对应的管理员账号、角色等基础信息
|
2022-02-20 23:59:23 +08:00 |
|
YunaiV
|
79311ecc71
|
* 【新增】后端 yudao.tenant.enable 配置项,前端 VUE_APP_TENANT_ENABLE 配置项,用于开关租户功能
* 【优化】调整默认所有表开启多租户的特性,可通过 `yudao.tenant.ignore-tables` 配置项进行忽略,替代原本默认不开启的策略
* 【新增】通过 `yudao.tenant.ignore-urls` 配置忽略多租户的请求,例如说 ,例如说短信回调、支付回调等 Open API
|
2022-02-20 00:33:12 +08:00 |
|
jason
|
073d860a78
|
工作流 Flowable 发起流程 相关实现
|
2022-02-18 09:35:40 +08:00 |
|
YunaiV
|
ec378d75de
|
v3.7.0 参数管理支持配置验证码开关
|
2022-02-17 00:20:08 +08:00 |
|
Jelly
|
5e43efc555
|
fix:修复 Maven 构建一些提示
|
2022-02-10 11:16:17 +08:00 |
|
leosanqing
|
855bb214be
|
使用 lombok 优化工具类
1。添加 @UtilityClass, 作用私有空参构造函数
2。使用 @SneakyThrows 替代手动转换为 RuntimeException
|
2022-02-09 09:36:15 +08:00 |
|
leosanqing
|
fd4adf2cea
|
使用 lombok 优化工具类
1。添加 @UtilityClass, 作用私有空参构造函数
2。使用 @SneakyThrows 替代手动转换为 RuntimeException
|
2022-02-08 19:25:34 +08:00 |
|
YunaiV
|
add08b1ecd
|
多模块重构 4:system 模块的调整,实现 social API~~
|
2022-01-30 21:23:45 +08:00 |
|
YunaiV
|
e9efff7076
|
多模块重构 3:security 实现多用户的认证支持
|
2022-01-29 00:44:03 +08:00 |
|
YunaiV
|
a4d31f9c45
|
新增 bpm 基于流程实例查询任务列表
|
2022-01-16 13:27:09 +08:00 |
|
YunaiV
|
902f2ecbad
|
BPM 模型重构 7:任务分配规则的后端,全部实现完成
|
2022-01-15 01:39:30 +08:00 |
|
YunaiV
|
2809254a07
|
BPM 模型重构 7:增加任务分配规则的列表 UI 界面(增加部门的规则配置)
|
2022-01-14 00:21:34 +08:00 |
|
YunaiV
|
b083795ad6
|
实现 bpm 待办任务的后端接口
|
2022-01-08 16:19:41 +08:00 |
|
YunaiV
|
4d7ee1769f
|
1. 新增流程实例的拓展表
2. 将 Activiti 的 userId,统一使用 ActivitiUtils 进行设置
|
2022-01-07 00:35:12 +08:00 |
|
YunaiV
|
cfbef058b5
|
完成流程图上传的功能
|
2022-01-03 18:46:00 +08:00 |
|
YunaiV
|
490f907ada
|
完善 bpmnProcessDesigner 流程设计器的使用,基本可用了!
|
2022-01-03 01:12:36 +08:00 |
|
YunaiV
|
a0c7692c3c
|
调整流程定义模块的代码
|
2022-01-01 00:26:33 +08:00 |
|
YunaiV
|
4b2af44ee3
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/activiti
Conflicts:
sql/ruoyi-vue-pro.sql
yudao-admin-server/src/main/resources/application.yaml
yudao-admin-server/src/main/resources/mybatis-config/mybatis-config.xml
yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/LoginUser.java
yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/util/SecurityFrameworkUtils.java
|
2021-12-30 19:58:31 +08:00 |
|
YunaiV
|
098c5b4723
|
1. 管理后台,增加租户管理
2. 修复大量因为租户报错的单元测试
|
2021-12-14 22:39:43 +08:00 |
|
YunaiV
|
8795a4cdeb
|
增加 Tenant Security 的实现
|
2021-12-06 13:25:33 +08:00 |
|
YunaiV
|
df9b06843f
|
增加 Tenant Redis 的实现
|
2021-12-06 10:18:36 +08:00 |
|
YunaiV
|
7c8fe2fc50
|
1. 增加 yudao-spring-boot-starter-tenant 租户的组件
2. 改造 UserDO,接入多租户
|
2021-12-04 21:09:49 +08:00 |
|
YunaiV
|
b32ac09ddf
|
code review 工作机的流程
|
2021-11-21 12:59:52 +08:00 |
|
yunlong.li
|
cfdf04981a
|
fix: 新增工作流模型
|
2021-11-17 18:48:40 +08:00 |
|
YunaiV
|
c89accbf06
|
完成支付通知的逻辑
|
2021-10-27 13:22:49 +08:00 |
|
YunaiV
|
dd2d8a2ba9
|
优化支付通知的逻辑,解决并发的问题。
同时,收到支付结果时,立马回调业务,避免延迟
|
2021-10-27 10:06:49 +08:00 |
|
YunaiV
|
ab19228ca6
|
完成支付的下单和提交订单的逻辑
|
2021-10-23 20:14:13 +08:00 |
|
YunaiV
|
1ed6656bbb
|
完成对微信公众号支付的封装
|
2021-10-23 11:00:36 +08:00 |
|
YunaiV
|
4e93efdb9b
|
完成 SysSocialServiceTest 的绑定用户的单测
|
2021-10-09 08:02:14 +08:00 |
|
wangwenbin10
|
b139107717
|
初始化 c 端的用户相关的表
|
2021-10-08 08:30:28 +08:00 |
|
YunaiV
|
a56b4a7c9c
|
增加三方登陆的 redirect uri
|
2021-10-02 00:06:54 +08:00 |
|
niudehua
|
758bd515e1
|
sping->spring
|
2021-06-28 22:13:18 +08:00 |
|
YunaiV
|
cf4eeab395
|
项目结构调整 x 16 : 将 monitor、sms、dict 等组件拆分出去
|
2021-05-02 15:41:38 +08:00 |
|
YunaiV
|
20066bc864
|
项目结构调整 x 15 : 将 web、security、operatelog 等组件拆分出去
|
2021-05-02 00:41:21 +08:00 |
|
YunaiV
|
750ce01ecd
|
项目结构调整 x 14 : 将 yudao-spring-boot-starter-mybatis 拆分
|
2021-05-01 22:25:25 +08:00 |
|
YunaiV
|
f281aad6cd
|
项目结构调整 x 13 : 将 yudao-common 独立拆分
|
2021-04-30 17:46:49 +08:00 |
|
YunaiV
|
86a9d95722
|
项目结构调整 x 12 : 准备将 yudao-framework 拆分成独立的 starter
|
2021-04-30 14:48:51 +08:00 |
|