YunaiV
82b8a9335f
V2.2.0 版本发布
2024-08-02 23:12:34 +08:00
YunaiV
e77c7dfa72
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# pom.xml
# yudao-dependencies/pom.xml
2024-08-02 23:11:36 +08:00
YunaiV
1eb07b8389
V2.2.0 版本发布
2024-08-02 23:11:13 +08:00
YunaiV
535904b015
【代码优化】SYSTEM:微信小程序的订阅
2024-08-02 09:42:36 +08:00
YunaiV
cdfce46a9f
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/social/SocialClientApiImpl.java
2024-08-02 09:41:21 +08:00
YunaiV
7de546385a
【代码优化】SYSTEM:微信小程序的订阅
2024-08-01 23:21:14 +08:00
YunaiV
0e9ed0c2e4
【功能新增】微信小程序的订阅消息
2024-07-31 23:55:40 +08:00
YunaiV
f3a8d6f06c
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/history/ProductBrowseHistoryController.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/social/AppSocialUserController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletRechargeServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/social/SocialClientApiImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/socail/SocialClientController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
2024-07-31 23:49:21 +08:00
YunaiV
abe2f8580b
【代码优化】SYSTEM:微信小程序的订阅
2024-07-31 23:47:02 +08:00
YunaiV
ba18788517
【代码优化】SYSTEM:微信小程序的订阅
2024-07-31 19:48:02 +08:00
芋道源码
1f65dd2ec9
!1027 【新增】MALL:拼团结果通知订阅消息
...
Merge pull request !1027 from puhui999/develop
2024-07-31 11:38:44 +00:00
puhui999
b678da810e
【新增】MALL:拼团结果通知订阅消息
2024-07-31 16:26:08 +08:00
芋道源码
e860314b20
!1025 【代码优化】SYSTEM:订阅消息跳转小程序类型
...
Merge pull request !1025 from puhui999/develop
2024-07-31 05:45:14 +00:00
puhui999
2bc96fe521
【代码优化】SYSTEM:订阅消息跳转小程序类型
2024-07-31 12:58:06 +08:00
YunaiV
0e24994c92
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
2024-07-30 23:12:18 +08:00
YunaiV
7782b36f90
【代码优化】SYSTEM:微信小程序的订阅
2024-07-30 23:12:06 +08:00
芋道源码
9058c152d8
!1024 【新增】MALL: 订单发货订阅消息、钱包退款订阅消息
...
Merge pull request !1024 from puhui999/develop
2024-07-30 14:30:49 +00:00
puhui999
0cca6be63a
【新增】MALL: 订单发货订阅消息
2024-07-30 16:55:58 +08:00
puhui999
5307852fb2
【优化】SYSTEM: 小程序订阅模版获取增加缓存
2024-07-30 16:05:25 +08:00
puhui999
4c846ef4ce
【新增】MALL: 新增退款订阅消息发送
2024-07-30 15:40:21 +08:00
YunaiV
a9862b798d
【代码评审】SYSTEM:微信小程序的订阅
2024-07-30 12:57:32 +08:00
芋道源码
3be6ee271b
!1023 【优化】SYSTEM: 根据代码评审优化订阅消息
...
Merge pull request !1023 from puhui999/develop
2024-07-30 04:44:00 +00:00
puhui999
ab4e10ccf8
【优化】SYSTEM: 根据代码评审优化订阅消息
2024-07-30 12:22:06 +08:00
puhui999
f10840afb8
【优化】SYSTEM: 根据代码评审优化订阅消息
2024-07-30 12:19:31 +08:00
YunaiV
29ade63f87
【代码优化】AI:image 作品中心的代码
2024-07-30 00:01:08 +08:00
YunaiV
d0cec28bfd
【代码优化】SYSTEM:优化用户导入的实现
2024-07-29 19:43:08 +08:00
芋道源码
36765d53a1
!1017 bugfix-导入系统用户时,增加注解校验过程,与界面添加和修改用户保持一致
...
Merge pull request !1017 from 尹先生/master-jdk17
2024-07-29 11:36:45 +00:00
芋道源码
c69d502fde
!1022 【优化】idea在debug时toString方法报错StackOverflowError、指定jackson默认序列化时双向引用的前向、后向出口避免死循环报错
...
Merge pull request !1022 from 常柯柯/master-jdk17
2024-07-29 11:32:48 +00:00
YunaiV
345f41b153
【代码评审】SYSTEM:订阅消息
2024-07-29 19:18:23 +08:00
YunaiV
f46d47a966
Merge branch 'develop' of https://gitee.com/puhui999/ruoyi-vue-pro into develop
...
# Conflicts:
# yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/MessageTemplateConstants.java
# yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/MessageTemplateConstants.java
2024-07-29 19:09:08 +08:00
YunaiV
512d68f793
【代码评审】SYSTEM:订阅消息
2024-07-29 19:03:18 +08:00
常柯柯
ac39a80552
!1 【代码优化】全局:Area 在 IDEA debug 时 toString 方法报错StackOverflowError、指定 jackson 默认序列化时双向引用的前向、后向出口避免死循环报错
...
Merge pull request !1 from 常柯柯/N/A
2024-07-29 09:42:26 +00:00
常柯柯
18cf9e55e1
【代码优化】全局:Area 在 IDEA debug 时 toString 方法报错StackOverflowError、指定 jackson 默认序列化时双向引用的前向、后向出口避免死循环报错
...
Signed-off-by: 常柯柯 <88455621@qq.com >
2024-07-29 09:40:13 +00:00
puhui999
e782077e23
Merge remote-tracking branch 'refs/remotes/yudao/develop' into develop
2024-07-29 17:15:05 +08:00
puhui999
9a926e251b
【新增】mall: 钱包充值成功发送订阅消息
2024-07-29 17:14:41 +08:00
芋道源码
008b544f03
!1019 【优化】SYSTEM: 根据代码评审优化小程序的订阅消息
...
Merge pull request !1019 from puhui999/develop
2024-07-29 01:39:01 +00:00
YunaiV
e4386dd537
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2024-07-28 23:24:27 +08:00
YunaiV
8007b51930
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2024-07-28 23:24:15 +08:00
YunaiV
934b0ef69c
V2.2.0 版本的 SQL
2024-07-28 23:20:43 +08:00
YunaiV
7c54204716
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm
2024-07-28 20:44:58 +08:00
YunaiV
3d9ec1966f
【功能修复】MALL:优惠劵的折扣计算不正确
2024-07-28 20:01:54 +08:00
YunaiV
ad22a9d516
【代码优化】全局:Area 在 IDEA debug 时 toString 方法报错StackOverflowError、指定 jackson 默认序列化时双向引用的前向、后向出口避免死循环报错
2024-07-28 19:34:38 +08:00
YunaiV
d14868b459
【依赖修复】AI:移除 dashscope-sdk-java 里的 slf4j-simple,避免日志冲突
2024-07-27 22:36:08 +08:00
YunaiV
668870d052
【同步】BOOT 和 CLOUD 的功能
2024-07-27 15:41:23 +08:00
YunaiV
4386c7018c
【功能优化】全局:文件存储 S3 兼容腾讯云、火山云的 VirtualStyle 模式
2024-07-27 10:23:24 +08:00
YunaiV
d9b913a7dd
【功能修复】全局:访问日志的 query 查询未记录到的问题
2024-07-26 22:48:20 +08:00
YunaiV
87126d8385
【功能修复】CRM:回款管理导出报错的问题
2024-07-26 22:37:35 +08:00
YunaiV
39c0652c43
【功能优化】全局:代码生成字段过多时,操作栏设置 min-width 保证宽度
2024-07-26 22:08:57 +08:00
YunaiV
6325ff1144
【功能修复】全局:代码生成器的 tenant_id
字段增加 default 0 值不正确的问题
2024-07-26 21:59:44 +08:00
YunaiV
63dd0905d3
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2024-07-26 21:07:50 +08:00
YunaiV
9eeaa11520
【功能修复】全局:vben 前端代码生成后列表页面是空的问题
2024-07-26 21:07:40 +08:00
芋道源码
e341011209
!1020 vben前端代码生成后列表页面是空的问题
...
Merge pull request !1020 from Rex/master
2024-07-26 13:06:04 +00:00
王仁禧
292c3c3c57
fix: generate code of vben blank page
2024-07-26 16:16:18 +08:00
YunaiV
94f9d35410
【功能修复】MALL:支付超时时间返回不正确的问题
2024-07-26 12:47:34 +08:00
YunaiV
772d31cd9a
【代码优化】全局:DeptDataPermissionRule 的 ExpressionList 泛型 Long,解决部分 IDEA 的 jdk 编译存在问题
2024-07-26 09:20:54 +08:00
YunaiV
c660833697
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/channel/PayChannelServiceImpl.java
# yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/weixin/WxPayClientConfig.java
2024-07-26 09:17:51 +08:00
YunaiV
41ee237161
【代码优化】全局:DeptDataPermissionRule 的 ExpressionList 泛型 Long,解决部分 IDEA 的 jdk 编译存在问题
2024-07-26 09:17:33 +08:00
YunaiV
f0d680b2b8
【功能优化】PAY:微信支付使用 certSerialNo 替代 privateCertContent
2024-07-25 23:45:03 +08:00
puhui999
4696105210
【优化】SYSTEM: 根据代码评审优化小程序的订阅消息
2024-07-25 17:37:50 +08:00
YunaiV
f877a24eaa
【代码优化】PAY:移除 PayClient 缓存,减少复杂性,性能足够(非高频读取)
2024-07-24 23:03:53 +08:00
YunaiV
762c19ecec
【代码优化】PAY:移除 PayClient 缓存,减少复杂性,性能足够(非高频读取)
2024-07-24 22:54:57 +08:00
YunaiV
844bdd7380
【代码优化】PAY:调整 PayOrderSyncJob 注释,更容易理解
2024-07-24 22:47:25 +08:00
YunaiV
e02b95f277
【代码修复】PAY:微信扫码支付 v2 版本,缺少 product_id 的报错
2024-07-24 21:36:04 +08:00
YunaiV
55e1bca3c0
【代码修复】PAY:微信扫码支付 v2 版本,缺少 product_id 的报错
2024-07-24 21:35:37 +08:00
YunaiV
7f87f26f3a
【代码评审】SYSTEM:微信小程序的订阅消息
2024-07-24 19:30:28 +08:00
芋道源码
b917d92af5
!1018 新增小程序订阅消息相关接口
...
Merge pull request !1018 from puhui999/develop
2024-07-24 11:12:12 +00:00
YunaiV
625265b11d
【同步】BOOT 和 CLOUD 的功能
2024-07-24 19:05:30 +08:00
YunaiV
a131434f94
【同步】jdk21 和 jdk8 的代码
2024-07-24 18:55:24 +08:00
YunaiV
257acba31e
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/interceptor/ApiAccessLogInterceptor.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserService.java
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/security/config/SecurityConfiguration.java
2024-07-24 18:46:33 +08:00
puhui999
8054847b05
【新增】SYSTEM: 发送微信小程序订阅消息测试接口
2024-07-24 17:18:48 +08:00
YunaiV
d87d51b701
【功能优化】全局:ApiAccessLogInterceptor 额外打印 Controller 地址,基于 https://t.zsxq.com/Z70Sl 建议
2024-07-24 13:30:02 +08:00
YunaiV
2201cd6af3
【同步】全局:最新的 Quartz 脚本
2024-07-24 08:53:20 +08:00
YunaiV
ebe3cc727b
【功能新增】全局:多租户缓存,增加忽略的 Spring Cache 配置
2024-07-23 23:25:56 +08:00
YunaiV
aef833fb9f
【代码优化】全局:userId 为空时,直接校验权限不通过
2024-07-23 22:40:33 +08:00
YunaiV
39bf9cf5b0
【代码修复】REPORT:修复积木在访问 jmreport/index 会报错的问题
2024-07-23 22:15:14 +08:00
puhui999
63e319e663
【新增】SYSTEM: 发送微信小程序订阅消息
2024-07-23 17:46:41 +08:00
yinyilong
878b56a7d6
bugfix-导入系统用户时,增加注解校验过程,与界面添加和修改用户保持一致
2024-07-23 14:43:57 +08:00
YunaiV
2a4882e8d6
【代码修复】BPM:BpmProcessInstanceStatusEnum 的 array 返回错误,导致 page 筛选校验报错
2024-07-23 13:53:16 +08:00
YunaiV
68dd270258
【代码修复】MALL:更新库存时,同时更新销量,和 taobao 保持一致的逻辑
2024-07-23 12:44:57 +08:00
YunaiV
e2f3491295
【代码修复】MALL:更新库存时,同时更新销量,和 taobao 保持一致的逻辑
2024-07-23 12:43:49 +08:00
YunaiV
714f0be547
【代码修复】MALL:更新库存时,同时更新销量,和 taobao 保持一致的逻辑
2024-07-23 12:39:04 +08:00
YunaiV
a55ca87709
【代码修复】MALL:秒杀活动的商品拼接不正确的问题
2024-07-22 22:16:10 +08:00
YunaiV
cf6f3eaa41
【代码修复】MALL:修复订单项取消时,分销未取消所有推广员的推广记录问题
2024-07-22 18:12:44 +08:00
puhui999
02f4d3824e
Merge remote-tracking branch 'refs/remotes/yudao/develop' into develop
2024-07-22 15:41:54 +08:00
puhui999
9a263f8dab
【新增】SYSTEM: 微信小程序订阅消息模版获取接口
2024-07-22 15:40:20 +08:00
YunaiV
4959479ac6
【代码修复】MALL:拼团活动的商品拼接不正确的问题
2024-07-21 18:23:19 +08:00
YunaiV
743383faf2
【代码修复】全局:BaseMapperX 的分页 pageSize 不分页判断不对的问题
2024-07-21 18:03:16 +08:00
YunaiV
14cc447ae4
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-module-pay/yudao-module-pay-biz/src/test-integration/java/cn/iocoder/yudao/module/pay/dal/mysql/merchant/PayChannelMapperIntegrationTest.java
# yudao-module-pay/yudao-module-pay-biz/src/test-integration/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceIntegrationTest.java
# yudao-module-pay/yudao-module-pay-biz/src/test-integration/resources/application-integration-test.yaml
2024-07-21 17:05:31 +08:00
YunaiV
9e84834620
【代码代码】PAY:移除对 member 的依赖
2024-07-21 11:52:02 +08:00
YunaiV
cd13d26711
【代码代码】PAY:移除对 member 的依赖
2024-07-21 11:25:28 +08:00
YunaiV
a210210b20
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/wallet/PayWalletController.java
2024-07-21 11:15:04 +08:00
YunaiV
e052ddab2f
【代码代码】PAY:移除对 member 的依赖
2024-07-21 11:13:11 +08:00
YunaiV
fe3f144cff
【缺陷修复】ERP:数据统计时,租户在 MyBatis XML 不生效的问题
2024-07-20 23:50:48 +08:00
YunaiV
2658898138
【缺陷修复】MALL:修复优惠劵过期时,update 失败的情况
2024-07-20 22:54:08 +08:00
YunaiV
76a7b5e401
【缺陷修复】MALL:物流信息的缓存不生效的问题
2024-07-20 22:45:08 +08:00
YunaiV
e3bec2fa3b
【缺陷修复】BPM:流程重新发起时,禁用业务表单的情况,避免报错
2024-07-20 22:14:34 +08:00
YunaiV
2c429263d0
【功能修复】全局:SelectSheetWriteHandler 在没有任何 SelectSheetWriteHandler 的情况下,导致 Excel 导入不解析下拉框的问题
2024-07-20 18:58:42 +08:00
YunaiV
a31dd24399
【功能优化】全局:LoginUser 新增过期时间,方便判断 token 过期
2024-07-20 18:42:19 +08:00
YunaiV
002daeae7a
【功能修复】MALL:CombinationRecordReqPageVO 的 status 枚举校验范围不正确的问题
2024-07-20 18:03:55 +08:00
YunaiV
d608974c17
【功能新增】INFRA:增加 ConfigApi,支持参数配置的读取
2024-07-20 17:56:29 +08:00
YunaiV
2c9866b551
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2024-07-20 17:55:17 +08:00
YunaiV
9f86ef862d
【功能新增】INFRA:增加 ConfigApi,支持参数配置的读取
2024-07-20 17:55:06 +08:00
YunaiV
cbd538f220
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2024-07-20 16:36:12 +08:00
YunaiV
c2de3d5ea9
【代码优化】全局:去除 application.yaml 相关配置文件的冗余
2024-07-20 16:36:04 +08:00
YunaiV
198c374a6f
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2024-07-20 16:35:22 +08:00
YunaiV
70663af4cb
【代码优化】全局:去除 application.yaml 相关配置文件的冗余
2024-07-20 16:35:11 +08:00
YunaiV
c5689b4625
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2024-07-19 23:36:43 +08:00
YunaiV
a8fc7982ff
【功能优化】全局:简化 GlobalExceptionHandler 对 ServiceException 的打印
2024-07-19 23:36:34 +08:00
YunaiV
6aac058be7
【功能优化】全局:处理 HttpRequestMethodNotSupportedException 异常
2024-07-19 23:12:41 +08:00
YunaiV
9f94ddf93a
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2024-07-19 23:12:06 +08:00
YunaiV
047051e008
【功能优化】全局:处理 HttpRequestMethodNotSupportedException 异常
2024-07-19 23:11:56 +08:00
YunaiV
d156742fce
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2024-07-19 23:03:16 +08:00
YunaiV
bbdf9e9b2e
【功能修复】全局:请求租户不存在时,记录访问日志、操作日志异常的问题
2024-07-19 22:54:38 +08:00
YunaiV
401de30344
【代码优化】MALL:完善管理端获得商品浏览记录分页接口
2024-07-17 20:07:01 +08:00
YunaiV
65ef6ff5ed
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
2024-07-17 20:05:07 +08:00
芋道源码
a1aa055125
!1014 mall: 完善管理端获得商品浏览记录分页接口
...
Merge pull request !1014 from puhui999/develop
2024-07-17 12:04:47 +00:00
YunaiV
ce0d50596d
【依赖】更新 README 中的框架版本号
2024-07-17 19:40:42 +08:00
YunaiV
8691663a29
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# README.md
2024-07-17 19:37:16 +08:00
YunaiV
6330353938
【依赖】更新 README 中的框架版本号
2024-07-17 19:35:22 +08:00
YunaiV
193c358f3e
【依赖】解决 redisson-spring-boot-starter 升级到 3.32.0 后的 Tuple NoClassDefFoundError 报错
2024-07-17 19:24:34 +08:00
puhui999
c4ab00eabb
mall: kefu 包名更正
2024-07-17 18:42:45 +08:00
puhui999
1ecc50b3c9
mall: 完善管理端获得商品浏览记录分页接口
2024-07-17 18:36:48 +08:00
YunaiV
3eb414caf6
【依赖】解决 redisson-spring-boot-starter 升级到 3.32.0 后的 Tuple NoClassDefFoundError 报错
2024-07-16 23:29:52 +08:00
YunaiV
6a13f88076
【依赖】maven-compiler-plugin from 3.11.0 to 3.13.0
...
【依赖】flatten-maven-plugin from 1.5.0 to 1.6.0
2024-07-16 12:37:05 +08:00
YunaiV
36c2673697
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# pom.xml
# yudao-dependencies/pom.xml
2024-07-16 12:33:07 +08:00
YunaiV
38d5013da8
【依赖】maven-compiler-plugin from 3.11.0 to 3.13.0
...
【依赖】flatten-maven-plugin from 1.5.0 to 1.6.0
2024-07-16 12:32:50 +08:00
YunaiV
85848f0830
【代码优化】调整 swagger 的安全配置
2024-07-16 00:32:17 +08:00
YunaiV
1c139ca6bc
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/security/config/SecurityConfiguration.java
2024-07-16 00:31:24 +08:00
YunaiV
28d74d07ac
【代码优化】调整 swagger 的安全配置
2024-07-16 00:30:54 +08:00
YunaiV
916384248a
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-dependencies/pom.xml
2024-07-16 00:02:14 +08:00
YunaiV
8f6be354f9
【依赖】knife4j from 4.3.0 to 4.5.0
2024-07-16 00:02:04 +08:00
YunaiV
c64ba58cd0
【依赖】knife4j from 4.3.0 to 4.5.0
2024-07-16 00:01:24 +08:00
YunaiV
15e704d2d1
【依赖】rocketmq from 2.2.3 to 2.3.0
2024-07-15 22:57:56 +08:00
YunaiV
c081591403
【依赖】redisson from 3.26.0 to 3.32.0
2024-07-15 22:48:03 +08:00
YunaiV
1df7d2cc52
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-dependencies/pom.xml
2024-07-15 22:30:29 +08:00
YunaiV
968009cb5e
【依赖】redisson from 3.26.0 to 3.32.0
2024-07-15 22:30:17 +08:00
YunaiV
c3a3bf028c
【依赖】easy-trans from 1.6.6 to 1.7.8
2024-07-15 12:41:01 +08:00
YunaiV
bc365800b5
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-dependencies/pom.xml
2024-07-15 12:38:42 +08:00
YunaiV
4de27eb12d
【依赖】easy-trans from 1.6.6 to 1.7.8
2024-07-15 12:38:23 +08:00
YunaiV
eca0a0422b
【依赖】jimureport from 1.6.6 to 1.7.8
2024-07-14 22:01:20 +08:00
YunaiV
2e3f998ee7
【依赖】jimureport from 1.6.6 to 1.7.8
2024-07-14 22:01:03 +08:00
YunaiV
438078d28f
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-module-report/yudao-module-report-biz/pom.xml
2024-07-14 21:58:59 +08:00
YunaiV
211e196fce
【依赖】jimureport from 1.6.6 to 1.7.8
2024-07-14 21:57:52 +08:00
YunaiV
85090b8224
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2024-07-13 23:35:55 +08:00
YunaiV
bea66e5c6f
【代码优化】全局:复用 MyBatis Plus 数据权限插件,简化项目的数据权限实现
2024-07-13 23:35:39 +08:00
YunaiV
0566f5fa93
【依赖】mybatis-plus from 3.5.5 to 3.5.7
2024-07-13 22:52:23 +08:00
YunaiV
3e3407eb99
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/file/FileConfigDO.java
# yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/dal/dataobject/message/MpMessageDO.java
2024-07-13 22:43:33 +08:00
YunaiV
2b39b434fa
【依赖】mybatis-plus from 3.5.5 to 3.5.7
2024-07-13 22:42:54 +08:00
YunaiV
ff0c1cfd7f
【依赖】工具类升级
2024-07-13 17:37:45 +08:00
YunaiV
d0d951fd48
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# pom.xml
# yudao-dependencies/pom.xml
2024-07-13 17:33:33 +08:00
YunaiV
40deb00a00
【依赖】工具类升级
2024-07-13 17:33:15 +08:00
YunaiV
a85c29d642
【升级】podam from 8.0.1 to 8.0.2
2024-07-13 17:09:47 +08:00
YunaiV
477c5d6ab3
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-dependencies/pom.xml
2024-07-13 17:07:59 +08:00
YunaiV
f1c654f5a4
【依赖】podam from 8.0.1 to 8.0.2
2024-07-13 17:07:18 +08:00
YunaiV
d71bac7138
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-dependencies/pom.xml
2024-07-13 16:58:54 +08:00
YunaiV
782f3337dd
【依赖】spring boot admin from 3.2.1 to 3.3.2
2024-07-13 16:58:36 +08:00
YunaiV
da4679e247
【依赖】druid from 1.2.21 to 1.2.23
2024-07-13 16:48:16 +08:00
YunaiV
375745828b
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# pom.xml
# yudao-dependencies/pom.xml
2024-07-13 16:39:15 +08:00
YunaiV
45805aa761
【依赖】spring boot from 3.2.2 to 3.3.1
2024-07-13 16:38:26 +08:00
YunaiV
e591c1869a
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/kefu/KeFuConversationServiceImpl.java
2024-07-13 16:31:40 +08:00
YunaiV
aff7919780
【同步】Boot 和 Cloud 的功能同步
2024-07-13 12:55:56 +08:00
YunaiV
dee820b8fd
【功能新增】MALL:新增 mall 客服
2024-07-13 12:25:55 +08:00
YunaiV
03e07a2902
【功能新增】MALL:新增 mall 客服
2024-07-13 12:24:49 +08:00
YunaiV
ce1940e4f3
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsPerformanceServiceImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/AppBrokerageUserController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserService.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserServiceImpl.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/social/AppSocialUserController.java
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/social/SocialUserApi.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialClientService.java
2024-07-13 12:14:46 +08:00
YunaiV
41afea6818
【功能新增】MALL:新增 mall 客服
2024-07-13 12:14:07 +08:00
芋道源码
b586a09b90
!1011 新增 mall 客服
...
Merge pull request !1011 from 芋道源码/develop
2024-07-13 04:11:46 +00:00
YunaiV
e95f69b683
【同步】Boot 和 Cloud 的功能同步
2024-07-13 12:03:44 +08:00
YunaiV
8d1d0c15f7
【同步】Boot 和 Cloud 的功能同步
2024-07-13 12:03:26 +08:00
YunaiV
d349557166
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2024-07-13 11:27:22 +08:00
芋道源码
3aad33c3cd
!1013 新增文心一言、智谱 AI 的绘图能力
...
Merge pull request !1013 from 芋道源码/master-jdk21-ai
2024-07-13 02:47:49 +00:00
YunaiV
a18682e874
README:新增关于 AI 大模型的介绍
2024-07-13 10:18:08 +08:00
YunaiV
73502d565f
【代码优化】AI:ChatGlm 替换成 ZhiPuAiImage 实现
2024-07-13 00:06:48 +08:00
YunaiV
8da0807242
【代码评审】SYSTEM:华为云 client 的 review
2024-07-12 23:16:34 +08:00
芋道源码
af5be1bcb2
!1012 【修复】恢复 websocket path
...
Merge pull request !1012 from puhui999/develop
2024-07-12 11:56:52 +00:00
puhui999
ec5a209eed
【修复】恢复 websocket path
2024-07-12 18:01:30 +08:00
cherishsince
4311fe4517
【增加】image 对接 Chatglm 模型
2024-07-12 15:44:59 +08:00
cherishsince
2ae90b9edc
Merge remote-tracking branch 'origin/master-jdk21-ai' into master-jdk21-ai
2024-07-12 15:03:41 +08:00
cherishsince
d865cc293b
【增加】chatglm 实现 spring ai 标准
2024-07-12 15:03:34 +08:00
芋道源码
528200f326
!997 华为短信client实现,基于API方式
...
Merge pull request !997 from scholarli/develop
2024-07-12 05:07:01 +00:00
YunaiV
88b897ca13
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2024-07-12 09:34:44 +08:00
YunaiV
c3af08900c
【模块新增】AI:支持通义千问、文心一言、讯飞星火、智谱、DeepSeek 等国内外大模型能力
2024-07-12 09:32:17 +08:00
芋道源码
90fa7be660
!1006 AI 大模型的草稿提交(code review 代码)
...
Merge pull request !1006 from 芋道源码/master-jdk21-ai
2024-07-12 01:29:43 +00:00
YunaiV
68ed8cd6f8
【代码优化】AI:思维导入、写作的生成
2024-07-12 09:26:32 +08:00
芋道源码
ecb50c6511
!14 【解决todo】AI 写作、脑图:model、systemMessage获取逻辑调整
...
Merge pull request !14 from 小新/master-jdk21-ai
2024-07-12 00:48:48 +00:00
YunaiV
698b2b24ae
【代码优化】AI:文心一言的 tests 类
2024-07-11 22:15:44 +08:00
cherishsince
abc51c670a
Merge remote-tracking branch 'origin/master-jdk21-ai' into master-jdk21-ai
2024-07-11 21:46:19 +08:00
cherishsince
18aeb072a6
【优化】buildImageOptions 支持千帆
2024-07-11 21:46:09 +08:00
YunaiV
c6c003707e
【代码优化】AI:通义千问的 tests 类
2024-07-11 21:37:45 +08:00
cherishsince
db7315b8cd
【增加】百度千帆
2024-07-11 17:48:18 +08:00
cherishsince
88d7c90c98
【添加todo】@芋艿 千帆sdk image 生成有错误
2024-07-11 16:33:15 +08:00
cherishsince
6b7238a79d
【增加】百度千帆 image tests
2024-07-11 16:32:15 +08:00
xiaoxin
29e421432d
【解决todo】AI 写作、脑图:model、systemMessage获取逻辑调整
2024-07-11 10:14:59 +08:00
芋道源码
7a0a5f0f9a
!1010 MALL-KEFU: 发送消息通知所有管理员更新对话
...
Merge pull request !1010 from puhui999/develop
2024-07-10 15:05:08 +00:00
YunaiV
e39a6c3467
【代码新增】AI:写作管理界面
2024-07-10 23:01:24 +08:00
cherishsince
d6b3b5e9bd
【增加】ai image对接通义
2024-07-10 21:34:42 +08:00
YunaiV
28018b1f7f
Merge remote-tracking branch 'origin/master-jdk21-ai' into master-jdk21-ai
2024-07-10 18:57:18 +08:00
YunaiV
b4014bf2df
【代码评审】AI:写作部分的建议
2024-07-10 18:57:12 +08:00
cherishsince
f25c7c4b86
Merge remote-tracking branch 'origin/master-jdk21-ai' into master-jdk21-ai
2024-07-10 18:53:46 +08:00
cherishsince
b6fead81f2
【增加】增加通义万相
2024-07-10 18:53:39 +08:00
芋道源码
b8a443fbe0
!13 【AI 】1.支持脑图内容生成 2.AI 写作:做角色设定,提高准确率
...
Merge pull request !13 from 小新/master-jdk21-ai
2024-07-10 10:43:16 +00:00
xiaoxin
bcdb23b89d
【优化】AI 写作:做角色设定,提高准确率
2024-07-10 14:28:31 +08:00
xiaoxin
7cd16ffbf3
Merge branch 'refs/heads/upstrem-master-jdk21-ai' into master-jdk21-ai
2024-07-10 13:27:08 +08:00
xiaoxin
ababc914bd
【新增】AI 脑图
2024-07-10 13:18:17 +08:00
YunaiV
4c21ae32fe
【代码评审】AI:写作部分的建议
2024-07-10 12:59:21 +08:00
芋道源码
f3a6ba8349
!12 【优化】AI 写作:1. 优先获取写作角色;2. 优化写作提示词
...
Merge pull request !12 from 小新/master-jdk21-ai
2024-07-10 04:53:42 +00:00
cherishsince
870b1bf369
【增加】增加通义万象 test
2024-07-10 10:27:46 +08:00
xiaoxin
6e71b721e8
【优化】AI 写作:1. 优先获取写作角色;2. 优化写作提示词
2024-07-09 22:05:42 +08:00
puhui999
ebfcec4cfe
MALL-KEFU: 聊天内容字段长度增加
2024-07-09 17:32:28 +08:00
puhui999
b5528bfc15
MALL-KEFU: 发送消息通知所有管理员更新对话
2024-07-09 15:21:56 +08:00
YunaiV
ae69b137be
【代码优化】AI:将对话、聊天挪到 index 目录下,更模块化
2024-07-07 18:29:31 +08:00
YunaiV
92810bf028
对齐 jdk8、jdk17 的代码实现
2024-07-07 17:04:22 +08:00
YunaiV
a19bd126e1
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2024-07-07 17:00:16 +08:00
YunaiV
2f49ad31f4
!124 【修复】分销用户绑定时判断是否为新用户逻辑错误问题
2024-07-07 11:07:21 +08:00
芋道源码
3d44c2f9e3
!1009 数据库 findInSet 兼容
...
Merge pull request !1009 from 芋道源码/feature/db
2024-07-07 01:32:51 +00:00
YunaiV
f5ed040943
【代码优化】全局:数据库 findInSet 兼容
2024-07-07 09:31:27 +08:00
芋道源码
87c6c90a47
!1000 feat: FindInSetEnum、NameToTypeEnum 融合为DbTypeEnum
...
Merge pull request !1000 from dhb52/feature/db
2024-07-07 01:28:26 +00:00
YunaiV
f1f2e24cde
FIX_BUG controller.vm模版中的export-excel引用的Vo类没有加上sceneEnum.prefixClass前缀导致报错
2024-07-07 09:26:28 +08:00
YunaiV
0fa5cf1db6
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2024-07-07 09:24:46 +08:00
芋道源码
5325e9c506
!1004 FIX_BUG controller.vm模版中的export-excel引用的Vo类没有加上sceneEnum.prefixClass前缀导致报错
...
Merge pull request !1004 from Syriana_Zh/N/A
2024-07-07 01:24:34 +00:00
YunaiV
5d3bb791fd
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceTest.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java
2024-07-07 09:14:36 +08:00
YunaiV
a0020f0339
修复主子表ERP模式下代码自动生成不全问题 #583
2024-07-07 09:13:42 +08:00
YunaiV
8d138cd1e9
Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro
2024-07-07 09:11:46 +08:00
芋道源码
0337b1df68
Merge pull request #582 from jiushinakecai/com-dev
...
Update mapper_sub.vm
2024-07-07 09:11:04 +08:00
YunaiV
6a24025afa
fix: 修复区域工具类单元测试 #585
2024-07-07 09:08:33 +08:00
芋道源码
ec480d142e
Merge pull request #585 from hunao0221/master
...
fix: 修复区域工具类单元测试
2024-07-07 09:02:31 +08:00
芋道源码
f510ae5c16
!1008 MALL-KEFU: 优化消息已读处理逻辑
...
Merge pull request !1008 from puhui999/develop
2024-07-06 15:57:14 +00:00
YunaiV
fa230cea8e
【代码优化】AI:完善 SunoApiTests 单测,方便大家快速体验
2024-07-06 23:13:55 +08:00
YunaiV
62d5ed8395
【代码优化】AI:完善 MidjourneyApiTests 单测,方便大家快速体验
2024-07-06 22:47:33 +08:00
YunaiV
c5ed07a091
【代码优化】AI:完善 StabilityAiImageModelTests 单测,方便大家快速体验
2024-07-06 22:34:59 +08:00
YunaiV
826a7e0ac0
【功能新增】AI:大模型相关的介绍
2024-07-06 20:08:12 +08:00
YunaiV
19407f6dce
【功能新增】AI:大模型相关的介绍
2024-07-06 20:06:56 +08:00
YunaiV
6e64ae774e
【代码新增】AI:接入智谱 GLM-4 模型
2024-07-06 18:16:47 +08:00
YunaiV
59c853b54d
【代码优化】AI:完善 DeepSeekChatTests、XingHuoChatModelTests 单测,方便大家快速体验
2024-07-06 17:37:17 +08:00
YunaiV
4daff93313
【代码优化】AI:完善 YiYanChatTests 单测,方便大家快速体验
2024-07-06 16:45:49 +08:00
YunaiV
4f11d00cfd
【代码优化】AI:完善 TongYiChatModelTests 单测,方便大家快速体验
2024-07-06 15:45:18 +08:00
YunaiV
0139317ac4
【代码优化】AI:完善 LlamaChatModelTests 单测,方便大家快速体验
2024-07-06 14:47:56 +08:00
YunaiV
1feff2b12b
【代码优化】AI:完善 OpenAIChatModelTests、OpenAiImageModelTests 单测,方便大家快速体验
2024-07-06 14:11:21 +08:00
YunaiV
e0f08a0f02
【代码优化】AI:将 ChatClient 替换成 ChatModel,和 Spring AI 对齐
2024-07-06 12:54:23 +08:00
YunaiV
6c094aaffc
【新增】AI:接入 DeepSeek 模型
2024-07-06 12:18:28 +08:00
YunaiV
2d36ec4858
【代码优化】AI:优化 xinghuo 的接入,复用 OpenAI,同时将 ws 替换成 htt 调用
2024-07-06 08:56:36 +08:00
puhui999
4a39595576
MALL-KEFU: 优化管理员会话处理逻辑
2024-07-05 17:59:47 +08:00
puhui999
19e7763440
MALL-KEFU: 优化消息已读处理逻辑
2024-07-05 16:30:38 +08:00
YunaiV
2e73959a2c
【代码新增】AI:开启 AI 租户的能力
2024-07-05 09:42:36 +08:00
cherishsince
c98495dfcb
Merge remote-tracking branch 'origin/master-jdk21-ai' into master-jdk21-ai
2024-07-05 09:26:20 +08:00
cherishsince
3d2b0decd9
【解决todo】增加 finishTime 完成时间
2024-07-05 09:26:10 +08:00
YunaiV
266b6faa85
【代码优化】AI:移除 AiModelEnum 枚举
2024-07-04 23:55:05 +08:00
YunaiV
471968eaf2
【代码优化】AI:新增 AIUtils,用于对接 spring ai 各种对象的构建
2024-07-04 23:53:22 +08:00
YunaiV
41071fc689
【代码优化】AI:对话 deleteChatConversationMyByUnpinned 接口
2024-07-04 23:39:51 +08:00
芋道源码
39de74449f
!11 解决部分todo,通义千问流式返回改为增量
...
Merge pull request !11 from 小新/master-jdk21-ai
2024-07-04 14:04:30 +00:00
xiaoxin
9a2b8cc232
【优化】AI:通义千问流式返回改为增量
2024-07-04 11:26:22 +08:00
xiaoxin
431e91561f
【解决todo】AI 写作:语言、语气等改为字典
2024-07-04 11:22:12 +08:00
scholar
0c8163c409
优化华为短信客户端实现,去除两个新增类HuaweiRequest、HuaweiSigner
2024-07-04 10:56:20 +08:00
xiaoxin
4ef55fa921
Merge remote-tracking branch 'origin/master-jdk21-ai' into master-jdk21-ai
...
# Conflicts:
# yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/music/AiMusicController.http
2024-07-04 10:10:58 +08:00
YunaiV
1093e2957c
【代码新增】AI:聊天会话的段式发送
2024-07-04 09:39:23 +08:00
xiaoxin
793aeea2a3
【优化】AI 音乐:v3标识调整
2024-07-03 23:24:40 +08:00
YunaiV
f20c27a7ef
【代码评审】AI:写作实现
2024-07-03 21:26:38 +08:00
芋道源码
9ddd2eddf8
!9 【增加】AI 写作:初版
...
Merge pull request !9 from 小新/master-jdk21-ai
2024-07-03 13:18:23 +00:00
YunaiV
f78d13a83c
【代码优化】AI:完善各种注释
2024-07-03 21:11:10 +08:00
xiaoxin
6dfbfe5167
【优化】AI 写作:格式、语气、语言等抽枚举
2024-07-03 14:53:08 +08:00
xiaoxin
b80a76d115
【解决todo】AI 音乐:我的音乐修改单独VO
2024-07-03 11:24:24 +08:00
xiaoxin
f05f540865
【增加】AI 写作:支持回复
2024-07-03 11:17:16 +08:00
xiaoxin
77ead4859c
【增加】AI 写作:支持撰写
2024-07-03 10:52:41 +08:00
xiaoxin
aa4c1cb268
Merge branch 'master-jdk21-ai' into master-jdk21-ai-write
2024-07-03 09:18:18 +08:00
cherishsince
3e1641216a
【解决todo】mj 增加 base64 参考图
2024-07-02 23:02:24 +08:00
cherishsince
8f68d64cd7
【todo】增加todo
2024-07-02 22:03:32 +08:00
YunaiV
24a9d05179
【代码评审】AI:音乐接入
2024-07-02 21:07:12 +08:00
芋道源码
3f0d823a85
!8 【解决todo】AI 音乐:1.处理失败任务 2.两种生成类型提示词合并,库中区分
...
Merge pull request !8 from 小新/master-jdk21-ai
2024-07-02 13:05:06 +00:00
YunaiV
b7e4f8e460
【代码评审】MALL:review 客服的实现
2024-07-02 20:59:29 +08:00
芋道源码
80a1f50cc8
!1001 MALL-KEFU: 完善管理端接口
...
Merge pull request !1001 from puhui999/develop
2024-07-02 12:53:40 +00:00
puhui999
60c473a312
MALL-KEFU: 管理端发送消息增加消息类型
2024-07-02 17:11:45 +08:00
胡闹
167e4153fb
fix: 修复区域工具类单元测试
2024-07-02 10:58:46 +08:00
puhui999
eed4cf127e
MALL-KEFU: 完善管理端接口
2024-07-01 17:20:24 +08:00
xiaoxin
4a6a027beb
【解决todo】AI 音乐:1.处理失败任务 2.两种生成类型提示词合并,库中区分
2024-06-30 21:10:54 +08:00
cherishsince
f300b8a1ae
【修改todo】增加 sd 各种参数
2024-06-30 16:10:56 +08:00
YunaiV
246c233253
【优化】AI:通义千问的集成,从自己集成,换成 spring cloud alibaba ai 库
2024-06-29 19:00:09 +08:00
YunaiV
c5db930603
【优化】AI:依赖从文心一言,使用 spring ai 替代接入
2024-06-29 18:33:16 +08:00
YunaiV
7dfa7a1573
【优化】AI:依赖从 io.springboot.ai 调整为 org.springframework.ai
2024-06-29 18:13:36 +08:00
YunaiV
6225e18f70
【新增】AI:绘图(MJ)接入 API KEY 管理
2024-06-29 09:46:44 +08:00
YunaiV
949d5a1815
【新增】AI:音乐接入 API KEY 管理
2024-06-29 09:29:37 +08:00
芋道源码
2e9915b77b
!7 【增加】AI:我的音乐
...
Merge pull request !7 from 小新/master-jdk21-ai
2024-06-29 00:00:59 +00:00
YunaiV
2c61acf913
【代码优化】AI:图片轮询实现
2024-06-29 07:57:01 +08:00
YunaiV
d860560318
【代码优化】AI:图片轮询实现
2024-06-28 21:18:31 +08:00
xiaoxin
94460008c4
【增加】AI:我的音乐
2024-06-28 14:40:57 +08:00
xiaoxin
3acd058635
【优化】AI 音乐:生成支持指定模型生成,支持回写音乐时长
2024-06-28 13:46:56 +08:00
xiaoxin
bdd7d0c1fd
【代码优化】AI:音乐生成产物上传至内部文件服务
2024-06-28 10:45:59 +08:00
xiaoxin
7a66a435f9
【增加】AI:写作模版构建
2024-06-28 09:51:56 +08:00
YunaiV
128c38ca02
【功能新增】AI:音乐管理 100%
2024-06-28 09:49:23 +08:00
YunaiV
9d6b615f10
【功能新增】AI:音乐管理 50%
2024-06-27 23:09:17 +08:00
Syriana_Zh
5e8348dfca
FIX_BUG controller.vm模版中的export-excel引用的Vo类没有加上sceneEnum.prefixClass前缀导致报错
...
Signed-off-by: Syriana_Zh <4916681+sairupe@user.noreply.gitee.com >
2024-06-27 10:01:24 +00:00
cherishsince
671c3016c8
【增加】根据多个id获取 image 信息,用于前端轮训任务
2024-06-27 17:52:53 +08:00
xiaoxin
bec2aafecb
【增加】AI Write init
2024-06-27 17:38:31 +08:00
cherishsince
39ecc7a037
【解决todo】排查文心一言,集成到 chat flux 返回 null 终端问题(优化部分代码,未解决问题)
2024-06-27 17:16:04 +08:00
就是那棵菜
7a42b3fab7
测试
...
test
2024-06-27 17:15:11 +08:00
cherishsince
dcab49bb78
Merge remote-tracking branch 'origin/master-jdk21-ai' into master-jdk21-ai
2024-06-27 17:14:46 +08:00
cherishsince
9949a06cec
【解决todo】QianWen 前文增加 model 配置
2024-06-27 17:14:36 +08:00
cherishsince
cbf7a1c587
【代码优化】XingHuoApi stream 变量没有其他地方使用,直接return
2024-06-27 17:13:49 +08:00
cherishsince
6633bf002d
【解决todo】增加模型设置
2024-06-27 17:13:15 +08:00
就是那棵菜
47c8035dbc
Update mapper_sub.vm
...
在“基础设施-代码生成”模块中,当选主子表ERP模式时,补充主表与子表一对一情况下需要生成的接口:default ${subTable.className}DO selectBy${SubJoinColumnName}
2024-06-27 16:10:09 +08:00
YunaiV
d4cfcd0a1a
【代码优化】AI:音乐生成
2024-06-27 13:25:10 +08:00
YunaiV
23baaff84d
【代码优化】AI:音乐生成
2024-06-27 12:48:15 +08:00
芋道源码
c77fc954d2
!6 【解决todo】AI:音乐接入
...
Merge pull request !6 from 小新/master-jdk21-ai
2024-06-27 04:17:24 +00:00
cherishsince
05e4ccaca4
Merge remote-tracking branch 'origin/master-jdk21-ai' into master-jdk21-ai
2024-06-27 09:49:01 +08:00
cherishsince
3fdb8fd5c3
【解决todo】通义千问增加 model 和 temperature
2024-06-27 09:48:53 +08:00
YunaiV
660a29d4e3
Merge remote-tracking branch 'origin/master-jdk21-ai' into master-jdk21-ai
2024-06-27 08:41:45 +08:00
YunaiV
b8bae97016
【功能新增】AI:图片管理
2024-06-27 08:41:12 +08:00
xiaoxin
44a0b04d0e
【解决todo】AI Music:同类变量同行,避免过长
2024-06-26 22:55:04 +08:00
xiaoxin
8bbd2257f2
【解决todo】AI:音乐接入
2024-06-26 17:01:56 +08:00
cherishsince
89db7883e3
【解决todo】驼峰命名、优化字段注释
2024-06-26 16:25:10 +08:00
cherishsince
0535c294f9
【解决todo】驼峰命名、优化字段注释。
2024-06-26 15:56:44 +08:00
cherishsince
9fef49d8b3
【解决todo】AiModelEnum 已解决
2024-06-26 15:49:30 +08:00
cherishsince
b3a0383101
【删除】progress 进度,yunai 把数据库删了
2024-06-26 15:48:05 +08:00
YunaiV
ec1376f4cb
【代码评审】AI:音乐接入
2024-06-25 21:45:26 +08:00
芋道源码
5c73e5e1f4
!5 【解决todo】AI:音乐接入
...
Merge pull request !5 from 小新/master-jdk21-ai
2024-06-25 13:30:58 +00:00
YunaiV
b4eed07d61
【代码优化】AI:MJ 配置类的简化
2024-06-25 21:27:59 +08:00
YunaiV
4c3add508b
【代码优化】AI:MJ 生成图片 ACTION 的优化
2024-06-25 20:36:49 +08:00
YunaiV
098483d2be
【代码优化】AI:MJ 生成图片的优化
2024-06-25 19:57:37 +08:00
puhui999
4ce2be724e
MALL-KEFU: 根据 review 完善客服相关实现
2024-06-24 15:45:05 +08:00
xiaoxin
5ba38dbdaa
【解决todo】AI:音乐接入
2024-06-24 14:19:09 +08:00
YunaiV
88142ed74c
【代码评审】AI:移除老版本的 MJ 接入
2024-06-24 12:59:58 +08:00
dhb52
cc73fc8a91
fix: 调整 DbTypeEnum 字段顺序
2024-06-23 14:59:16 +08:00
YunaiV
75a91a2c46
【代码评审】AI:音乐接入
2024-06-23 12:37:28 +08:00
芋道源码
69b05a30bd
!4 【解决todo】AI Music: 结构优化,task状态同步使用统一标准Job
...
Merge pull request !4 from 小新/master-jdk21-ai
2024-06-23 03:35:51 +00:00
dhb52
3c5309b14e
feat: FindInSetEnum、NameToTypeEnum 融合为DbTypeEnum
2024-06-22 16:56:23 +08:00
YunaiV
7786233ae8
【修复】BPM:多租户使用同一个流程标识 key 时查询报错
2024-06-22 14:26:50 +08:00
YunaiV
355e47c371
【代码评审】Framework:find in set 代码
2024-06-22 10:52:42 +08:00
芋道源码
5f9d4b36a7
!994 feat: find_in_set函数的跨数据库实现
...
Merge pull request !994 from dhb52/feature/db
2024-06-22 02:47:09 +00:00
YunaiV
e216849921
【修复】MEMBER:会员签到记录 Bug
2024-06-22 10:38:59 +08:00
芋道源码
fb459f0366
!984 修复会员签到记录bug
...
Merge pull request !984 from 随便v走走/hotfix/member-sign-in-record-bug
2024-06-22 02:36:59 +00:00
芋道源码
cd99a369e7
Merge pull request #563 from zhenxi-he/master
...
【fix】ERP:采购金额计算逻辑错误
2024-06-22 08:50:17 +08:00
YunaiV
a5fbad31d1
【修复】ERP:采购金额计算逻辑错误
2024-06-22 08:50:12 +08:00
YunaiV
90ea7b951c
【修复】代码生成,Remove duplicate package imports
2024-06-22 08:48:25 +08:00
芋道源码
da815e8f9d
Merge pull request #562 from dengyumin/bugfix/yudao-module-infra-biz
...
fix: Remove duplicate package imports
2024-06-22 08:47:27 +08:00
YunaiV
48001c2b70
Merge branch 'master-jdk17' of https://github.com/YunaiV/ruoyi-vue-pro into master-jdk17
2024-06-22 08:46:09 +08:00
芋道源码
17ff759553
Merge pull request #568 from DevDengChao/fix/disabled-user-login-via-sms
...
fix: 修复被禁用的账户可以通过短信验证码再次登录的问题
2024-06-22 08:45:56 +08:00
芋道源码
816a13ad72
Merge pull request #565 from dongdongxiang/master_jdk17_fix_page_v20240618
...
修复 后台获取商品 SPU 分页列表数据时,数据会出现错乱问题。
2024-06-22 08:39:28 +08:00
YunaiV
01b0866aa4
fix: 修改了函数名拼写
2024-06-22 08:37:06 +08:00
芋道源码
8dc20e2bc4
Merge pull request #571 from kokodayou2000/fix_functionName
...
fix: 修改了函数名拼写
2024-06-22 08:36:36 +08:00
scholar
66bbbc9514
实现华为短信客户端,基于API方式
2024-06-20 11:46:26 +08:00
DevDengChao
e1f98c9777
chore: 使用 CommonStatusEnum.isDisable() 判断会员账户状态
2024-06-20 09:32:51 +08:00
kokodayou2000
792823198c
fix: 修改了函数名拼写
2024-06-19 20:08:49 +08:00
dhb52
74efc60382
Merge branch 'feature/db' of gitee.com:zhijiantianya/ruoyi-vue-pro into feature/db
...
Signed-off-by: dhb52 <dhb52@126.com >
2024-06-19 04:24:43 +00:00
xiaoxin
abd80fe390
【解决todo】AI Music: 结构优化,task状态同步使用统一标准Job
2024-06-19 12:21:01 +08:00
YunaiV
6c7f1e8220
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/db
...
# Conflicts:
# sql/tools/README.md
2024-06-19 09:21:15 +08:00
dongdong.xiang
144bfb85a4
修复 后台获取商品 SPU 分页列表数据时,数据会出现错乱问题。
2024-06-18 22:07:58 +08:00
dhb52
ad03872844
doc: 更新测试数据库 docker 运行文档
2024-06-18 17:09:39 +08:00
dhb52
d49db8eaa8
feat: find_in_set函数的跨数据库实现
2024-06-18 16:59:54 +08:00
cherishsince
e1848895da
【增加】系统账户余额不足提示
2024-06-18 11:29:19 +08:00
cherishsince
bdbe2633e1
【优化】调整 niji 模型,版本好参数
2024-06-18 10:34:04 +08:00
zhenxi-he
cb1bf8c91a
Update ErpPurchaseReturnServiceImpl.java
2024-06-18 09:51:18 +08:00
zhenxi-he
3941e790b6
Update ErpPurchaseInServiceImpl.java
2024-06-18 09:50:14 +08:00
YunaiV
3da2449a15
【修复】SYSTEM:获取菜单精简信息列表接口没有排除父 ID 非 0 的节点
2024-06-18 09:20:49 +08:00
YunaiV
cb73e7feb0
Merge branch 'master-jdk17' of https://github.com/YunaiV/ruoyi-vue-pro into master-jdk17
2024-06-18 09:20:24 +08:00
芋道源码
ae9c5f7048
Merge pull request #561 from dongdongxiang/master_jdk17_fix_menu_v20240615
...
【修复】获取菜单精简信息列表接口没有排除父 ID 非 0 的节点
2024-06-18 09:20:08 +08:00
YunaiV
356291ca02
Merge branch 'master_jdk17_fix_menu_v20240615' of https://github.com/dongdongxiang/ruoyi-vue-pro into master-jdk17
2024-06-18 08:48:55 +08:00
dhb52
27e2996c5d
Merge branch 'master-jdk17' into feature/db
...
# Conflicts:
# sql/tools/README.md
2024-06-17 23:58:36 +08:00
dengyumin
60bdb178a8
fix: Remove duplicate package imports
2024-06-17 23:08:14 +08:00
dongdong.xiang
fbfa1050d2
优化过滤菜单
2024-06-17 22:19:47 +08:00
cherishsince
4c89342d5b
Merge remote-tracking branch 'origin/master-jdk21-ai' into master-jdk21-ai
2024-06-17 21:38:32 +08:00
cherishsince
d332c0b175
【优化】处理 todo 运行异常 action 不能操作问题
2024-06-17 21:38:17 +08:00
cherishsince
70cbab9aeb
【增加】增加 midjourney-proxy 配置
2024-06-17 21:37:49 +08:00
YunaiV
3035fbbbc3
【代码评审】AI:音乐接入
2024-06-17 20:49:49 +08:00
芋道源码
5fabb0b757
!3 接入suno-api
...
Merge pull request !3 from 小新/master-jdk21-ai
2024-06-17 12:08:09 +00:00
YunaiV
a331ed546d
【代码评审】AI:AI 绘图的接入
2024-06-17 20:06:56 +08:00
YunaiV
866b38535e
【代码评审】MALL:review 客服的实现
2024-06-17 19:41:29 +08:00
芋道源码
9c4afeb7ba
!993 MALL-KEFU: 根据代码评审完善相关方法
...
Merge pull request !993 from puhui999/develop
2024-06-17 11:16:01 +00:00
puhui999
cdb20539ea
MALL-KEFU: 完善APP端聊天消息获取
2024-06-17 17:37:09 +08:00
puhui999
285a431616
MALL-KEFU: 根据代码评审完善相关方法
2024-06-17 10:17:46 +08:00
dongdong.xiang
7deaf1cdbf
【修复】获取菜单精简信息列表接口没有排除父 ID 非 0 的节点
2024-06-16 22:45:02 +08:00
dongdong.xiang
1c7ba5c0d6
【修复】获取菜单精简信息列表接口没有排除父 ID 非 0 的节点
2024-06-16 22:41:32 +08:00
dongdong.xiang
6419aef36c
【修复】获取菜单精简信息列表接口没有排除父 ID 非 0 的节点
2024-06-16 21:21:55 +08:00
jason
7af61a0000
优化修复会员签到记录,当天没有签到前一天已签到,连续签到却为0的bug的代码
2024-06-16 13:26:40 +08:00
dongdong.xiang
312f7e4890
【修复】获取菜单精简信息列表接口没有排除父 ID 非 0 的节点
2024-06-15 22:19:07 +08:00
YunaiV
9a9d95f045
模块名称和表名称一样时,代码生成存在问题,如“shop”模块的“shop”表生成代码时shop都被移除了
2024-06-15 18:04:02 +08:00
芋道源码
034cf3fabf
!990 模块名称和表名称一样时,代码生成存在问题,如“shop”模块的“shop”表生成代码时shop都被移除了
...
Merge pull request !990 from 山野羡民/master
2024-06-15 10:03:07 +00:00
YunaiV
088871d083
bugfix: 导入微信地址的时候无法获取areaId(只针对四个直辖市)
2024-06-15 18:00:46 +08:00
芋道源码
d4399c2a31
!988 bugfix: 导入微信地址的时候无法获取areaId(只针对四个直辖市)
...
Merge pull request !988 from SuperHao/N/A
2024-06-15 09:58:59 +00:00
YunaiV
7eaddd16f9
【修复】定时任务指定某一年执行时,只会执行一次,后台查看任务详细会报错
2024-06-15 17:57:13 +08:00
芋道源码
e06fc83519
!987 【修复】定时任务指定某一年执行时,只会执行一次,后台查看任务详细会报错
...
Merge pull request !987 from 高高/N/A
2024-06-15 09:55:58 +00:00
芋道源码
b4a86d14a6
!985 feat: 华为opengauss支持
...
Merge pull request !985 from dhb52/feature/db
2024-06-15 09:52:49 +00:00
YunaiV
f2b7ad5092
【修复】MALL:TradeOrderUpdateService 的单元测试
2024-06-15 17:33:54 +08:00
芋道源码
0f5d6366a9
Merge pull request #525 from DevDengChao/fix/trade-order-update-service-unit-test
...
修复 TradeOrderUpdateService 的单元测试
2024-06-15 17:31:27 +08:00
山野羡民
ff461ea9d6
update CodegenEngine.java.
...
模块名称和表名称一样时,代码生成存在问题,如“shop”模块的“shop”表生成代码时shop都被移除了
Signed-off-by: 山野羡民 <liyujiang_tk@yeah.net >
2024-06-14 06:27:42 +00:00
cherishsince
7c1e949d77
【解决todo】将 LambdaUpdateWrapper 隔离在 mapper,优化toSet toMap 使用 CollectionUtils
2024-06-13 16:03:56 +08:00
cherishsince
aa7c2cb251
【解决todo】使用 MidjourneyApi
2024-06-13 14:46:53 +08:00
cherishsince
4d9dbeaa8d
【增加】MidjourneyApi 自动配置
2024-06-13 14:42:49 +08:00
DevDengChao
30d0b10c99
fix: 修复被禁用的账户可以通过短信验证码再次登录的问题
...
(cherry picked from commit fcfd68ac1c979374d0916ed87995030c465e9428)
2024-06-12 15:23:16 +08:00
cherishsince
7358084198
【优化】重命名 midjourney properties
2024-06-12 13:42:29 +08:00
cherishsince
9ae25aa0b8
【优化】MidjourneyApi enum 增加注释
2024-06-12 11:49:14 +08:00
cherishsince
2f07896651
【优化】MidjourneyApi 保持 spring ai 代码风格,使用 record
2024-06-12 11:47:27 +08:00
cherishsince
937992fd16
【临时提交】增加 MidjourneyApi
2024-06-11 17:36:30 +08:00
cherishsince
1ac1c007ad
【解决todo】修改命名、方法返回、链式调用、显示保存、代码逻辑换货
2024-06-11 15:32:57 +08:00
SuperHao
8a5d39c2a2
update yudao-framework/yudao-spring-boot-starter-biz-ip/src/main/resources/area.csv.
...
bugfix: 导入微信地址的时候无法获取areaId(只针对四个直辖市)
Signed-off-by: SuperHao <jacky.jihao@gmail.com >
2024-06-07 08:40:04 +00:00
xiaoxin
f1292fb7fe
【增加】AI Music支持描述模式、歌词模式生成音乐
2024-06-07 14:51:45 +08:00
DevDengChao
8e2cd77af7
Merge branch 'master-jdk17' into fix/trade-order-update-service-unit-test
2024-06-07 11:03:53 +08:00
DevDengChao
919066dbf0
refactor: 使用 IdUtil.randomUUID 代替 UUID.randomUUID()
2024-06-07 10:49:11 +08:00
DevDengChao
d1c6d741c3
Revert "fix: 修复创建 DeliveryExpressDO 时提示 id 过大的问题"
...
This reverts commit 5632c51527
.
2024-06-07 10:47:28 +08:00
dhb52
ba40c1f699
fix: 改用kingbase8官方驱动,jdbc-url
2024-06-06 23:30:40 +08:00
dhb52
0ae11e0eb8
fix: JdbcUtils.getDbType 使用MyBatis-Plus工具
2024-06-06 23:28:55 +08:00
xiaoxin
085ebfc792
【增加】AI:suno-api 自定义音乐生成接口接入
2024-06-06 20:31:51 +08:00
YunaiV
e781129dbe
【同步】AI:最新 MJ 的 code review
2024-06-06 20:18:18 +08:00
高高
5e0a8b44c4
【修复】定时任务指定某一年执行时,只会执行一次,后台查看任务详细会报错
...
Signed-off-by: 高高 <171376172@qq.com >
2024-06-06 10:01:47 +00:00
dhb52
a5081b94f5
feat: 华为opengauss支持
2024-06-05 23:05:58 +08:00
cherishsince
90f920f55b
【优化】midjourney action 重置 buttons
2024-06-05 17:15:06 +08:00
jason
060bf5ec1e
修复会员签到记录,当天没有签到前一天已签到,连续签到却为0的bug
2024-06-05 15:27:32 +08:00
cherishsince
513ded4f61
【增加】增加 MidjourneyNotifyReqVO.Button 类型转换器
2024-06-05 15:22:47 +08:00
cherishsince
2b3593dfe0
【优化】抽离 midjourneyNotify 需要更新的 image 对象,方便在job中公用
2024-06-05 15:22:10 +08:00
cherishsince
000bcf1143
【增加】MidjourneyProxyClient 增加批量拉去任务信息
2024-06-05 15:21:27 +08:00
cherishsince
f15ecda727
【增加】MidjourneyJob 被动拉去
2024-06-05 15:20:53 +08:00
cherishsince
b0b7a3df09
【增加】增加 MidjourneyProperties 保存 url key 通知 url
2024-06-05 15:20:41 +08:00
cherishsince
8727c4de92
【优化】Midjourney 提交任务 保存 ImageOptions
2024-06-05 10:44:16 +08:00
cherishsince
fb055bfbb1
【优化】Midjourney 实现 Image Options
2024-06-05 10:43:57 +08:00
cherishsince
c0c2305c23
【优化】字段重命名 job id 改为 task id
2024-06-05 10:31:33 +08:00
cherishsince
8d23e1b9d9
【优化】优化注释
2024-06-05 10:28:10 +08:00
cherishsince
776d6e4e1e
【增加】AI Image mj 增加 action 操作
2024-06-05 10:27:31 +08:00
cherishsince
79a094be02
【增加】MidjourneyProxy 增加 action 操作
2024-06-05 10:27:08 +08:00
YunaiV
41ea482f8d
同步 HTTP 请求签名
2024-06-04 21:32:49 +08:00
YunaiV
5b1287ad41
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/logger/ApiAccessLogServiceImpl.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/logger/ApiErrorLogServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/RoleServiceImpl.java
2024-06-04 21:20:26 +08:00
YunaiV
d89a19a92b
【代码评审】商城:客服功能
2024-06-04 20:25:24 +08:00
芋道源码
2347bffeb1
!980 MALL-KEHU: 新增客服相关
...
Merge pull request !980 from puhui999/develop
2024-06-04 11:40:04 +00:00
YunaiV
97e8c35f70
【修复】CRM:CrmBusinessStatusDO 缺少 BaseDO
2024-06-04 19:39:11 +08:00
YunaiV
f091727ad3
【新增】framework:针对大金的适配
2024-06-04 19:32:06 +08:00
YunaiV
69b7adf00f
Merge branch 'feature/db' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17
2024-06-04 19:24:07 +08:00
芋道源码
2395fc8f37
!982 feat: 支持人大金仓数KingbaseES
...
Merge pull request !982 from dhb52/feature/db
2024-06-04 11:23:52 +00:00
YunaiV
e0a6e3988b
【代码优化】framework:优化 HTTP 请求签名的实现
...
1、单测从集成测试,改成单元测试
2、SignatureAspect 调整代码,提升易读性
3、sign 算法调整,使用 querystring + body + header + appsecret 更容易理解
2024-06-04 19:10:48 +08:00
cherishsince
4c20593211
【增加】AI Image 列表兼容 Midjourney 操作按钮
2024-06-04 17:39:59 +08:00
cherishsince
541f6b9e6b
【增加】增加 Midjourney 提交异常提示
2024-06-04 17:39:29 +08:00
cherishsince
cea888b225
【优化】MidjourneyNotifyReqVO action 和 status 接受 改为 string
2024-06-04 17:39:02 +08:00
cherishsince
95d26c9b8d
【优化】调整 Midjourney proxy 提交状态 enum
2024-06-04 17:38:36 +08:00
cherishsince
dbe23cfe8e
【优化】调试 mj proxy 通知回调
2024-06-04 14:50:27 +08:00
YunaiV
1e391d626e
Merge branch 'master-jdk17' of https://github.com/YunaiV/ruoyi-vue-pro into master-jdk17
2024-06-03 21:45:03 +08:00
芋道源码
9eb62fb5a5
Merge pull request #541 from slipper4j/dev-0519-framework-signature
...
【优化】根据给出的建议优化部分代码逻辑、风格
2024-06-03 20:48:32 +08:00
xiaoxin
851c290c0d
【增加】AI:使用suno-api服务接入Suno
2024-06-03 18:20:16 +08:00
cherishsince
3ab218efc6
【优化】删除没用的代码
2024-06-03 10:01:04 +08:00
YunaiV
9152fbfdb7
【同步】AI:最新 AI SQL
2024-06-02 18:44:12 +08:00
YunaiV
b7180d3481
【新增】AI:会话接入 API KEY 逻辑
2024-06-01 15:15:30 +08:00
YunaiV
6856f5f192
【新增】AI:进一步统一 DALL、SD 的绘制实现
2024-06-01 14:16:37 +08:00
YunaiV
0563503102
【新增】AI:使用 DALL 绘图时,使用 b64_json 返回
2024-06-01 11:24:39 +08:00
dhb52
a6bee12fbc
feat: 支持人大金仓数KingbaseES
2024-05-31 22:55:09 +08:00
YunaiV
458f5acdf0
【代码优化】AI:Image 图片的列表、详情等接口
2024-05-31 21:47:48 +08:00
cherishsince
c1f2e49066
【优化】优化 midjourney 注释
2024-05-31 17:06:41 +08:00
cherishsince
56e8707e38
【增加】Midjourney Proxy 回调通知
2024-05-31 17:05:28 +08:00
puhui999
127a98a934
MALL-KEFU: 新增客服相关操作接口
2024-05-31 16:59:06 +08:00
cherishsince
36b6fee0ec
【优化】修改 package
2024-05-31 14:38:15 +08:00
cherishsince
3c6fb95917
【增加】midjourney proxy 枚举 action 和 status
2024-05-31 14:38:04 +08:00
cherishsince
3c7fccfcf3
【增加】midjourney proxy 通知回调 vo
2024-05-31 14:37:47 +08:00
cherishsince
8f3076b2ea
【增加】niji 模型参数设置
2024-05-31 14:36:07 +08:00
cherishsince
47ff5bf814
【增加】midjourney 增加版本号设置
2024-05-31 14:25:03 +08:00
cherishsince
bd9474994f
Merge remote-tracking branch 'origin/master-jdk21-ai' into master-jdk21-ai
2024-05-31 14:06:49 +08:00
cherishsince
27f052de0a
【增加】midjourney 增加 --ar 参数设置
2024-05-31 14:05:16 +08:00
puhui999
0be9c67aa6
MALL-KEFU: 根据代码评审修改相关内容
2024-05-31 09:58:23 +08:00
芋道源码
b20129f7e4
!2 解决todo
...
Merge pull request !2 from 小新/master-jdk21-ai
2024-05-30 11:24:17 +00:00
YunaiV
c53633a286
【代码评审】AI:Suno 音乐的 review
2024-05-30 19:21:12 +08:00
cherishsince
74620ebc34
【sql】提交最新版 image sql
2024-05-30 17:21:22 +08:00
xiaoxin
c0de6cc508
【解决todo】SunoResp、SunoReq改为record简化
2024-05-30 16:56:49 +08:00
cherishsince
a1f738dd81
【增加】增加 midjourney 提交任务
2024-05-30 16:29:28 +08:00
puhui999
020f3a9a12
MALL-KEHU: 新增客服相关实体类
2024-05-30 16:09:36 +08:00
xiaoxin
a858eb84e5
【解决todo】Suno调用改为WebClient
2024-05-30 15:34:36 +08:00
cherishsince
782f108516
Merge remote-tracking branch 'origin/master-jdk21-ai' into master-jdk21-ai
2024-05-30 14:21:23 +08:00
cherishsince
20addff45e
【增加】Midjourney client,增加 imagine 方法
2024-05-30 14:21:13 +08:00
cherishsince
b9d823f0ed
【删除】删除 MidjourneyJob 提供 通知地址
2024-05-30 13:58:19 +08:00
YunaiV
0faba44acf
【代码评审】AI:Suno 音乐的 review
2024-05-30 13:19:33 +08:00
cherishsince
347824c985
【解决todo】image 删除重命名
2024-05-30 11:05:44 +08:00
cherishsince
5d8aedbe9b
【解决todo】image 删除重命名
2024-05-30 10:26:23 +08:00
cherishsince
610badf503
【解决todo】image 删除重命名改为 my delete
2024-05-30 10:23:32 +08:00
cherishsince
0d4b67a9c4
【解决todo】image 删除重命名改为 my delete
2024-05-30 10:23:26 +08:00
cherishsince
bde1eede2a
【解决todo】image delete-my 删除返回 boolean
2024-05-30 10:22:06 +08:00
cherishsince
1c0cf4b860
【解决todo】所有转换都不依赖 convert 采用 BeanUtils
2024-05-30 10:18:55 +08:00
cherishsince
2eade5ad5b
【解决todo】修改异常提示 image 不存在!
2024-05-30 10:17:14 +08:00
cherishsince
c808453c1d
【优化】image 返回的size 改为 width 和 height
2024-05-30 10:16:40 +08:00
cherishsince
26616ea7a7
【解决todo】将 login user 通过 controller 传入
2024-05-30 10:15:02 +08:00
cherishsince
8b1e1c047b
【解决todo】 处理 dall 异步调用,采用 @Async
2024-05-30 10:14:34 +08:00
cherishsince
92ee665996
【增加】AI Image 常量
2024-05-30 10:14:00 +08:00
cherishsince
aea4f465ee
【增加】Ai Image 增加 PublicStatus 枚举
2024-05-30 10:12:25 +08:00
芋道源码
599a114a0f
!1 【新增】AI:suno
...
Merge pull request !1 from 小新/master-jdk21-ai
2024-05-30 01:35:57 +00:00
YunaiV
342f603964
【代码评审】AI:AI 绘图的逻辑
2024-05-30 09:35:23 +08:00
xiaoxin
e582aaad2e
【新增】AI:suno音乐生成接口
2024-05-29 15:17:15 +08:00
cherishsince
e4a0512b51
【优化】AI Image 分页列表、get-my 返回 resp 结构
2024-05-29 10:53:37 +08:00
cherishsince
f347b15a1e
【解决todo】删除 mj 相关字段,抽离到 drawRequest 和 drwaResponse
2024-05-29 10:32:00 +08:00
cherishsince
ed372cffc7
【解决todo】修改 ai image status
2024-05-29 10:30:40 +08:00
cherishsince
1d53823982
【增加】ai image 删除,增加权限判断
2024-05-29 10:30:22 +08:00
cherishsince
54b60cd564
【解决todo】修改 image controller 命名
2024-05-29 10:29:32 +08:00
cherishsince
1b725fd517
【优化】调整 AI Image 增肌 draw rquest 和 response
2024-05-29 10:19:22 +08:00
YunaiV
c7ee3dc2cd
【代码评审】AI:AI 绘图的逻辑
2024-05-29 08:34:40 +08:00
YunaiV
4932ce60d2
【代码评审】AI:AI 绘图的逻辑
2024-05-28 22:09:35 +08:00
cherishsince
cfeb4bdca4
【添加】midjourney job(同步 mj 结果) 未实现
2024-05-28 17:59:33 +08:00
zhougang
5f278ac23b
【新增】优化部分代码风格
2024-05-28 15:09:01 +08:00
cherishsince
7268f002d8
【优化】dall保存
2024-05-28 14:47:56 +08:00
cherishsince
9878abb03c
【增加】获取单个 image 接口
2024-05-28 14:05:44 +08:00
cherishsince
e97408b3ac
【优化】dall 绘画,改为异步。
2024-05-28 11:39:29 +08:00
cherishsince
63a8cc244d
【修改】AI Image dall 请求返回结构优化
2024-05-27 18:16:44 +08:00
puhui999
ae493e66df
MALL-TRADE:新增 BrokerageUserService#getOrCreateBrokerageUser 获得或创建分销用户方法,解决父级推广人不存在的问题
2024-05-27 16:24:07 +08:00
puhui999
ea7f923072
SYSTEM:完善微信小程序码
2024-05-27 16:18:52 +08:00
xiaoxin
447526a6d9
【新增】AI:suno
2024-05-27 15:44:55 +08:00
cherishsince
0cdd3423e5
【优化】AI Image 调整字段
2024-05-27 15:26:44 +08:00
YunaiV
3025bff631
【代码评审】SYSTEM:完善微信小程序码
2024-05-26 09:47:41 +08:00
芋道源码
2d44b3a245
!979 MEMBER: 根据【代码评审】完善微信小程序码。 修复获得个人分销统计 NPE 异常
...
Merge pull request !979 from puhui999/develop
2024-05-26 01:38:06 +00:00
puhui999
b073c1d37f
fix: 修复获得个人分销统计 NPE 异常
2024-05-25 22:06:55 +08:00
芋道源码
66ff7938ed
!977 修改文案描述错误
...
Merge pull request !977 from 高高/N/A
2024-05-25 12:36:00 +00:00
芋道源码
aced20bd0d
Merge pull request #534 from orchidblessing/master-jdk17
...
fix:上传文件测试时pg数据库字段与FileContentDO类型不一致报错修复
2024-05-25 19:51:09 +08:00
cherishsince
3afb3089b5
【处理】GoogleGemir 先注释代码,不然跑不起来
2024-05-25 14:29:06 +08:00
cherishsince
1fa84e6a4d
Merge remote-tracking branch 'origin/master-jdk21-ai' into master-jdk21-ai
2024-05-25 14:28:52 +08:00
cherishsince
d695219534
【处理】GoogleGemir 先注释代码,不然跑不起来
2024-05-25 14:28:43 +08:00
YunaiV
22e12366e8
【优化】AI:AI 相关 SQL
2024-05-25 13:38:39 +08:00
YunaiV
ca4ee3be1f
【优化】AI:AI 相关 SQL
2024-05-25 13:31:07 +08:00
YunaiV
1710320114
【优化】AI:对话的头像交给前端拼接
2024-05-25 11:51:05 +08:00
YunaiV
12b82b72e3
【新增】AI:对话管理 100%
2024-05-25 09:00:04 +08:00
YunaiV
2d11f085c8
【新增】AI:对话管理 50%
2024-05-25 00:08:27 +08:00
YunaiV
4fddec5f02
【优化】AI:调整 image 相关的包结构
2024-05-24 20:56:21 +08:00
cherishsince
17afb14c88
【注释google gami】
2024-05-24 16:39:47 +08:00
cherishsince
5a711d988d
Merge remote-tracking branch 'origin/master-jdk21-ai' into master-jdk21-ai
2024-05-24 16:10:31 +08:00
cherishsince
546b522c48
【添加todo】google gemini 初始化问题
2024-05-24 16:10:23 +08:00
YunaiV
48c3210f5f
【新增】AI:新建对话时,不使用默认角色
2024-05-24 15:38:56 +08:00
cherishsince
10ca7a93ac
【增加】增加 google gemini
2024-05-24 15:06:36 +08:00
cherishsince
5618313d65
【优化】处理 build xing huo key size 判断问题
2024-05-24 15:05:00 +08:00
cherishsince
8f0c5998aa
【解决todo】Chat Stream 处理失败的逻辑
2024-05-24 14:49:05 +08:00
cherishsince
f0e4e535f4
【优化】处理 AI stream 返回,改为 map
2024-05-24 14:27:08 +08:00
cherishsince
e39513c6b2
【优化】处理 QianWen topP 为空情况
2024-05-24 14:25:00 +08:00
puhui999
b227b039c9
MEMBER: 根据【代码评审】完善微信小程序码
2024-05-23 17:14:35 +08:00
YunaiV
a482876113
【优化】AI:聊天消息的 Service 实现
2024-05-22 13:12:54 +08:00
YunaiV
3b02bcf4f8
【新增】AI:通过 AiClientFactory 提供 chatclient
2024-05-22 12:39:55 +08:00
YunaiV
fd0e0de164
Merge remote-tracking branch 'origin/master-jdk21-ai' into master-jdk21-ai
...
# Conflicts:
# yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/impl/AiChatServiceImpl.java
2024-05-22 12:39:18 +08:00
YunaiV
2fefcf8834
【新增】AI:通过 AiClientFactory 提供 chatclient
2024-05-22 12:37:21 +08:00
cherishsince
2a01f6b9fc
【增加】AI Chat stream 增加头像返回
2024-05-22 10:58:29 +08:00
cherishsince
ccd7928a6b
【增加】增加用户头像返回
2024-05-22 10:53:25 +08:00
cherishsince
cad1ce4852
【增加】AI message 增加用户头像、role头像
2024-05-22 10:30:37 +08:00
cherishsince
747b2ebce5
【增加】AI Chat 增加清空消息
2024-05-22 09:57:20 +08:00
cherishsince
12d3c0a9af
【优化】AI 角色分类,处理 role 空情况
2024-05-21 22:46:59 +08:00
YunaiV
99b6f24092
【修复】AI:解决 spring-ai 与 webflux 集成时,SSE 存在乱序的问题
2024-05-21 19:55:29 +08:00
cherishsince
041a00b27f
【解决todo】如果默认选择了 role ,则使用 role 作为 title
2024-05-21 17:18:33 +08:00
cherishsince
19bd0c66ff
【解决todo】AI chat 返回的 message 类型不正确
2024-05-21 12:11:07 +08:00
cherishsince
3633c7415b
【解决todo】ai 对话改为升序
2024-05-21 10:59:28 +08:00
cherishsince
983742fd74
【补充】补充pom依赖
2024-05-21 09:35:05 +08:00
YunaiV
802dee2fc3
【新增】AI:发送消息时,增加上下文
2024-05-21 08:30:51 +08:00
cherishsince
3a10fedddb
【todo】百度文言一心,解决 todo,删除 doOnComplete、增加 retryTemplate
2024-05-20 13:44:50 +08:00
cherishsince
e0d8ac74a4
【优化】处理 mj jdk21降到jdk17语法
2024-05-20 13:43:21 +08:00
高高
6a6c30c375
修改文案描述错误
...
修改文案描述错误
Signed-off-by: 高高 <171376172@qq.com >
2024-05-20 01:43:30 +00:00
orchidblessing
9cc6528eba
fix:上传文件测试时pg数据库字段类型不一致报错
...
错误详情:Caused by: org.postgresql.util.PSQLException: ERROR: column "id" is of type bigint but expression is of type character varying
2024-05-19 18:05:38 +08:00
zhougang
5bc0190194
【优化】 格式化
2024-05-19 15:39:22 +08:00
zhougang
8e5584821e
【新增】 protection 模块新增 signature 实现 API 签名
2024-05-19 15:34:45 +08:00
YunaiV
423f6cc9da
【修复】全局:@PermitAll 未处理 RequestMappingInfo.getPatternsCondition 的问题
2024-05-18 21:02:26 +08:00
YunaiV
f3dbcf46bb
【代码评审】INFRA:优化记录 infra_api_access_log 方法,截取参数最长 8000 字符
2024-05-18 20:47:10 +08:00
芋道源码
6380a81f1c
!976 优化记录infra_api_access_log方法,截取参数最长8000字符
...
Merge pull request !976 from 高高/N/A
2024-05-18 12:44:46 +00:00
YunaiV
33e8c7ca2e
【代码评审】MEMBER:完善微信小程序码
2024-05-18 20:42:48 +08:00
芋道源码
668b97e4ed
!975 完善微信小程序码
...
Merge pull request !975 from puhui999/develop
2024-05-18 12:34:41 +00:00
YunaiV
4466eb1bcd
【修复】SYSTEM:id 获取不到用户引发的 NPE 异常
2024-05-18 20:28:27 +08:00
芋道源码
c18509944f
!974 获取不到用户引发的NPE异常
...
Merge pull request !974 from g_l/N/A
2024-05-18 12:27:24 +00:00
YunaiV
fa9328112d
【新增】AI:openai 接入的配置调整
2024-05-18 12:28:43 +08:00
YunaiV
f4a0058e88
【代码评审】AI:qwen 的接入调整
2024-05-18 10:36:25 +08:00
YunaiV
645dfae003
【代码评审】AI:讯飞星火的接入调整
2024-05-18 10:15:40 +08:00
YunaiV
04021ce068
【代码评审】AI:文心一言的接入调整
2024-05-18 09:34:17 +08:00
YunaiV
276ef98ff1
【新增】AI:conversation 发送消息时,增加上下文
2024-05-18 00:16:56 +08:00
YunaiV
275d1fb627
【优化】AI:简化 AiChatMessageDO 消息表,去除 tokens、temperature、maxTokens、maxContexts 字段,因为 spring-ai 没有返回 tokens 相关的字段
2024-05-17 22:25:50 +08:00
YunaiV
9de9e938bf
【新增】AI:增加 ollama 模型的接入
2024-05-17 22:16:57 +08:00
高高
9ef669141f
优化记录infra_api_access_log方法,截取参数最长8000字符
...
Signed-off-by: 高高 <171376172@qq.com >
2024-05-17 03:08:09 +00:00
YunaiV
7fca38ce1e
【重构】AI:替换 spring-ai 实现
2024-05-16 22:42:39 +08:00
puhui999
380ec11221
完善微信小程序码
2024-05-16 16:57:43 +08:00
cherishsince
fe63bda4c7
【增加】清空 Chat 对话
2024-05-16 12:10:03 +08:00
cherishsince
e7a3f47d02
【增加】AI 对话增加更新时间
2024-05-16 11:28:53 +08:00
g_l
4091253693
获取不到用户引发的NPE异常
...
Signed-off-by: g_l <glwxx0719@163.com >
2024-05-16 02:33:01 +00:00
cherishsince
e6fefa06b7
【优化】AI 角色分类处理用户角色,为空情况
2024-05-15 23:14:11 +08:00
YunaiV
b31e919d52
【新增】AI:流式发送消息的微调,统一成单接口
2024-05-15 23:06:18 +08:00
YunaiV
20657ccaf3
【新增】AI:聊天对话的更新模型
2024-05-15 21:20:18 +08:00
YunaiV
c5aab1aebd
Merge remote-tracking branch 'origin/master-jdk21-ai' into master-jdk21-ai
2024-05-15 19:44:45 +08:00
YunaiV
d0c7b2333a
【新增】AI:聊天对话的更新模型
2024-05-15 19:44:39 +08:00
cherishsince
314a015a2e
【优化】角色分类列表 group
2024-05-15 18:16:50 +08:00
DevDengChao
9c111acfbe
fix: 修复 TradeOrderUpdateServiceTest
2024-05-15 13:44:57 +08:00
DevDengChao
c68f32cefe
chore: 备注团长翻译问题
2024-05-15 13:44:39 +08:00
DevDengChao
5632c51527
fix: 修复创建 DeliveryExpressDO 时提示 id 过大的问题
2024-05-15 13:44:18 +08:00
YunaiV
78bb2d1dc8
【新增】AI:聊天对话的更新标题
2024-05-15 08:59:18 +08:00
YunaiV
69fa98792c
【新增】AI:聊天对话的新建(80%)
2024-05-14 23:46:29 +08:00
puhui999
52b972907a
member: 增加用户编号返回,分享海报有用
2024-05-14 23:29:47 +08:00
puhui999
4c05bd340e
fix: 获得微信小程序码(base64 image)
2024-05-14 23:28:44 +08:00
cherishsince
1fa799f6a9
Merge remote-tracking branch 'origin/master-jdk21-ai' into master-jdk21-ai
2024-05-14 17:41:18 +08:00
cherishsince
85b47e4925
【优化】修改模型配置
2024-05-14 17:40:54 +08:00
YunaiV
64142965f3
【新增】AI:聊天对话的新建(50%)
2024-05-14 13:24:55 +08:00
YunaiV
7344ec8aea
【新增】AI:聊天角色管理(100%)
2024-05-13 22:55:01 +08:00
YunaiV
31453e19d4
【新增】AI:聊天角色管理(80%)
2024-05-13 21:47:58 +08:00
YunaiV
1676f671d8
【新增】AI:聊天角色管理(50%)
2024-05-13 20:46:37 +08:00
YunaiV
6bc1f8d0f9
【修复】AI:临时解决 send-stream 被权限拦截 Access Denied 问题
2024-05-13 13:12:33 +08:00
YunaiV
37952c6a10
【优化】AI:调整 ai starter 的包封装
2024-05-12 19:53:45 +08:00
YunaiV
56caa3d598
【优化】AI:调整 ai starter 的包封装
2024-05-12 19:43:41 +08:00
YunaiV
eb8cd3d736
Merge branch 'master-jdk21-ai' of https://gitee.com/cherishsince/ruoyi-vue-pro into master-jdk21-ai
...
# Conflicts:
# yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/dal/mysql/AiChatModelMapper.java
# yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiChatModelService.java
# yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiChatModelServiceImpl.java
2024-05-12 19:10:33 +08:00
cherishsince
5a4162cdc1
【优化】优化 chat event stream 模式交互,增加 add message 优先记录
2024-05-12 19:04:58 +08:00
cherishsince
aaf1599f7a
Merge remote-tracking branch 'origin/master-jdk21-ai' into master-jdk21-ai
...
# Conflicts:
# yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/dal/mysql/AiChatModelMapper.java
# yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/AiChatModelService.java
# yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/impl/AiChatModalServiceImpl.java
2024-05-12 14:23:25 +08:00
cherishsince
79bd78998d
【增加】增加模型头像
2024-05-12 14:20:24 +08:00
YunaiV
d46097a658
【修复】SYSTEM:更新角色时,记录修改内容
2024-05-12 10:08:23 +08:00
YunaiV
d78b6d8b58
【修复】ERP:业务类型枚举中的销售出库
2024-05-11 23:52:54 +08:00
YunaiV
0ba98742be
【优化】SYSTEM:短信验证码前置补零对其endCode长度
2024-05-11 23:51:27 +08:00
YunaiV
4a0ad205ae
【代码评审】CRM:优化员工业绩统计的实现
2024-05-11 22:30:37 +08:00
YunaiV
95a8aa9ba9
Merge branch 'develop' of https://gitee.com/scholarli/ruoyi-vue-pro_1 into develop
...
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsPerformanceServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/resources/mapper/statistics/CrmStatisticsPerformanceMapper.xml
2024-05-11 22:07:43 +08:00
YunaiV
e1a5302b25
【修复】商城:秒杀时间段配置的 URL simple-list
不正确的问题
2024-05-11 22:05:41 +08:00
YunaiV
0641f793a3
【代码评审】全局:微信小程序码
2024-05-11 21:51:59 +08:00
芋道源码
8e64de0ab2
!972 feat:新增获取小程序码相关接口
...
Merge pull request !972 from puhui999/develop
2024-05-11 13:27:30 +00:00
芋道源码
4a0f1463ef
!968 fix: pg,mssql dual表需要一条数据
...
Merge pull request !968 from dhb52/master-jdk17
2024-05-11 13:21:27 +00:00
芋道源码
64aab9ea1b
Merge pull request #518 from JJBoy1995/fix-jdk17
...
【修复】商城首页销售额查询错误
2024-05-11 21:11:25 +08:00
芋道源码
30941e3f3e
Merge pull request #509 from DevDengChao/fix/unspecified-sex
...
修复性别未知时的枚举值与 member_user.sex 默认值不一致的问题
2024-05-11 21:09:07 +08:00
YunaiV
9fbaada1be
【新增】AI:API 模型管理(完善)
2024-05-11 19:46:49 +08:00
puhui999
73ef9211f9
feat:新增获取小程序码相关接口
2024-05-11 17:55:36 +08:00
scholar
99ab07de69
完成todo xml部分
2024-05-11 11:35:27 +08:00
YunaiV
ba1333bdef
Merge remote-tracking branch 'origin/master-jdk21-ai' into master-jdk21-ai
2024-05-10 22:48:58 +08:00
YunaiV
b9deba889c
【新增】AI:API 模型管理
2024-05-10 22:48:49 +08:00
dhb52
0288309e3b
fix: sqlserver DROP TABLE 使用GO替代分号
2024-05-10 22:12:26 +08:00
dhb52
9d102a1b72
style: mysql/quartz.sql 字段小写,格式化
2024-05-10 21:51:48 +08:00
cherishsince
c1e2ba9ed4
【todo】mj更新信息 增加 todo
2024-05-10 17:26:10 +08:00
cherishsince
8e7fc1ff96
【优化】数据库增加 mjNonce 更新,生成好、或异常的图片信息
2024-05-10 15:29:11 +08:00
DevDengChao
3da7885514
fix: 删除 SexEnum.UNSPECIFIED, 并将 UNKNOWN 的值同步为数据库中 member_user.sex 字段的默认值 0
2024-05-10 09:29:43 +08:00
YunaiV
caca47b6d7
【新增】AI:API 密钥管理
2024-05-09 23:03:10 +08:00
JJBoy
eac9d91a7f
【修复】商城首页销售额查询错误
2024-05-09 20:25:58 +08:00
cherishsince
04cb9bad5b
【修复】修复 imagine 版本过期,不能提交任务问题。
2024-05-09 16:40:28 +08:00
cherishsince
2734e54b0c
【测试】mj生成图片
2024-05-08 18:12:30 +08:00
cherishsince
84a3cd3a75
【优化】处理 nonce id 必须是一个长整型id问题
2024-05-08 18:12:12 +08:00
cherishsince
b058090a77
【更新】更新sql脚本
2024-05-08 18:11:18 +08:00
cherishsince
38a9c1a7ee
【增加】mj图片处理成功消息,增加component操作,处理error信息保存
2024-05-08 15:58:03 +08:00
cherishsince
b6096b76d2
【增加】ai image 生成记录删除
2024-05-08 15:10:57 +08:00
cherishsince
e8cf40a82a
【增加】1、mj components 相关操作任务提交 2、增加ai image 列表查询
2024-05-08 15:07:49 +08:00
YunaiV
16a47bde5b
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21-ai
...
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-server/src/main/resources/application-local.yaml
2024-05-08 09:12:25 +08:00
dhb52
7d9e6f2184
fix: pg,mssql dual表需要一条数据
2024-05-08 00:28:11 +08:00
YunaiV
52c86cd290
【优化】CRM:员工业绩统计的实现
2024-05-07 23:08:38 +08:00
YunaiV
d0d1d6d208
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
2024-05-07 22:48:39 +08:00
YunaiV
408378f5ab
Merge branch 'develop' of https://gitee.com/scholarli/ruoyi-vue-pro_1 into develop
...
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsPerformanceServiceImpl.java
2024-05-07 22:32:12 +08:00
芋道源码
a8aead3049
Merge pull request #510 from DevDengChao/fix/member-sex-type
...
修复 MemberUserBaseVO.sex 与 SexEnum.value 不一致的问题
2024-05-07 22:23:41 +08:00
cherishsince
1a7446b914
【定义】定义 midjourney 相关功能操作api
2024-05-07 18:17:17 +08:00
cherishsince
6e3f34b0db
【优化】重新适配 dall2和dall3
2024-05-07 18:00:30 +08:00
cherishsince
5579620140
【优化】聊天 event stream 改为 flex 返回更加的优雅
2024-05-07 17:22:23 +08:00
cherishsince
708d66e8cf
【测试】chat 聊天(send、send-stream)
2024-05-07 16:47:25 +08:00
cherishsince
bd3e65898b
【测试】AI对话
2024-05-07 16:22:58 +08:00
cherishsince
9ad977bdb9
【调整】message 修改引入的modal改为model
2024-05-07 15:39:13 +08:00
cherishsince
fd6ce5a627
【优化】修改http 请求地址和请求内容
2024-05-07 15:38:47 +08:00
cherishsince
b091498040
【优化】优化AI 角色列表返回信息 和 修改模型id类型
2024-05-07 15:38:01 +08:00
cherishsince
3e91032eaf
【调整】AI 对话引入的 modal 修改为 model
2024-05-07 15:25:34 +08:00
cherishsince
a0e06cc0b7
【调整】调整modal list 返回信息,和update req
2024-05-07 15:24:18 +08:00
DevDengChao
546821d949
fix: 修复 MemberUserBaseVO.sex 与 SexEnum.value 不一致的问题
2024-05-07 15:09:15 +08:00
DevDengChao
0c99c16989
feat: 新增性别未定义时的枚举
2024-05-07 15:00:13 +08:00
cherishsince
46b5f17bbc
【调整】modal 修改为 model
2024-05-07 14:43:07 +08:00
cherishsince
893d394a0a
【调整】重命名为 AiModelEnum 合并成一个 ai枚举
2024-05-07 12:06:55 +08:00
cherishsince
794d4c3195
【调整】合并 AI 模型到一个 enums里面
2024-05-07 12:06:20 +08:00
cherishsince
fb82dd2ffd
【调整】删除没用的 enum
2024-05-07 11:59:17 +08:00
cherishsince
4ccaad7921
【调整】删除 package-info 占位
2024-05-07 11:50:39 +08:00
cherishsince
f438e68dc9
【调整】重命名 role req 和res,增加vo
2024-05-07 11:49:49 +08:00
cherishsince
53f4ad43d8
【调整】重命名 modal req 和res,增加vo
2024-05-07 11:49:15 +08:00
cherishsince
929f3597fd
【调整】调整Ai model
2024-05-07 11:47:58 +08:00
cherishsince
f0a1666e84
【调整】调整AI角色模块
2024-05-07 11:34:20 +08:00
cherishsince
c124681c3a
【增加】查询对话 message 列表
2024-05-07 11:01:20 +08:00
cherishsince
7fae5c0a7d
【优化】删除没用的 chat message service
2024-05-07 11:00:49 +08:00
cherishsince
8de98a15bb
【调整】调整AI聊天,message列表、删除message
2024-05-07 10:54:56 +08:00
cherishsince
424210066f
【调整】调整AI聊天模块
2024-05-07 10:45:37 +08:00
cherishsince
f86e24bb86
【调整】调整AI对话模块
2024-05-07 10:04:49 +08:00
zhijiantianya@gmail.com
f9854273cc
【代码评审】AI:调整 model 接口
2024-05-06 22:34:49 +08:00
zhijiantianya@gmail.com
aea7cc000b
【代码评审】AI:调整 message 接口
2024-05-06 22:28:56 +08:00
zhijiantianya@gmail.com
2df0babc36
【代码评审】AI:调整 conversation 接口
2024-05-06 21:47:29 +08:00
zhijiantianya@gmail.com
e9cbee9d7e
【代码评审】AI:调整表结构
2024-05-06 19:17:05 +08:00
cherishsince
c0470dcabb
【调整】根据api设计调整部分字段,和业务逻辑
2024-05-06 18:21:17 +08:00
cherishsince
2b7e7763bf
【调整】根据api调整ai角色,删除对modal关联 和 modal topK 相关设置。简单改为只是一个角色的预设
2024-05-06 17:11:30 +08:00
cherishsince
3d7c994bf9
【调整】ai模型,增加sort排序
2024-05-06 16:38:33 +08:00
cherishsince
c21b5f7679
【调整】根据接口设计调整,ai model
2024-05-06 16:32:47 +08:00
cherishsince
118158424b
【优化】考虑到前端传入的json配置不确定,先不转化config
2024-05-06 15:55:43 +08:00
cherishsince
0c0ac0b02a
【优化】调整 open ai image 枚举
2024-05-06 11:38:20 +08:00
scholar
3afd2cba0c
完成todo部分,优化环比同比数据的计算。
2024-05-04 22:24:23 +08:00
YunaiV
8428cc5b99
【发版】全局:2.1.0 发版
2024-05-04 09:44:20 +08:00
YunaiV
cec5c287f9
【同步】JDK17 和 JDK8 的代码
2024-05-04 09:42:16 +08:00
YunaiV
9f63e1e294
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# pom.xml
# yudao-dependencies/pom.xml
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/statistics/vo/portrait/CrmStatisticsPortraitReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsPerformanceServiceImpl.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/db/DatabaseTableServiceImpl.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/job/JobServiceImpl.java
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/service/JmReportTokenServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java
2024-05-04 09:39:07 +08:00
YunaiV
c52ec92b05
【发版】全局:2.1.0 发版
2024-05-04 09:38:21 +08:00
YunaiV
ebd5ba02d2
【优化】CRM:增加对 JDK8 的兼容性,使用 ListUtil 替代 List of
2024-05-04 09:36:15 +08:00
芋道源码
b2da43f4c3
!965 同步 DB 转换
...
Merge pull request !965 from 芋道源码/feature/db
2024-05-04 01:21:06 +00:00
YunaiV
3eaa6287a0
【优化】全局:完善数据库转化的 README.md,清理 quartz 脚本里的无用数据
2024-05-04 09:19:32 +08:00
YunaiV
213a6aa0fc
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/db
...
# Conflicts:
# yudao-server/src/main/resources/application-local.yaml
2024-05-04 09:15:58 +08:00
芋道源码
a70463b961
!964 feat: 达梦DM8
...
Merge pull request !964 from dhb52/feature/db
2024-05-04 00:57:27 +00:00
dhb52
c24fb20311
feat: 测试数据库docker容器的销毁重建说明
2024-05-04 00:20:23 +08:00
dhb52
65651fb1ed
feat: 创建虚拟dual表,达梦脚本优化
2024-05-04 00:05:42 +08:00
dhb52
774082509b
feat: 达梦DM8
2024-05-03 23:22:53 +08:00
YunaiV
93e8e9c7af
【优化】全局:JobController 增加 sync 接口,实现将 infra_job 同步到 Quartz 中
2024-05-03 22:37:15 +08:00
YunaiV
ffac294fbd
【优化】全局:兼容 MyBatis Plus 针对 SQL Server 的 saveBatch 不兼容的兼容
2024-05-03 22:11:22 +08:00
YunaiV
df08a2ecf0
【优化】新增 quartz.sql,完善 README.md
2024-05-03 11:28:04 +08:00
芋道源码
b4a867b89c
!963 feat: 脚本兼容Python 3.9, 抽取更多公共代码; 更新使用文档
...
Merge pull request !963 from dhb52/feature/db
2024-05-03 03:08:58 +00:00
YunaiV
290a981cae
【修复】全局:移除 Druid 广告逻辑未按照期望执行
2024-05-03 10:38:05 +08:00
YunaiV
f381568f6b
【修复】CRM:商机添加商品时,businessProducts 参数错误,应该是 products
2024-05-03 10:35:58 +08:00
YunaiV
022238758c
【完善】适配 jimu 报表的安全配置
2024-05-03 10:12:40 +08:00
YunaiV
ee3e507f07
【优化】GlobalExceptionHandler 新增 IGNORE_ERROR_MESSAGES,用于忽略“无效的刷新令牌”等非关键提示
2024-05-03 09:55:04 +08:00
YunaiV
88ac5be882
【修复】ApiAccessLogInterceptor 处理 request body 为 "" 空串的情况
2024-05-03 09:37:49 +08:00
YunaiV
29746d1459
【修复】MySQL jdbc 连接 5.7 示例不正确
2024-05-03 09:04:47 +08:00
dhb52
6d19690bea
feat: 脚本兼容Python 3.9, 抽取更多公共代码; 更新使用文档
2024-05-02 23:38:56 +08:00
YunaiV
d98419b03f
【完善】增加 sql-tools 的 README.md 文档,方便大家使用
2024-05-02 18:47:42 +08:00
YunaiV
877a12c832
Merge remote-tracking branch 'origin/feature/db' into feature/db
2024-05-02 18:16:22 +08:00
YunaiV
6ba73e60f0
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/db
2024-05-02 18:16:11 +08:00
芋道源码
e08a103cbc
!962 feat: 添加自动转换py脚本
...
Merge pull request !962 from dhb52/feature/db
2024-05-02 10:05:03 +00:00
YunaiV
b0b8067629
【修复】代码生成:处理 SQLServer 数据库获取不到数据表结构注释
2024-05-02 18:03:34 +08:00
dhb52
1d4bb4d563
feat: 添加自动转换py脚本
2024-05-02 17:42:07 +08:00
芋道源码
9163ede8de
!961 wip: SQLServer数据库更新, 代码生成注释乱码
...
Merge pull request !961 from dhb52/feature/db
2024-05-02 07:42:05 +00:00
dhb52
fd8889e76a
wip: SQLServer数据库更新, 代码生成注释乱码
2024-05-02 15:30:33 +08:00
YunaiV
b7554e935c
【修复】商城系统:优惠活动中的限时活动,添加活动报错系统异常
2024-05-02 14:57:53 +08:00
芋道源码
5aca12e689
!960 fix: Postgres/Oracle部分字段注释缺失
...
Merge pull request !960 from dhb52/feature/db
2024-05-02 03:08:36 +00:00
YunaiV
3f7e99c938
【修复】商城系统:管理后台的商城订单统计数据有问题
2024-05-02 09:25:03 +08:00
YunaiV
f9a50116bc
【修复】商城系统:管理后台修改待支付订单,调整价格取值错误
2024-05-02 09:13:31 +08:00
dhb52
977a250f1a
fix: Postgres/Oracle部分字段注释缺失
2024-05-02 00:34:25 +08:00
dhb52
7e47d2efbb
feat: 将数据库工具迁移至sql/tools目录
2024-05-01 23:49:09 +08:00
YunaiV
dae4e64a64
【修复】商城系统:管理后台发放优惠劵时,只能发送未修改过有效期类型的优惠券
2024-05-01 23:36:44 +08:00
YunaiV
bbfff1bae3
【修复】商城系统:店铺装修时,商品列表组件返回的商品信息,按照选择的顺序返回
2024-05-01 19:09:12 +08:00
YunaiV
ab00986a1d
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17
2024-05-01 08:37:56 +08:00
YunaiV
6f68834249
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/db
2024-05-01 08:34:33 +08:00
YunaiV
c6eed9a636
【修复】Oracle 自带系统表,影响代码生成
2024-05-01 08:17:23 +08:00
YunaiV
c0722b3a19
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/db
...
# Conflicts:
# sql/mysql/ruoyi-vue-pro.sql
2024-05-01 08:05:18 +08:00
芋道源码
97fa3cbb80
!959 ✨ Oracle数据库DDL更新适配
...
Merge pull request !959 from dhb52/feature/db
2024-04-30 22:29:06 +00:00
YunaiV
02e0f5d034
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# pom.xml
2024-05-01 01:22:06 +08:00
YunaiV
1c9b5ddae9
【优化】降低 JDK 21 最低到 17 版本
2024-05-01 01:21:34 +08:00
YunaiV
4de1ee7d2f
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2024-05-01 00:27:53 +08:00
YunaiV
b380b5b8a3
【优化】README,将版本说明提前
2024-05-01 00:26:28 +08:00
YunaiV
14c1b58fb8
【优化】README,将版本说明提前
2024-05-01 00:24:05 +08:00
YunaiV
39c9a6883f
【优化】README,将版本说明提前
2024-05-01 00:21:52 +08:00
dhb52
06dacb747b
feat: Oracle数据 DDL 适配
2024-04-30 23:41:25 +08:00
YunaiV
0520f572e8
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-example/yudao-sso-demo-by-code/pom.xml
# yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/controller/AuthController.java
# yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/controller/UserController.java
# yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/config/SecurityConfiguration.java
# yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/filter/TokenAuthenticationFilter.java
# yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/handler/AccessDeniedHandlerImpl.java
# yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/handler/AuthenticationEntryPointImpl.java
# yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/util/SecurityUtils.java
# yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/util/ServletUtils.java
# yudao-example/yudao-sso-demo-by-password/pom.xml
# yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/controller/AuthController.java
# yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/controller/UserController.java
# yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/config/SecurityConfiguration.java
# yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/filter/TokenAuthenticationFilter.java
# yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/handler/AccessDeniedHandlerImpl.java
# yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/handler/AuthenticationEntryPointImpl.java
# yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/util/SecurityUtils.java
# yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/core/util/ServletUtils.java
2024-04-30 22:50:07 +08:00
YunaiV
16b8f3ba94
【移除】移除 yudao-example 项目,统一到 https://gitee.com/yudaocode/yudao-demo
2024-04-30 22:49:19 +08:00
芋道源码
56de8b0135
!958 ✨ 测试数据库docker-compose, postgres DDL更新
...
Merge pull request !958 from dhb52/feature/db
2024-04-30 05:01:17 +00:00
YunaiV
1d00261c77
【优化】demo 功能,使用 yudao 作为表前缀,避免影响理解
2024-04-30 10:00:22 +08:00
dhb52
f700f0de74
fix: system_user_seq => system_users_seq
2024-04-30 01:25:51 +08:00
dhb52
4f3aaa124c
feat: 测试数据库docker-compose, postgres DDL初稿
2024-04-29 23:41:33 +08:00
dhb52
94377b5009
fix: 删除两个MySQL的两个没用的,甚至是错的UINQUE KEY定义
2024-04-29 23:18:19 +08:00
cherishsince
1fde659099
【添加】 您的工作队列已满。请先等待作业完成,然后重新提交此作业。 json 信息
2024-04-29 22:25:59 +08:00
cherishsince
6b3020c04a
【优化】测试添加nonce兼容
2024-04-29 22:11:55 +08:00
cherishsince
b3bc2d7a5f
【优化】增加不能解析的content
2024-04-29 22:11:31 +08:00
cherishsince
03b4460eae
【增加】对接 Midjourney,增加nonce传递,更新Midjourney image 状态
2024-04-29 22:10:12 +08:00
cherishsince
ae934e84e8
【添加】等待、进行中 状态,记录mj的进度
2024-04-29 22:09:02 +08:00
cherishsince
60f66c59cb
【增加】mj Cancel Job按钮的消息体
2024-04-29 22:08:23 +08:00
cherishsince
d2c7dafdc9
【增加】Midjourney 增加md文件对消息体进行说明
2024-04-29 22:02:38 +08:00
cherishsince
27d6ba1e7f
【增加】手机mj异常信息,到后期统一处理。
2024-04-29 21:07:56 +08:00
YunaiV
ff891d1a14
Merge branch 'master-jdk21' of https://github.com/YunaiV/ruoyi-vue-pro into master-jdk21
2024-04-29 20:54:44 +08:00
芋道源码
f4364a4f7e
Merge pull request #487 from DevDengChao/fix/typo
...
修复错误拼写的注释
2024-04-29 20:54:27 +08:00
YunaiV
ba7d9c046f
Merge branch 'master-jdk21' of https://github.com/YunaiV/ruoyi-vue-pro into master-jdk21
2024-04-29 20:52:32 +08:00
芋道源码
38cf944ba5
Merge pull request #496 from DevDengChao/fix/sms-template-type-description
...
修复短信模板中关于 type 字段的描述
2024-04-29 20:51:26 +08:00
cherishsince
cf3c145867
【增加】提价 midjourney 配置
2024-04-29 14:54:11 +08:00
cherishsince
3cc3695ec0
【测试】测试 midjourney 提交绘画
2024-04-29 14:53:31 +08:00
cherishsince
01552d30a6
【优化】mj 测试增加 WssNotify
2024-04-29 14:53:00 +08:00
cherishsince
59a289f18e
处理todo
2024-04-29 14:52:42 +08:00
cherishsince
f5387d9d5a
【添加】YuDaoMidjourneyMessageHandler 处理Midjourney 业务
2024-04-29 14:52:21 +08:00
cherishsince
e43f7cbbcd
【增强】WebSocketStarter 增加 WssNotify 回调
2024-04-29 14:51:48 +08:00
cherishsince
8bf5480bbf
【增强】MidjourneyWebSocket token无效会认证失败,增加 wss 通知回调,给业务方法处理
2024-04-29 14:51:05 +08:00
cherishsince
ab0a49a1a7
【优化】Midjourney 自动配置,增加 messageHanlder
2024-04-29 14:50:13 +08:00
cherishsince
80787d1dcc
【优化】MidjourneyMessageListener 增加 message handler 回调,用于处理业务数据
2024-04-29 14:49:09 +08:00
cherishsince
6bd1d943eb
【创建】增加 midjourney imagine 操作失败! 异常
2024-04-29 14:48:20 +08:00
cherishsince
0d8ce9373a
【创建】Midjourney req 和 res
2024-04-29 14:47:59 +08:00
cherishsince
0581f5a7a5
【添加】增加任务提交状态
2024-04-29 14:47:18 +08:00
cherishsince
330fd52b3e
【添加】midjourney 增加 imagine 接口
2024-04-29 14:46:57 +08:00
cherishsince
24479dacfd
【更新】更新mj生成图片流程
2024-04-29 14:11:03 +08:00
cherishsince
a5023cda1d
【增加】mj敏感词返回信息,有时间处理
2024-04-29 13:52:49 +08:00
cherishsince
f0fa0e210c
【增加】mj 封号返回的json,后期有时间处理
2024-04-29 12:16:54 +08:00
cherishsince
d14c13b2fc
【增加】midjourney 自动配置。
2024-04-29 10:59:26 +08:00
YunaiV
4d45e3ace9
【增强】一键改包:支持 site、org 等包
2024-04-29 00:18:39 +08:00
YunaiV
853db724ec
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoSecurityAutoConfiguration.java
# yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java
2024-04-29 00:14:06 +08:00
YunaiV
cd5e6319d9
【增强】一键改包:支持 site、org 等包
2024-04-29 00:13:04 +08:00
YunaiV
c1df35d305
【修复】商城:取消订单,返回优惠劵时,状态校验不正确的问题
2024-04-28 20:06:42 +08:00
cherishsince
198dae62c0
【优化】处理 CommonResult Void 情况
2024-04-28 17:41:49 +08:00
cherishsince
99d477ac0a
【增加】图片绘画增加 绘画失败状态,并保存绘画错误信息,同时可以将错误信息返回给前端
2024-04-28 17:26:31 +08:00
cherishsince
0311c77e7b
【优化】处理 openAi image 返回错误信息
2024-04-28 17:25:47 +08:00
cherishsince
ad46eb57a5
【增加】增加open ai dall_e_2 配置
2024-04-28 16:40:42 +08:00
cherishsince
c6a029ff8d
【优化】测试 open ai image
2024-04-28 16:38:59 +08:00
cherishsince
401a83b7a9
【优化】增加 login.http
2024-04-28 16:38:42 +08:00
cherishsince
9ff36e5167
【优化】open ai image 测试
2024-04-28 16:38:23 +08:00
cherishsince
067fc58147
【优化】解决调用openai image 生成,user不能为空情况,固定设置UID 客户端
2024-04-28 16:37:27 +08:00
cherishsince
2cbb6ac8d5
【优化】修复imageSize不生效问题,增加modal、style、size 适配
2024-04-28 16:36:35 +08:00
cherishsince
330696fb90
【增加】autoconfig自动配置 增加 style 适配。
2024-04-28 16:34:55 +08:00
cherishsince
7467c241f3
【增加】aiImage 增加 dall-e-2、dall-e-3
2024-04-28 16:33:45 +08:00
cherishsince
844ae285e1
【增加】openai image 增加 style 生成风格
2024-04-28 16:29:59 +08:00
DevDengChao
e133c28da5
修复短信回执外部文档的链接
2024-04-28 14:57:46 +08:00
cherishsince
307e08435d
【优化】调整imageSize
2024-04-28 14:38:25 +08:00
cherishsince
7d3ed1fef3
【新增】增加open ai image 模型类型
2024-04-28 14:38:07 +08:00
cherishsince
ca0024988c
【优化】模型enum统一交 model
2024-04-28 14:37:31 +08:00
DevDengChao
af597f2329
补充短信渠道与短信模板的启用状态示例值
2024-04-28 14:23:02 +08:00
DevDengChao
fc0a1f669d
fix: 修复短信模板中关于 type 字段的描述
2024-04-28 13:48:45 +08:00
芋道源码
e0652831a6
!957 fix: CRM 管理员数据权限 bug
...
Merge pull request !957 from puhui999/develop
2024-04-28 04:49:11 +00:00
cherishsince
a34d925973
【更新】sql文件
2024-04-28 11:51:22 +08:00
cherishsince
d37c1c4ecc
【优化】配置文件统一增加 max-tokens配置 和 topP topK 配置
2024-04-27 18:31:31 +08:00
cherishsince
10a94c3ef2
【优化】处理百度 system 角色定制失效问题。
2024-04-27 18:29:58 +08:00
cherishsince
c811f3a4c2
【优化】抽离 maxTokens 作为公共参数
2024-04-27 17:23:52 +08:00
cherishsince
e4bb7262c3
【优化】星火兼容 ChatOptions 配置
2024-04-27 17:23:15 +08:00
cherishsince
eef9ed1b3e
【优化】自动配置优化,星火、一言 增加 topK topP maxToken Temperature 参数转换
2024-04-27 17:22:40 +08:00
cherishsince
8b2dcaf910
【优化】讯飞星火兼容 system、assistant、user
2024-04-27 16:59:15 +08:00
cherishsince
63c5f90596
【优化】兼容阿里云千问开源模型,和付费模型
2024-04-27 16:51:41 +08:00
cherishsince
2ef64a0a50
【优化】自动配置,适配新的千问
2024-04-26 18:24:57 +08:00
cherishsince
be8d9c1a5f
【通义千问】重新对接阿里云通义前文。
2024-04-26 18:05:14 +08:00
cherishsince
64b6b45bc6
【优化】千问大模型定义,
2024-04-26 13:42:50 +08:00
puhui999
9a2eb2d02c
Merge remote-tracking branch 'refs/remotes/yudao/develop' into develop
2024-04-25 23:16:52 +08:00
puhui999
0808bdaa41
fix: CRM 管理员数据权限 bug
2024-04-25 23:16:34 +08:00
cherishsince
2adb5accc4
【优化】ai chat client自动配置和初始化。
2024-04-25 18:05:08 +08:00
cherishsince
44f7c841de
【修改】增加 dall2\dall3 绘画方法,还未实现
2024-04-25 16:56:54 +08:00
cherishsince
edb2a844cc
【优化】优化 yudao client 代码格式
2024-04-25 16:32:19 +08:00
cherishsince
4a6b4e5f65
【优化】优化 chat 初始化
2024-04-25 16:31:02 +08:00
cherishsince
4db96fa361
【新增】初始化 ai 绘画,需要的类
2024-04-25 16:17:33 +08:00
cherishsince
71e3240af6
【优化】代码优化,统一增加ai前缀
2024-04-25 15:48:48 +08:00
cherishsince
5cec6d52e0
【优化】modal 增加config 可能考虑数据库来初始化 ai modal
2024-04-25 15:42:30 +08:00
cherishsince
1673081b7d
【优化】modal 中的 config 没有什么作用
2024-04-25 15:38:08 +08:00
DevDengChao
bc6775d64b
修复错误拼写的注释
...
"Redisson 自动高配置类" 改为 "Redisson 自动配置类"
2024-04-25 15:35:44 +08:00
cherishsince
f85c89a405
modal 增加删除
2024-04-25 15:15:33 +08:00
cherishsince
faade05528
【优化】ai modal 注释
2024-04-25 15:00:42 +08:00
YunaiV
53db8309e9
【修复】CRM 分类删除时,判断商品数量是否为空不正确的问题,导致无法删除分类
2024-04-24 21:08:53 +08:00
YunaiV
ab43f0ac2a
【修复】部分菜单,确实 menu.sql 配置的权限标识
2024-04-24 20:59:39 +08:00
YunaiV
4ede173b27
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/followup/CrmFollowUpRecordController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/permission/CrmPermissionController.java
2024-04-24 20:55:30 +08:00
cherishsince
d6a8ec6bd2
优化:modal 默认查询的都是未禁用的modal
2024-04-24 20:26:12 +08:00
cherishsince
e4eadd8c99
增加 modal 更新
2024-04-24 20:25:46 +08:00
cherishsince
77f3226d27
增加 ai modal 添加模型
2024-04-24 20:20:51 +08:00
YunaiV
6f42da1b77
【修复】部分菜单,确实 menu.sql 配置的权限标识
2024-04-24 20:11:11 +08:00
cherishsince
2fde9b124d
增加ai modal(查询列表)
2024-04-24 20:07:58 +08:00
cherishsince
9e412ffec8
测试,role删除
2024-04-24 19:38:58 +08:00
cherishsince
cec8cc7a2b
优化:chat角色 - 修改可见性
2024-04-24 19:38:19 +08:00
cherishsince
a0b3bd32b0
测试 role,列表和添加
2024-04-24 19:34:57 +08:00
cherishsince
3556e460e7
测试 chat message(list 和 delete)
2024-04-24 19:04:16 +08:00
cherishsince
6b8174a5a6
增加message list 查询
2024-04-24 18:57:15 +08:00
cherishsince
64fdd045a5
增加 chat message 删除
2024-04-24 17:50:11 +08:00
cherishsince
1f5878ed5b
调整controller swagger 注释
2024-04-24 17:24:55 +08:00
cherishsince
7aef30cbe8
增加 chat role 删除
2024-04-24 17:20:13 +08:00
cherishsince
591002f059
增加chat role 可见性修改
2024-04-24 17:19:34 +08:00
cherishsince
c44f558e3d
角色增加 更新
2024-04-24 17:16:19 +08:00
cherishsince
4cc87539d8
chat角色增加 add 方法
2024-04-24 17:09:24 +08:00
cherishsince
410893bc29
chat角色增加,角色列表
2024-04-24 16:48:14 +08:00
cherishsince
c75e415b61
enum 增加 valueOfType
2024-04-24 16:47:32 +08:00
cherishsince
e4dc715458
增加可见范围 enum
2024-04-24 16:45:58 +08:00
cherishsince
c5dd1d50e7
增加chat role 分类
2024-04-24 16:44:08 +08:00
cherishsince
d8c2d0d66a
增加 chat角色 source enum
2024-04-24 16:40:26 +08:00
YunaiV
9ae7001095
【修复】mall:配送模版更新时,diff 比较的 id 不正确,导致未完全使用增量更新
2024-04-24 13:06:34 +08:00
YunaiV
da5425da2f
【修复】pay:PayWalletServiceImpl 可能存在的循环依赖问题
...
【修复】system:dev 配置文件,缺少 WECHAT_MINI_APP 配置项~
2024-04-24 12:53:30 +08:00
YunaiV
5380e21001
【修复】bpm:流程提交时,variables 为 null 会导致 NPE 问题
2024-04-24 12:40:03 +08:00
YunaiV
eb1ca934b7
【修复】角色管理页面-查询未按照排序字段排序的问题
2024-04-24 12:16:03 +08:00
YunaiV
34dc26bae6
【优化】新增 sslEnable 字段,支持 outlook 邮箱
2024-04-24 09:44:16 +08:00
YunaiV
72b5dd82b6
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImpl.java
2024-04-24 09:40:29 +08:00
YunaiV
b382ae4f85
【修复】角色管理页面-查询未按照排序字段排序的问题
2024-04-24 09:38:05 +08:00
YunaiV
fb237fa22e
【完善】代码生成对 DM 达梦数据的兼容性
2024-04-24 09:35:17 +08:00
芋道源码
85471e5a49
!956 update AccessLogCleanJob.java
...
Merge pull request !956 from 高高/N/A
2024-04-24 01:17:18 +00:00
YunaiV
0649c315d1
【优化】新增 sslEnable 字段,支持 outlook 邮箱
2024-04-24 09:14:51 +08:00
YunaiV
9ab53ee263
crm:code review 员工业绩统计
2024-04-23 23:12:36 +08:00
芋道源码
af610c621f
!952 CRM员工业绩统计完善及bug修复
...
Merge pull request !952 from scholarli/develop
2024-04-23 14:51:12 +00:00
YunaiV
d2061ecdc2
【修复】解决视频地址在移动端播放的兼容性问题
2024-04-23 22:40:52 +08:00
YunaiV
af621cb03f
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/servlet/ServletUtils.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/CodegenController.java
2024-04-23 22:38:17 +08:00
cherishsince
1ab1538afe
增加创建role对话
2024-04-23 16:29:26 +08:00
高高
c553a7b5a0
update AccessLogCleanJob.java
...
将返回文案中的“错误日志”修改为“访问日志”
Signed-off-by: 高高 <171376172@qq.com >
2024-04-23 07:07:21 +00:00
YunaiV
7f0485e872
【修复】解决视频地址在移动端播放的兼容性问题
2024-04-23 09:41:10 +08:00
YunaiV
fd832e23fd
bugfix:非 json 请求(文件上传)时,token 过期时,错误读取 request body 问题
2024-04-22 23:31:50 +08:00
YunaiV
5d935d0ffd
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-module-system/yudao-module-system-biz/src/test-integration/java/cn/iocoder/yudao/module/system/job/SchedulerManagerTest.java
# yudao-module-system/yudao-module-system-biz/src/test-integration/java/cn/iocoder/yudao/module/system/mq/RedisStreamTest.java
# yudao-module-system/yudao-module-system-biz/src/test-integration/java/cn/iocoder/yudao/module/system/service/sms/SmsServiceIntegrationTest.java
# yudao-module-system/yudao-module-system-biz/src/test-integration/resources/application-integration-test.yaml
2024-04-22 21:00:21 +08:00
YunaiV
075157417c
清理代码:无用的 test-integration 目录,暂时不考虑集成测试
2024-04-22 21:00:02 +08:00
YunaiV
a27c040a8f
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/errorcode/config/ErrorCodeProperties.java
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/errorcode/ErrorCodeApi.java
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/errorcode/dto/ErrorCodeAutoGenerateReqDTO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/errorcode/ErrorCodeApiImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/sensitiveword/SensitiveWordApiImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/ErrorCodeController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/vo/ErrorCodeRespVO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/vo/ErrorCodeSaveReqVO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/SensitiveWordController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/vo/SensitiveWordSaveVO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/errorcode/ErrorCodeService.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/errorcode/ErrorCodeServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sensitiveword/SensitiveWordService.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sensitiveword/SensitiveWordServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/errorcode/ErrorCodeServiceTest.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sensitiveword/SensitiveWordServiceImplTest.java
2024-04-22 19:56:17 +08:00
YunaiV
9a31613e5b
【移除】敏感词的管理,简化项目的复杂度
2024-04-22 19:53:01 +08:00
YunaiV
8093ef3b96
【移除】错误码的管理,简化项目的复杂度
2024-04-22 19:42:45 +08:00
YunaiV
e859b76231
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/DatabaseDocController.java
2024-04-22 19:14:27 +08:00
YunaiV
ff5276998c
【移除】数据库文档,简化项目的复杂度
2024-04-22 19:14:10 +08:00
YunaiV
248e0b5e46
Merge remote-tracking branch 'origin/master'
2024-04-22 19:08:31 +08:00
YunaiV
24dacacf15
优化:将 hutool-all 6.0 版本替换成 hutool-extra,减少依赖
2024-04-22 19:08:25 +08:00
YunaiV
6c3f88bacd
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/job/JobServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImplTest.java
2024-04-22 19:02:13 +08:00
YunaiV
5d58037d05
优化:将 hutool-all 6.0 版本替换成 hutool-extra,减少依赖
2024-04-22 19:01:25 +08:00
cherishsince
dc44fe1cf9
临时提交
2024-04-20 17:53:41 +08:00
cherishsince
83d17051be
调整 controller url
2024-04-20 17:51:03 +08:00
cherishsince
5d6a3ff0b4
service 移动dataobject 引用
2024-04-20 17:50:56 +08:00
cherishsince
01031bcdf6
移动dataobject 引用
2024-04-20 17:50:23 +08:00
cherishsince
8b84e24f96
dataobject 移动到 dal 里面
2024-04-20 17:49:58 +08:00
scholar
9e6474a123
1,优化mapper.xml的sql语句;
...
2,对于无销售数据的月份,插入销售结果为0的数据;
2024-04-19 17:09:12 +08:00
cherishsince
de8b80699e
修改 http 请求
2024-04-19 06:18:24 +08:00
YunaiV
1274f92544
优化 job 调度:
...
1. 新增或修改 job 配置时,校验 handlerName 对应的 Spring Bean 存在
2. 删除 job 时,额外暂停 Trigger、取消调度,更完善
2024-04-18 22:19:26 +08:00
cherishsince
27bfb0d25d
关闭租户
2024-04-18 17:37:28 +08:00
cherishsince
1a08be9a27
删除没用的 import
2024-04-18 17:32:30 +08:00
cherishsince
97c12d1932
conversation 充满 title 和 count
2024-04-18 17:31:58 +08:00
cherishsince
b68117c846
删除对话 create res
2024-04-18 17:31:05 +08:00
cherishsince
2e4dca2d6f
删除 chat old对话逻辑
2024-04-18 17:10:44 +08:00
cherishsince
25523fd53e
调整 chat 和 steamChat 获取对话逻辑
2024-04-18 17:10:08 +08:00
cherishsince
97d4e56c81
对话不存在时,thow异常
2024-04-18 17:09:27 +08:00
cherishsince
2ce5c805de
增加 chat对话不存在errorCode
2024-04-18 17:09:00 +08:00
cherishsince
a33ea4aa82
删除 对话类型
2024-04-18 17:08:45 +08:00
cherishsince
e8f4dd7905
添加对话 res 返回信息
2024-04-18 17:00:45 +08:00
cherishsince
66d0208920
1、增加获取最新的对话
...
2、增加获取top100的对话
2024-04-18 16:59:46 +08:00
cherishsince
00c2ca8b48
增加chat 对话,列表、创建、单个、删除
2024-04-18 16:59:15 +08:00
cherishsince
f84d25d3b7
stream 保存聊天记录
2024-04-18 16:09:45 +08:00
芋道源码
488c46073b
!947 fix: selectCustomerDealCycleGroupByProductId使用LEFT JOIN替换子查询
...
Merge pull request !947 from dhb52/develop
2024-04-18 01:22:41 +00:00
YunaiV
b20ff55511
code review:销售统计
2024-04-18 09:19:07 +08:00
芋道源码
cc82e471ea
!949 CRM: 新增商机赢单转化率分析
...
Merge pull request !949 from puhui999/develop
2024-04-18 01:13:18 +00:00
YunaiV
222afd48af
修改 rabbitmq 序列化方式,使用 Jackson2JsonMessageConverter 替代
2024-04-17 21:29:04 +08:00
YunaiV
98743db480
解决 rocketmq 在 spring boot 3.x 的兼容性
2024-04-17 21:29:04 +08:00
YunaiV
b5af357dfc
同步最新的 bugfix
2024-04-17 21:29:04 +08:00
cherishsince
905ce773e9
优化swagger 注释
2024-04-16 20:39:52 +08:00
YunaiV
1d239c9877
修改 rabbitmq 序列化方式,使用 Jackson2JsonMessageConverter 替代
2024-04-16 09:17:11 +08:00
puhui999
bb25f0712b
Merge remote-tracking branch 'refs/remotes/yudao/develop' into develop
2024-04-15 16:40:51 +08:00
puhui999
c573585e75
CRM: 新增商机赢单转化率分析
2024-04-15 16:40:36 +08:00
puhui999
5cf34c2ba7
CRM: 完善销售漏斗
2024-04-15 15:26:05 +08:00
YunaiV
bf70707719
解决 rocketmq 在 spring boot 3.x 的兼容性
2024-04-15 12:34:06 +08:00
YunaiV
2a40678ff8
同步最新的 bugfix
2024-04-14 22:09:11 +08:00
芋道源码
1f93ac25b6
!933 修正 swagger 文档错误
...
Merge pull request !933 from moon69/master
2024-04-14 14:03:57 +00:00
芋道源码
7f8d3b31d8
!939 updateCommentVisible 应该用前端传入的显示值
...
Merge pull request !939 from 云扬四海/fix_comment_bug
2024-04-14 13:58:26 +00:00
芋道源码
ddf25d24a9
!945 bugfix:修复获取登录用户的权限信息接口在没有授权角色时,没有菜单列表导致报错的问题
...
Merge pull request !945 from a472159403/bug_getMenuList
2024-04-14 13:57:30 +00:00
dhb52
488f99b512
fix: selectCustomerDealCycleGroupByProductId使用LEFT JOIN替换子查询
2024-04-14 21:55:45 +08:00
芋道源码
002e5a4b25
!938 修复创建跟进记录bug
...
Merge pull request !938 from dftba_effy/master
2024-04-14 13:55:26 +00:00
YunaiV
ed5f3a6bc2
crm:code review 销售漏斗
2024-04-14 21:22:02 +08:00
芋道源码
0eff2ae602
!946 CRM: 完善销售漏斗分析
...
Merge pull request !946 from puhui999/develop
2024-04-14 12:23:49 +00:00
YunaiV
5159da30b4
crm:code review 员工客户分析
2024-04-14 20:13:31 +08:00
cherishsince
efab5517d7
修改 chat 请求
2024-04-14 18:41:21 +08:00
cherishsince
b925c2c7cc
spring-web 改为 start security
2024-04-14 18:41:03 +08:00
cherishsince
7794992225
聊天对话,增加 创建对话、还是继续对话逻辑
2024-04-14 18:40:42 +08:00
cherishsince
a2bd9b710e
增加 对话异常、role异常
2024-04-14 18:39:30 +08:00
cherishsince
be0c81458d
增加对话类型,new还是继续
2024-04-14 18:38:06 +08:00
芋道源码
0d1e2c604d
!944 feat: 客户成交周期分析(按区域、按产品)
...
Merge pull request !944 from dhb52/develop
2024-04-14 10:31:21 +00:00
cherishsince
bff0ad65dc
增加do后缀
2024-04-14 17:39:30 +08:00
cherishsince
7c8ec404db
优化,增加模型版本号
2024-04-14 17:31:54 +08:00
cherishsince
15b76c1d1a
优化注释
2024-04-14 17:24:43 +08:00
cherishsince
ef701167b7
1、增加 chat service
...
2、可动态传入 modal,选择模型
2024-04-14 17:24:02 +08:00
puhui999
20b4bfd1b0
CRM: 完善新增商机分析
2024-04-14 16:31:53 +08:00
cherishsince
7024c5ab60
增加 client name 枚举
2024-04-14 16:05:29 +08:00
cherishsince
009914ed73
增加 swagger 注释
2024-04-14 15:55:08 +08:00
cherishsince
a3530555ca
1、增加 chat 和 chatStream
2024-04-14 15:52:35 +08:00
cherishsince
4b5910f972
增加 Utf8SseEmitter 处理 中文乱码问题
2024-04-14 15:51:57 +08:00
cherishsince
8b310c1dce
添加 chat http
2024-04-14 13:40:54 +08:00
cherishsince
73f334e2b4
增加注释
2024-04-14 13:40:42 +08:00
cherishsince
330faf7b97
删除没用的package
2024-04-14 13:40:14 +08:00
cherishsince
239bc21f02
调整 chat role 目录
2024-04-14 13:39:37 +08:00
cherishsince
97df2755f9
增加yudao ai client
2024-04-14 13:39:09 +08:00
cherishsince
652a8f9633
调整 chat role 目录
2024-04-14 13:38:31 +08:00
cherishsince
3c371dd4db
移动目录
2024-04-14 13:37:16 +08:00
puhui999
fc3cdc4499
Merge remote-tracking branch 'refs/remotes/yudao/develop' into develop
2024-04-14 13:12:05 +08:00
cherishsince
98319f68c3
1、增加openapi 依赖、mybatis依赖
2024-04-14 09:38:29 +08:00
lihaiyang
85cd07aa87
bugfix:修复获取登录用户的权限信息接口在没有授权角色时,没有菜单列表导致报错的问题
2024-04-13 23:30:34 +08:00
puhui999
6c9a3b0e11
CRM: 完善销售漏斗分析
2024-04-13 23:30:11 +08:00
cherishsince
ac0de5d485
优化自动注入,可以创建多个 client
2024-04-13 18:23:50 +08:00
cherishsince
02ac6f30cf
yiyan api移动到api目录
2024-04-13 18:23:50 +08:00
cherishsince
1875a49ba3
重命名 modal
2024-04-13 18:23:50 +08:00
cherishsince
17f7970259
增加自动配置
2024-04-13 18:23:50 +08:00
cherishsince
ec6ad9da74
api移动到api目录
2024-04-13 18:23:50 +08:00
cherishsince
733c416500
增加 yudao ai boot starter 依赖
2024-04-13 18:23:49 +08:00
dhb52
67b02c7e5b
feat: 客户成交周期分析(按区域、按产品)
2024-04-12 22:15:24 +08:00
YunaiV
8e86706d50
同步 develop 最新代码
2024-04-12 20:31:33 +08:00
YunaiV
b44eab7f93
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessTransferReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/vo/CrmContactTransferReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractTransferReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerTransferReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/permission/CrmPermissionController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/permission/CrmPermissionServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivablePlanServiceImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppCartAddReqVO.java
2024-04-12 19:18:30 +08:00
YunaiV
62c6c4b9bd
同步 develop 最新代码
2024-04-12 19:17:49 +08:00
YunaiV
9cba258d8f
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21
2024-04-12 19:14:56 +08:00
芋道源码
2038e5204a
!943 回退 'Pull Request !937 : feat: 客户成交周期分析(按区域、按产品)'
...
Merge pull request !943 from 芋道源码/revert-merge-937-develop
2024-04-12 11:13:59 +00:00
芋道源码
48aef10d2d
回退 'Pull Request !937 : feat: 客户成交周期分析(按区域、按产品)'
2024-04-12 11:13:11 +00:00
芋道源码
decdfb2aa7
!937 feat: 客户成交周期分析(按区域、按产品)
...
Merge pull request !937 from dhb52/develop
2024-04-12 11:11:30 +00:00
YunaiV
048c6ed7b9
移除 resilience4j 组件
2024-04-11 22:53:05 +08:00
YunaiV
1904f8ca88
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2024-04-11 22:52:53 +08:00
YunaiV
1e348dbf83
【优化】将项目的 annotations 统一修改成 annotation 包
2024-04-11 22:52:34 +08:00
YunaiV
ceaf192bf2
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# README.md
2024-04-11 22:45:07 +08:00
YunaiV
cc50891632
【新增】RateLimiter 限流器,支持全局、用户、IP 等级别的限流
2024-04-11 22:43:37 +08:00
cherishsince
d60cfcd54b
移动 package - info
2024-04-11 21:52:32 +08:00
cherishsince
687eef95b6
定义chat role 接口
2024-04-11 21:52:14 +08:00
cherishsince
1ea94d9245
注释 chat controller,现在没用了,需要修改
2024-04-11 21:51:54 +08:00
cherishsince
238ef89826
定义 message 和 role mapper文件
2024-04-11 21:51:30 +08:00
cherishsince
d494c31302
添加 chat.sql(只作为参考)
2024-04-11 21:51:09 +08:00
cherishsince
c273da8934
添加 chat.sql(只作为参考)
2024-04-11 21:50:44 +08:00
cherishsince
632b21991d
添加 chat role DO
2024-04-11 21:50:25 +08:00
cherishsince
4267686d7b
添加 message DO
2024-04-11 21:50:14 +08:00
cherishsince
e1d3e90565
job message
2024-04-11 20:44:47 +08:00
cherishsince
c29430e754
Merge branch 'master-jdk21-ai' of https://gitee.com/cherishsince/ruoyi-vue-pro into master-jdk21-ai
2024-04-11 20:42:23 +08:00
YunaiV
51999be6b0
移除 resilience4j 组件
2024-04-10 21:01:15 +08:00
YunaiV
cc9b2e86b6
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java
2024-04-10 20:58:35 +08:00
YunaiV
2e03dcba69
移除 resilience4j 组件
2024-04-10 20:57:44 +08:00
YunaiV
3dbb714d12
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2024-04-10 20:40:47 +08:00
YunaiV
38db5fe008
【新增】新增 UserIdempotentKeyResolver 解析器,支持用户级别的幂等
2024-04-10 20:13:31 +08:00
cherishsince
c8a2c8369f
修改测试名称
2024-04-10 20:02:50 +08:00
cherishsince
9476a05949
优化名称,请求增加 req res 后缀,移动到api目录
2024-04-10 20:02:33 +08:00
cherishsince
03f124a82b
1、请求公共部分抽离
...
2、修改为api和spring ai结构保持一致
2024-04-10 20:02:06 +08:00
cherishsince
0e277b71e1
删除 spring-ai-bom 依赖
2024-04-10 20:01:05 +08:00
cherishsince
a9e0bc51e9
删除没用的 jsonUtils
2024-04-10 19:42:42 +08:00
cherishsince
8f2ce2faae
修改mj message type 类型
2024-04-10 19:42:29 +08:00
YunaiV
3bbbf8db11
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2024-04-10 13:03:46 +08:00
YunaiV
321f71de73
重构 LocalDateTimeDeserializer 和 LocalDateTimeSerializer 的命名,可读性更好
2024-04-10 13:03:20 +08:00
cherishsince
32bc632947
处理todo
2024-04-09 20:12:41 +08:00
yunlongn
325c03dfd4
updateCommentVisible 应该用前端传入的显示值
2024-04-09 16:35:41 +08:00
lijiahuan
0624bfcaf5
修复新建跟进记录bug
2024-04-09 11:57:26 +08:00
YunaiV
337ae04551
AI:code review chat 部分的代码(mj)
2024-04-09 09:31:56 +08:00
YunaiV
a44628e436
AI:code review chat 部分的代码(qianwen)
2024-04-09 00:10:36 +08:00
dhb52
d9407ab40a
feat: 客户成交周期分析(按区域、按产品)
2024-04-09 00:07:42 +08:00
dhb52
286e24ad6c
Merge remote-tracking branch 'origin/develop' into develop
2024-04-08 22:33:39 +08:00
cherishsince
7d0f5fdb7b
Merge branch 'master-jdk21-ai' of https://gitee.com/cherishsince/ruoyi-vue-pro into master-jdk21-ai
2024-04-08 20:01:25 +08:00
cherishsince
29dc77fc0d
调整目录
2024-04-08 14:36:26 +08:00
cherishsince
dabe491cde
增加 describe 请求模板
2024-04-08 14:34:40 +08:00
cherishsince
316d2db484
增加mj生成描述信息
2024-04-08 14:34:24 +08:00
cherishsince
56c802c01e
提交pom 文件
2024-04-08 09:36:57 +08:00
YunaiV
c4ce9068f9
crm:code review 公海客户分析
2024-04-07 21:27:40 +08:00
YunaiV
ee40b53016
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
2024-04-07 21:18:46 +08:00
芋道源码
60ac63416a
!934 增加公海客户分析(mapper模拟数据)
...
Merge pull request !934 from dhb52/develop
2024-04-07 12:39:38 +00:00
cherishsince
ed1841e69c
删除没用的类
2024-04-07 20:24:35 +08:00
YunaiV
81100929dd
【优化】支持登陆用户,直接读取昵称、部门等信息,也支持自定义字段
2024-04-07 19:47:54 +08:00
YunaiV
159de065ff
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2TokenServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2TokenServiceImplTest.java
2024-04-07 19:40:07 +08:00
YunaiV
909d3309d2
【优化】支持登陆用户,直接读取昵称、部门等信息,也支持自定义字段
2024-04-07 19:39:32 +08:00
cherishsince
3fe04ac98e
抽离 常用key到 mj constants 里面
2024-04-07 09:43:05 +08:00
cherishsince
defe628026
优化请求 header 中 Referer 规则
2024-04-07 09:35:58 +08:00
cherishsince
2c21f71327
增加 parseContent 备注
2024-04-07 09:29:27 +08:00
cherishsince
3364b8bfc5
修改package
2024-04-06 22:03:51 +08:00
cherishsince
8b980d1e11
增加 reRoll,图片选择、图片放大
2024-04-06 22:02:08 +08:00
cherishsince
21b6e9f996
重命名测试包
2024-04-06 22:00:56 +08:00
cherishsince
0c42d6175e
增加mjutil 测试
2024-04-06 21:59:57 +08:00
cherishsince
b1158fb1a7
增加图片选择,和图片放大相关操作
2024-04-06 21:53:22 +08:00
cherishsince
f2b9c14819
增加mj 图片生成消息转换
2024-04-06 21:20:10 +08:00
cherishsince
b09fc5579c
处理表情符号,content解析问题
2024-04-06 21:04:53 +08:00
cherishsince
b38c94847e
增加contentparse 工具类
2024-04-06 20:32:08 +08:00
YunaiV
6fa3ea8514
bugfix:YudaoOperateLogV2Configuration 重命名为 YudaoOperateLogConfiguration
2024-04-06 17:55:33 +08:00
dhb52
84140c52b0
fix: LocalDateTimeUtils.getDateRangeList计算季度区间有误
2024-04-06 15:14:20 +08:00
dhb52
44c22e1ef5
wip: 增加公海客户分析(mapper模拟数据)
2024-04-06 14:49:37 +08:00
dhb52
d2f48eb259
Merge remote-tracking branch 'origin/develop' into develop
2024-04-06 14:45:36 +08:00
dhb52
dfe11eb4c0
fix: [CRM-客户统计]增加times[]时间范围校验
2024-04-06 14:44:03 +08:00
dhb52
1121c21c8b
fix: [CRM-客户统计]按客户创建时间筛选,关联合同是否有成交记录,有则视为[成交客户]
2024-04-06 14:44:03 +08:00
moon69
fee600ef1b
修正 swagger 文档错误
2024-04-06 13:01:19 +08:00
YunaiV
d5d5c3cbeb
bugfix:Spring Cache 自定义过期时间,在多租户场景下,会额外拼接 # 的问题
2024-04-06 11:27:00 +08:00
jason
32809c3edb
仿钉钉流程设计-仿钉钉快搭模型 JSON数据的保存
2024-04-05 22:49:34 +08:00
dhb52
3ca453c0da
fix: [CRM-客户统计]增加times[]时间范围校验
2024-04-05 15:59:11 +08:00
dhb52
e18d26d8a6
fix: [CRM-客户统计]按客户创建时间筛选,关联合同是否有成交记录,有则视为[成交客户]
2024-04-05 14:59:00 +08:00
YunaiV
05af77b786
crm:code review 客户画像
2024-04-05 14:44:00 +08:00
芋道源码
9ea43ce55a
!932 CRM: 完善用户画像数据统计
...
Merge pull request !932 from puhui999/develop
2024-04-05 05:55:15 +00:00
YunaiV
9b9f54bb03
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
...
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java
2024-04-05 13:32:17 +08:00
芋道源码
5666121daf
!931 fix: 按Code-Review修改CrmStatisticsCustomerMapper.xml
...
Merge pull request !931 from dhb52/develop
2024-04-05 05:22:59 +00:00
jason
d9758636b1
仿钉钉流程设计-抄送节点实现
2024-04-05 12:59:37 +08:00
cherishsince
1b02733c10
增加图片生成 socket 接收到的消息类型、消息过程
2024-04-05 10:23:35 +08:00
cherishsince
dfbd75b53c
修改test,增加before初始化
2024-04-05 10:16:46 +08:00
cherishsince
44e44dc4bb
增加注释
2024-04-05 10:15:59 +08:00
cherishsince
5044a58118
增加mj web socket
2024-04-05 09:27:09 +08:00
cherishsince
28b2fad7b6
增加mj web socket 测试类
2024-04-05 08:46:41 +08:00
cherishsince
6adb8d657c
处理异常结果,日志输出
2024-04-04 19:43:28 +08:00
cherishsince
e6bc5cf069
删除没用的 import
2024-04-04 19:40:21 +08:00
cherishsince
b77e8f16e9
增加 mj Imagine 测试类
2024-04-04 19:38:03 +08:00
cherishsince
f1f003b76d
imagine 发送模板
2024-04-04 19:34:41 +08:00
cherishsince
98b4fb7ff0
增加 imagine 命令发送
2024-04-04 19:33:55 +08:00
YunaiV
9ade9686f3
【新增】system user 和 role 接入新操作日志
2024-04-04 09:59:33 +08:00
YunaiV
a1fb3cf6ed
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2024-04-04 09:59:01 +08:00
YunaiV
f869a5718d
【新增】system user 和 role 接入新操作日志
2024-04-04 09:57:06 +08:00
YunaiV
1aa8e173b1
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleUpdateStatusReqVO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserSaveReqVO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
2024-04-04 09:49:14 +08:00
YunaiV
87c7b3fac2
【新增】system user 和 role 接入新操作日志
2024-04-04 09:42:03 +08:00
YunaiV
83623a024f
【重构】V2 操作日志转正,基于注解的可使用变量、可以自定义函数的通用操作日志组件
2024-04-04 02:21:03 +08:00
YunaiV
01cfa60a64
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/aop/OperateLogAspect.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo01/Demo01ContactController.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo02/Demo02CategoryController.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo03/Demo03StudentController.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/JobController.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/JobLogController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/DeliveryExpressController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/order/PayOrderController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/refund/PayRefundController.java
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/OperateLogApi.java
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/dto/OperateLogCreateReqDTO.java
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/dto/OperateLogV2CreateReqDTO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictDataController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictTypeController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/ErrorCodeController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/LoginLogController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/RoleController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/SensitiveWordController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsLogController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/TenantController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/logger/OperateLogServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/logger/OperateLogServiceImplTest.java
2024-04-04 02:14:02 +08:00
YunaiV
20583417a4
【重构】V2 操作日志转正,基于注解的可使用变量、可以自定义函数的通用操作日志组件
2024-04-04 01:49:49 +08:00
YunaiV
000b6cf47f
【重构】V2 操作日志转正,基于注解的可使用变量、可以自定义函数的通用操作日志组件
2024-04-04 01:21:08 +08:00
YunaiV
1761495bce
【优化】增强访问日志,支持是否记录、脱敏、操作信息等功能
2024-04-03 20:02:05 +08:00
YunaiV
790f3dc99b
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/config/YudaoApiLogAutoConfiguration.java
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/filter/ApiAccessLogFilter.java
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/service/ApiAccessLog.java
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/service/ApiErrorLog.java
2024-04-03 19:56:19 +08:00
YunaiV
22a170ee62
【优化】增强访问日志,支持是否记录、脱敏、操作信息等功能
2024-04-03 19:55:14 +08:00
YunaiV
132c1cc828
【优化】增强访问日志,支持是否记录、脱敏、操作信息等功能
2024-04-03 19:52:52 +08:00
cherishsince
2f6b9b2ef5
移动文件目录
2024-04-03 17:09:22 +08:00
cherishsince
84825579b6
😄 模拟发送、接收discard消息成功!
2024-04-03 16:54:49 +08:00
puhui999
eeed1fdf66
Merge remote-tracking branch 'yudao/develop' into develop
2024-04-03 11:04:42 +08:00
puhui999
a9a8efc808
CRM: 完善用户画像数据统计
2024-04-03 10:09:46 +08:00
dhb52
1944199f67
fix: 按Code-Review修改CrmStatisticsCustomerMapper.xml
2024-04-02 23:44:17 +08:00
jason
d88718071d
仿钉钉流程设计-排他网关实现
2024-04-02 20:50:49 +08:00
YunaiV
cfe9c327c5
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2024-04-02 20:35:09 +08:00
芋道源码
9fac998a14
!930 全局:增加 VO 数据翻译的支持
...
Merge pull request !930 from 芋道源码/feature/easy-trans
2024-04-02 12:05:01 +00:00
cherishsince
bd8e6c2b40
增加mj 执行器(先提交一下)
2024-04-02 00:44:04 +08:00
cherishsince
e91e7355dc
发送消息 type2 和 type3
2024-04-02 00:43:38 +08:00
cherishsince
5d4a111170
mj执行器
2024-04-01 22:32:07 +08:00
cherishsince
196b9ab39c
增加 interactions 核心接口数据
2024-04-01 22:14:38 +08:00
cherishsince
7543875e32
mj 命令
2024-04-01 22:13:01 +08:00
cherishsince
e7e5b729a6
mj 命令类型
2024-04-01 22:12:23 +08:00
YunaiV
594eb0ccc2
全局:增加 VO 数据翻译的支持
2024-04-01 21:46:57 +08:00
cherishsince
9cd97a77e0
Merge remote-tracking branch 'origin/master-jdk21-ai' into master-jdk21-ai
2024-04-01 21:26:07 +08:00
cherishsince
73631fb364
增加注释
2024-04-01 21:25:35 +08:00
YunaiV
b4e602bbd4
全局:增加 VO 数据翻译的支持
2024-04-01 12:51:45 +08:00
YunaiV
398e2a225a
Merge branch 'feature/easy-trans' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/logger/OperateLogApiImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/OperateLogController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/operatelog/OperateLogRespVO.java
2024-04-01 12:44:59 +08:00
YunaiV
beea186507
全局:增加 VO 数据翻译的支持
2024-04-01 12:42:27 +08:00
YunaiV
1b708ccd55
BPM:code review 快搭的实现
2024-03-30 22:13:26 +08:00
YunaiV
c0b1bb0d3f
BPM:【移除】Ureport 的实现,因为和 Spring Boot 兼容性较差
2024-03-30 20:49:11 +08:00
YunaiV
dc466d2286
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/ureport/UReportDataController.java
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/ureport/vo/UReportDataSaveReqVO.java
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/security/config/SecurityConfiguration.java
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/ureport/config/UReportConfiguration.java
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/ureport/core/UReportDataSource.java
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/ureport/core/UReportDatabaseProvider.java
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/ureport/core/UReportFilter.java
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/ureport/UReportDataService.java
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/ureport/UReportDataServiceImpl.java
# yudao-module-report/yudao-module-report-biz/src/test/java/cn/iocoder/yudao/module/report/service/ureport/UReportDataServiceImplTest.java
2024-03-30 20:45:11 +08:00
YunaiV
dcf6cc293e
BPM:【移除】Ureport 的实现,因为和 Spring Boot 兼容性较差
2024-03-30 20:44:45 +08:00
YunaiV
fd42257ed0
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2024-03-30 20:02:33 +08:00
YunaiV
c9b3cf9ed4
MP:增加 unionid
2024-03-30 19:57:46 +08:00
YunaiV
0b91603652
Member:会员等级变更修复
2024-03-30 19:48:41 +08:00
YunaiV
a0c065fe73
Merge remote-tracking branch 'origin/master'
2024-03-30 18:05:45 +08:00
YunaiV
423fc9227c
bugfix:修复 Xss 开启时,忽略的 URL 针对 RequestBody 还是会 XSS 过滤的问题
2024-03-30 18:05:39 +08:00
YunaiV
6b79058417
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
2024-03-30 18:03:14 +08:00
YunaiV
81bcf718cd
BPM:解决租户关闭时,Flowable 查询会报错的问题
2024-03-30 18:02:25 +08:00
YunaiV
0917b621e6
BPM:解决租户关闭时,Flowable 查询会报错的问题
2024-03-30 18:02:12 +08:00
芋道源码
a09b46217b
!912 解决退款失败时返回退款订单号错误的问题
...
Merge pull request !912 from 杨宇庆/N/A
2024-03-30 09:45:37 +00:00
YunaiV
f265762f22
修复 jdk8版本下docker-compose中Redis Host参数名称不正确的问题
2024-03-30 17:44:24 +08:00
YunaiV
3b7a1b55b9
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2024-03-30 17:43:31 +08:00
芋道源码
59a63911fb
!901 修复 jdk21版本下docker-compose中Redis Host参数名称不正确的问题
...
Merge pull request !901 from E1/master-jdk21
2024-03-30 09:43:05 +00:00
YunaiV
c943233ee5
bugfix:修复 Xss 开启时,忽略的 URL 针对 RequestBody 还是会 XSS 过滤的问题
2024-03-30 17:39:56 +08:00
YunaiV
e48240a192
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2024-03-30 17:09:26 +08:00
YunaiV
6cf7e60893
Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro
2024-03-30 17:09:14 +08:00
芋道源码
c3184d70ac
Merge pull request #462 from cheng102e/fix/issue-401
...
fix: [issue-401]修复中山市
2024-03-30 17:07:51 +08:00
YunaiV
d636391a50
bugfix:修复中山市缺少
2024-03-30 17:07:36 +08:00
YunaiV
a68abc43ae
CRM:修复 @RequestBody
和 Multipart 不能同时存在的异常和导入客户后序列化产生的异常
2024-03-30 17:06:13 +08:00
YunaiV
ba50e62af9
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/app/PayAppController.java
2024-03-30 17:00:16 +08:00
YunaiV
c78519c6aa
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/app/PayAppController.java
2024-03-30 16:59:46 +08:00
YunaiV
544d9030e6
pay:后台支付应用信息列表关闭某一渠道,但是任然显示为开启状态
2024-03-30 16:59:05 +08:00
YunaiV
5faa006dd0
bugfix:修复拼团详情错误传递 groupon_id 的问题
2024-03-30 15:28:46 +08:00
YunaiV
f591a04317
CRM:code review【员工业绩】的实现
2024-03-30 14:39:34 +08:00
芋道源码
08c851aeab
!916 CRM员工业绩统计PR v1.0
...
Merge pull request !916 from scholarli/develop
2024-03-30 06:25:28 +00:00
YunaiV
3f5724e978
CRM:code review【客户画像】的实现
2024-03-30 14:17:28 +08:00
YunaiV
924580f4a2
CRM:重构【客户画像】,从【客户统计】拆分出去先~
2024-03-30 13:51:46 +08:00
YunaiV
3b379d8cc0
Merge branch 'develop' of https://gitee.com/puhui999/ruoyi-vue-pro into develop
...
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/statistics/CrmStatisticsCustomerController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsCustomerServiceImpl.java
2024-03-30 11:54:27 +08:00
YunaiV
8266fb8f94
CRM:完善【排行版】功能
2024-03-30 11:49:06 +08:00
YunaiV
a8bec19196
CRM:code review【客户统计】的代码实现
2024-03-30 11:00:15 +08:00
YunaiV
90f82b157d
CRM:优化【客户统计】的代码实现
2024-03-30 09:22:54 +08:00
jason
b504d9841e
仿钉钉流程设计-后端实现30%
2024-03-29 19:49:47 +08:00
jiejc1
7d26d63dba
fix: [issue-401]修复中山市
2024-03-28 20:06:31 +08:00
芋道源码
eab9627253
!909 feat: [CRM-客户分析]增加[时间间隔]选项
...
Merge pull request !909 from dhb52/develop
2024-03-28 11:13:18 +00:00
YunaiV
94b724e30a
Merge remote-tracking branch 'origin/develop' into develop
2024-03-28 19:05:24 +08:00
YunaiV
a80ba48889
bugfix:同步 master 修改的 bug
2024-03-28 19:05:16 +08:00
芋道源码
1cd5f47eb3
!926 【轻量级 PR】:fix: convertXxxByFlatMap, 当map后内容为null时, flatMap会出现NPE
...
Merge pull request !926 from dhb52/N/A
2024-03-28 11:01:43 +00:00
芋道源码
9b85a9617d
!915 添加加入购物车商品数量不可为0或更低数量的限制
...
Merge pull request !915 from 风狗/N/A
2024-03-28 10:58:24 +00:00
芋道源码
6c12e68a0a
!908 解决查看未上架的商品时,报错缺少商品名称问题
...
Merge pull request !908 from 杨宇庆/N/A
2024-03-28 10:55:59 +00:00
YunaiV
907f3a58ba
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
...
# Conflicts:
# sql/mysql/ruoyi-vue-pro.sql
2024-03-28 18:53:54 +08:00
芋道源码
830485911b
!924 取消订单同步取消分销问题
...
Merge pull request !924 from wangxiaorui/N/A
2024-03-28 10:53:06 +00:00
芋道源码
0bd4fbfe52
!920 发货日志物流公司名称不显示问题
...
Merge pull request !920 from 山野羡民/master
2024-03-28 10:51:28 +00:00
芋道源码
20f8470b55
!922 修复ERP采购订单菜单权限错误问题
...
Merge pull request !922 from zengheng/erp-dev
2024-03-28 10:48:25 +00:00
dhb52
2ea56b51eb
【轻量级 PR】:fix: convertXxxByFlatMap, 当map后内容为null时, flatMap会出现NPE
...
Signed-off-by: dhb52 <dhb52@126.com >
2024-03-27 14:30:28 +00:00
YunaiV
f623156829
README:增加功能图,方便理解
2024-03-27 21:11:12 +08:00
YunaiV
2275f97e36
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/expression/BpmTaskAssignStartUserExpression.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOALeaveServiceImpl.java
2024-03-27 21:08:26 +08:00
YunaiV
ba541fba83
README:增加功能图,方便理解
2024-03-27 21:06:06 +08:00
YunaiV
ec1ce2f358
README:增加功能图,方便理解
2024-03-27 21:05:13 +08:00
YunaiV
aea8fb7fc6
BPM:完善相关的代码注释
2024-03-27 19:49:06 +08:00
YunaiV
62de6c36bc
BPM:完善相关的代码注释
2024-03-27 19:42:08 +08:00
jason
210b4e54d7
仿钉钉流程设计-后端实现10%
2024-03-27 09:16:12 +08:00
wangxiaorui
85f994f643
取消订单同步取消分销问题
...
创建分销单的时候是按照OrderItem的主键来创建,取消的时候应该按照OrderItem的主键来取消,否则会导致无法取消分销单
Signed-off-by: wangxiaorui <742397974@qq.com >
2024-03-26 01:19:48 +00:00
YunaiV
3b8dee4963
BPM:完善相关的代码注释
2024-03-26 08:38:59 +08:00
puhui999
22191e81e3
CRM: 新增客户区域数据统计
2024-03-24 22:24:46 +08:00
cherishsince
6e261de03e
增加http client
2024-03-24 20:10:34 +08:00
cherishsince
5999b80471
对接openai image
2024-03-24 20:09:06 +08:00
puhui999
ce013a2562
CRM: 新增客户行业、来源、级别统计数据统计
2024-03-24 17:15:56 +08:00
YunaiV
f3e8c0971f
Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro
...
# Conflicts:
# yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/ErrorCodeConstants.java
2024-03-24 10:45:41 +08:00
YunaiV
a79985ae5b
工作流最新版本,支持 JDK8 分支
2024-03-24 10:44:54 +08:00
YunaiV
ff8fdaaacc
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2024-03-24 10:44:35 +08:00
YunaiV
b11231c499
Merge remote-tracking branch 'origin/master'
2024-03-24 10:44:08 +08:00
YunaiV
cc27652f86
最新菜单 SQL 的同步
2024-03-24 10:43:37 +08:00
YunaiV
18f6bdd1c0
最新菜单 SQL 的同步
2024-03-24 10:41:54 +08:00
YunaiV
c6e5cfccc9
Merge branch 'feature/bpm' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/candidate/vo/BpmTaskCandidateRuleVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmFormController.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmModelController.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmProcessDefinitionController.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmTaskAssignRuleController.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmUserGroupController.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormBaseVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormCreateReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormRespVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormUpdateReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupSaveReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupUpdateReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelBaseVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelUpdateReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/process/BpmProcessDefinitionRespVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/rule/BpmTaskAssignRuleBaseVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/rule/BpmTaskAssignRuleCreateReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/rule/BpmTaskAssignRuleUpdateReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOALeaveController.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/BpmOALeaveBaseVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/BpmOALeaveCreateReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/BpmOALeaveRespVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceCopyController.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmTaskController.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceCopyCreateReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskAddSignReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskApproveReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskDelegateReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/script/impl/BpmTaskAssignStartUserScript.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/handler/MultiInstanceHandler.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/listener/BpmProcessInstanceEventListener.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/web/config/BpmWebConfiguration.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/web/core/FlowableWebFilter.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/candidate/BpmCandidateSourceInfo.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/candidate/BpmCandidateSourceInfoProcessorChain.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/candidate/sourceInfoProcessor/BpmCandidateAdminUserApiSourceInfoProcessor.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/candidate/sourceInfoProcessor/BpmCandidateDeptApiSourceInfoProcessor.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/candidate/sourceInfoProcessor/BpmCandidatePostApiSourceInfoProcessor.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/candidate/sourceInfoProcessor/BpmCandidateRoleApiSourceInfoProcessor.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/candidate/sourceInfoProcessor/BpmCandidateScriptApiSourceInfoProcessor.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/candidate/sourceInfoProcessor/BpmCandidateUserGroupApiSourceInfoProcessor.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmFormService.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmFormServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmProcessDefinitionService.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmProcessDefinitionServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmTaskAssignRuleService.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmTaskAssignRuleServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmUserGroupService.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmUserGroupServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/dto/BpmProcessDefinitionCreateReqDTO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOALeaveServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceService.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskService.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/cc/BpmProcessInstanceCopyServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/test/java/cn/iocoder/yudao/module/bpm/service/candidate/BpmCandidateSourceInfoProcessorChainTest.java
# yudao-module-bpm/yudao-module-bpm-biz/src/test/java/cn/iocoder/yudao/module/bpm/service/definition/BpmTaskAssignRuleServiceImplTest.java
2024-03-24 10:16:24 +08:00
YunaiV
5c5bd0e5da
BPM:流程模型的 icon 维护
2024-03-24 10:08:51 +08:00
YunaiV
727faac8d8
BPM:增加流程表达式的管理
2024-03-23 21:11:53 +08:00
YunaiV
6d44bf0d7a
BPM:增加任务监听器、执行监听器的管理
2024-03-23 19:23:11 +08:00
YunaiV
889b9406b8
BPM:增加任务监听器、执行监听器的管理
2024-03-23 15:58:45 +08:00
zengheng
a541762697
修复erp采购管理采购订单菜单权限错误的bug
2024-03-23 10:57:58 +08:00
liyujiang
53f2d4cfd1
fix(trade): 发货日志无需发货时的描述改为“已发货,快递公司:无,快递单号:无”
2024-03-23 10:16:47 +08:00
YunaiV
528a321f0a
BPM:增加「发起人自选」的任务审批人的分配策略
2024-03-23 00:54:26 +08:00
YunaiV
acea73c991
BPM:新增【流程任务】菜单,用于全部流程实例的查询
2024-03-22 09:06:52 +08:00
YunaiV
ba4b3701bf
BPM:新增【流程实例】菜单,用于全部流程实例的查询
2024-03-22 08:26:19 +08:00
liyujiang
03e3dc0121
fix(pay):后台支付应用信息列表关闭某一渠道,但是任然显示为开启状态
2024-03-22 08:19:53 +08:00
liyujiang
10bfbc9e6e
fix(trade): 发货日志物流公司名称不显示问题,参见 TradeOrderUpdateServiceImpl 类中调用TradeOrderLogUtils.setOrderInfo传递的参数“expressName”
2024-03-21 18:07:12 +08:00
YunaiV
b21eac6ca6
优化 findAndThen 方法,支持 key 为 null 的过滤
2024-03-21 08:53:16 +08:00
YunaiV
e5444c5d47
BPM:优化 convert 的逻辑
2024-03-20 21:32:01 +08:00
YunaiV
c104191821
BPM:增强 model 流程模型部署时,各种参数校验
2024-03-20 18:51:36 +08:00
YunaiV
559bab571a
BPM:移除 flowable starter 模块,融合到 bpm 模块中
2024-03-20 13:14:53 +08:00
YunaiV
29a0fbfc43
BPM:支持多表单,每个流程任务都可以绑定流程表单
2024-03-20 12:50:51 +08:00
YunaiV
ed83b912e4
BPM:新增流程分类表,替代现有的 bpm_category
数据字典
2024-03-19 19:49:45 +08:00
YunaiV
d5e28d4c57
BPM:简化 userGroup 的实现
2024-03-19 12:13:49 +08:00
YunaiV
8c32eb24ec
BPM:优化 task 加减签的实现
2024-03-19 01:31:37 +08:00
YunaiV
0a7f94dd5f
BPM:完善 task 在通过、不通过、取消等情况下的 reason 和 comment 逻辑
2024-03-18 22:43:58 +08:00
YunaiV
bc4427aca5
BPM:完善 task 转派的实现
2024-03-18 20:44:44 +08:00
YunaiV
b2b2b497b1
BPM:完善 task 委托的实现
2024-03-18 19:24:07 +08:00
YunaiV
c4688d887c
BPM:增加 task 的审批建议
2024-03-18 18:41:04 +08:00
YunaiV
ba502fc528
BPM:调整抄送逻辑的实现,改成审批通过、不通过时,可选择抄送
2024-03-17 22:14:36 +08:00
YunaiV
3fce482716
BPM:简化 task 接口的 VO,做一些合并。虽然字段上有冗余,但是读代码难度降低
2024-03-17 17:24:40 +08:00
cherishsince
a14aebd5ee
对接 openai dall-e-3,发送请求解析地址存在问题,链接不上
2024-03-17 11:19:58 +08:00
cherishsince
633b112603
不传入options 参数,就先不builder
2024-03-17 11:19:16 +08:00
YunaiV
d40fa0f929
BPM:流程任务的 status
状态实现,使用 Flowable 的 variables
存储,移除 bpm_task_ext
表
2024-03-17 10:10:42 +08:00
cherishsince
7fe1b77919
增加 spring ai Image模块注释
2024-03-17 09:50:48 +08:00
cherishsince
c3e36c19ea
复制 spring-ai image
2024-03-17 09:46:38 +08:00
cherishsince
6a3cafb41e
适配jdk8 - 2,这个地方不会改
2024-03-16 21:42:31 +08:00
cherishsince
c71b8b3c0b
maven 编译改为 21
2024-03-16 21:40:04 +08:00
cherishsince
e889b8c1e0
适配jdk8(暂时编译没报错)
2024-03-16 21:38:31 +08:00
cherishsince
94e9ee9590
适配讯飞星火 chatOptions
2024-03-16 21:24:57 +08:00
cherishsince
f41e43713c
百度 文心一言 适配chatOptions
2024-03-16 20:28:35 +08:00
cherishsince
1fada268ac
增加 QianWenOptions 类型判断,避免强转失败!
2024-03-16 19:54:20 +08:00
cherishsince
6415422f7d
修改 client 构造方法,制定传入 QianWenOptions
2024-03-16 19:47:14 +08:00
YunaiV
7967a2a195
BPM:流程实例的 status
状态实现,使用 Flowable 的 variables
存储,移除 bpm_process_instance_ext
表
2024-03-16 16:43:53 +08:00
cherishsince
7a785b1ec0
阿里通义千问,继承 chat options
2024-03-16 10:00:13 +08:00
YunaiV
a1defeb48a
BPM:新增顺序会签、或签的能力
2024-03-15 21:08:43 +08:00
cherishsince
711cfcb3f6
client 移除 AbstractFunctionCallSupport
2024-03-15 19:45:52 +08:00
scholar
705a3e53ca
CRM员工业绩统计PR v2.0
2024-03-15 12:09:19 +08:00
风狗
c4dedf4d48
添加加入购物车商品数量不可为0或更低数量的限制
...
Signed-off-by: 风狗 <909275705@qq.com >
2024-03-15 02:22:39 +00:00
YunaiV
f5f73adcbb
BPM:重构流程分配人的实现,通过 BpmTaskCandidateStrategy 策略模式
2024-03-15 00:19:09 +08:00
cherishsince
26afa04e80
增加 阿里 千问参数说明
2024-03-14 20:23:13 +08:00
cherishsince
0f73b61db2
增加阿里 通义千问
2024-03-14 20:16:07 +08:00
YunaiV
797fddfb3d
BPM:新增 flowable expression 表达式,替代现有 BpmTaskAssignScript,更加灵活
2024-03-14 12:54:16 +08:00
YunaiV
cdbcd4d673
BPM:重构审批人的分配规则实现,移除 bpm_task_assign_rule 表,存储在 bpmn 的 userTask 中
2024-03-13 21:18:07 +08:00
cherishsince
de32611794
增加讯飞星火
2024-03-13 20:51:53 +08:00
cherishsince
1828d1953a
迁移文心一言
2024-03-12 21:44:07 +08:00
cherishsince
f6ea1bda76
从spring-ai 迁移 chat 模块和依赖模块过来
2024-03-12 21:07:09 +08:00
杨宇庆
8d7fb08ce5
解决退款失败时返回退款订单号错误的问题
...
Signed-off-by: 杨宇庆 <hiyyq@qq.com >
2024-03-12 07:36:03 +00:00
puhui999
0dd36f6c5c
MALL: fix 订单价格分摊
2024-03-10 19:07:24 +08:00
dhb52
03213e3254
fix: [CRM-客户分析]更新http-client脚本,增加intervalType请求参数
2024-03-10 14:30:59 +08:00
dhb52
4ac28603b8
feat: [CRM-客户分析]增加[时间间隔]选项
2024-03-10 10:30:25 +08:00
dhb52
ee2be79987
fix: [CRM-客户统计]根据Code-Review 修改代码
2024-03-09 22:51:38 +08:00
杨宇庆
1794a7c230
解决查看未上架的商品时,报错缺少商品名称问题
...
Signed-off-by: 杨宇庆 <hiyyq@qq.com >
2024-03-09 13:27:06 +00:00
YunaiV
d556b29214
CRM:code review 权限的优化
2024-03-09 18:27:58 +08:00
芋道源码
6b752b5cb4
!907 CRM: 根据 review 完善数据权限
...
Merge pull request !907 from puhui999/develop
2024-03-09 10:01:41 +00:00
puhui999
af5fbb6ff4
CRM: TransferReqVO bizId -> id、修复商机转移错误
2024-03-09 17:54:14 +08:00
芋道源码
504e364fd0
!906 回退 'Pull Request !905 : CRM员工业绩统计PR v1.0'(需要在 develop 分支开发)
...
Merge pull request !906 from 芋道源码/revert-merge-905-master
2024-03-09 09:39:59 +00:00
芋道源码
fd191b5c3d
回退 'Pull Request !905 : CRM员工业绩统计PR v1.0'
2024-03-09 09:39:31 +00:00
芋道源码
46c8cee6b0
!905 CRM员工业绩统计PR v1.0
...
Merge pull request !905 from scholarli/master
2024-03-09 09:39:18 +00:00
puhui999
47a698868c
CRM: 根据 review 完善数据权限
2024-03-09 17:00:05 +08:00
YunaiV
8dcc12f215
CRM:code review 客户总量统计
2024-03-09 16:32:18 +08:00
芋道源码
85817a2426
!902 fix: [CRM-客户统计]根据Code-Review 修改
...
Merge pull request !902 from dhb52/develop
2024-03-09 07:38:44 +00:00
puhui999
0043d02d0a
fix:商机 api 文档生成不对的问题
2024-03-09 14:31:43 +08:00
YunaiV
89fc83c419
CRM:code review 客户权限的实现
2024-03-09 11:58:05 +08:00
芋道源码
e2ec426a9f
!900 CRM:完善数据权限,实现数据权限同时添加、同时转移
...
Merge pull request !900 from puhui999/develop
2024-03-09 03:18:12 +00:00
芋道源码
271610bf6b
!899 fix:包冲突 积木报表 导出Excel报错
...
Merge pull request !899 from 李占宏/develop
2024-03-09 03:13:03 +00:00
芋道源码
d4e39dfc40
!904 feat: MapUtils.findAndThen,key 为 null 时, 不处理
...
Merge pull request !904 from dhb52/N/A
2024-03-09 03:10:16 +00:00
芋道源码
8faae78bfe
!903 fix: 使用convertSetByFlatMap避免 ID 重复
...
Merge pull request !903 from dhb52/N/A
2024-03-09 03:09:35 +00:00
芋道源码
7aa930c89f
Merge pull request #414 from iridescentGray/master
...
fix: 错误码bug
2024-03-09 11:08:18 +08:00
YunaiV
d30700d060
【修复】微信支付时,无法保证父线程的 ThreadLocal 传入子线程
2024-03-09 11:03:17 +08:00
scholar
e86059ed80
CRM员工业绩统计PR v1.0
2024-03-08 10:11:47 +08:00
dhb52
0386820a1c
feat: 增加[客户行业、客户来源]等字段显示,重构代码
2024-03-05 23:16:16 +08:00
dhb52
f4b1e9ca4a
feat: MapUtils.findAndThen,key 为 null 时, 不处理
...
Signed-off-by: dhb52 <dhb52@126.com >
2024-03-05 15:13:53 +00:00
dhb52
06c0d86544
fix: 使用convertSetByFlatMap避免 ID 重复
...
Signed-off-by: dhb52 <dhb52@126.com >
2024-03-05 15:08:40 +00:00
cherishsince
37790d5fc1
临时提交 对话聊天chatStream 接口调用会超时!
2024-03-05 19:01:25 +08:00
dhb52
a23ea45632
fix: [CRM-客户统计]根据Code-Review 修改
2024-03-04 23:51:25 +08:00
cherishsince
ebd5cbfca2
基层 open ai 添加 chat 聊天
2024-03-04 17:03:41 +08:00
cherishsince
f4b3bb5aaa
定义ai模块错误码
2024-03-04 17:02:03 +08:00
cherishsince
33d77b9b16
配置 yudao-dependencies spring-ai依赖
2024-03-03 20:19:06 +08:00
cherishsince
20ac7c6451
创建 yudao-module-ai 模块
2024-03-03 20:11:00 +08:00
puhui999
ba1b028001
CRM:完善数据权限,实现数据权限同时添加、同时转移
2024-03-03 20:10:30 +08:00
E1
79c51c6433
修复 Java21版本下docker-compose中Redis Host参数名称不正确的问题
...
Signed-off-by: E1 <876394202@qq.com >
2024-03-03 10:26:28 +00:00
puhui999
f56fab932a
CRM:完善 excel 导出 review 提到的问题
2024-03-02 23:24:42 +08:00
zhanhong
29b7106985
fix:包冲突 积木报表 导出Excel报错
2024-03-02 13:26:05 +08:00
zhanhong
1e13365ef4
pom
2024-03-02 13:23:54 +08:00
zhanhong
e7cc305362
Merge remote-tracking branch 'origin/develop' into develop
2024-03-02 13:23:05 +08:00
YunaiV
1f35ef59d1
CRM:code review excel 导出的重构
2024-03-02 00:25:51 +08:00
YunaiV
fc7734319b
Merge branch 'develop' of https://gitee.com/puhui999/ruoyi-vue-pro into develop
...
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableServiceImpl.java
2024-03-01 23:46:50 +08:00
YunaiV
379bd95840
CRM:code review 客户分析(客户总量分析)
2024-03-01 23:37:07 +08:00
芋道源码
2bf5c7a701
!889 feat: CRM/数据统计/员工客户分析 初稿
...
Merge pull request !889 from dhb52/develop
2024-03-01 14:21:40 +00:00
YunaiV
e091b077a8
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2024-03-01 20:01:38 +08:00
YunaiV
dda0909843
🎉 2.0.1 版本发布!
2024-03-01 20:01:16 +08:00
YunaiV
d3f3584132
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2024-03-01 19:40:52 +08:00
YunaiV
835bbe7e42
🎉 2.0.1 版本发布!
2024-03-01 19:40:37 +08:00
YunaiV
7ef7228f65
MALL:增加返回 vipPrice 减免金额
2024-03-01 19:21:03 +08:00
zhanhong
ca7b19c40b
pom
2024-03-01 19:06:24 +08:00
zhanhong
0bd7d310a1
pom
2024-03-01 19:05:54 +08:00
zhanhong
7841fba59b
fix:积木报表导出Excel报错(包冲突)
2024-03-01 19:00:10 +08:00
zhanhong
6846d429c0
re
2024-03-01 18:59:49 +08:00
zhanhong
01695567a1
re
2024-03-01 18:59:11 +08:00
zhanhong
a787f2a0cd
fix:积木报表导出Excel报错(包冲突)
2024-03-01 18:57:12 +08:00
YunaiV
6b06bf8a3d
bugfix MALL:已过期的优惠劵,还显示可以使用
2024-03-01 13:55:37 +08:00
YunaiV
f1ff656282
bugfix:运行失败的单测
...
bugfix:PayOrderExtensionMapper 的 selectListByStatusAndCreateTimeGe 查询时间范围不对的问题
2024-03-01 12:35:00 +08:00
YunaiV
831cf33e95
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
# yudao-module-pay/yudao-module-pay-biz/src/test/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceTest.java
2024-03-01 12:26:40 +08:00
YunaiV
da6e01f6b5
bugfix:运行失败的单测
...
bugfix:PayOrderExtensionMapper 的 selectListByStatusAndCreateTimeGe 查询时间范围不对的问题
2024-03-01 12:26:05 +08:00
YunaiV
bbdedd08f1
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/redis/RedisController.java
2024-03-01 09:39:55 +08:00
YunaiV
d8bfed5c87
fix: 获取redis命令统计指令有误
2024-03-01 09:39:27 +08:00
YunaiV
8a93a4d988
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
2024-03-01 09:32:25 +08:00
芋道源码
a4c7946830
!887 fix: 获取redis命令统计指令有误
...
Merge pull request !887 from dhb52/N/A
2024-03-01 01:32:08 +00:00
芋道源码
9b7f71c203
!896 fix:跟进记录分页不显示商机
...
Merge pull request !896 from 李占宏/develop
2024-03-01 01:30:49 +00:00
zhanhong
814acb83ae
fix:跟进记录分页不显示商机
2024-03-01 09:28:06 +08:00
YunaiV
257127df5b
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceImpl.java
2024-03-01 09:26:04 +08:00
YunaiV
d5aa827b86
!895 新增支持微信H5网页支付
2024-03-01 09:25:47 +08:00
YunaiV
10cc9fa77f
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2024-03-01 09:01:05 +08:00
YunaiV
8ff710e49d
✨ 同步 master 的一些 pr 代码变更
2024-03-01 09:00:43 +08:00
芋道源码
18415b1a20
!893 解决订单同步任务引起的对已关闭的订单成功支付的问题
...
Merge pull request !893 from 杨宇庆/N/A
2024-03-01 00:58:30 +00:00
芋道源码
24025d0c7c
!894 解决支付宝Wap创建的订单的超时时间无法生效的问题
...
Merge pull request !894 from 杨宇庆/N/A
2024-03-01 00:56:10 +00:00
芋道源码
d11ca8e73f
!895 新增支持微信H5网页支付
...
Merge pull request !895 from 杨宇庆/master
2024-03-01 00:51:46 +00:00
dhb52
34f68ce4c6
feat: CRM/数据统计/员工客户分析 初稿
2024-03-01 00:10:23 +08:00
芋道源码
556e3786a8
!892 修补会员取消售后接口中未校验用户ID的安全漏洞
...
Merge pull request !892 from 杨宇庆/N/A
2024-02-29 13:03:22 +00:00
芋道源码
801c405881
!891 修补会员退货接口中未校验用户ID的安全漏洞
...
Merge pull request !891 from 杨宇庆/N/A
2024-02-29 13:01:34 +00:00
YangYuQing
7c101cacb0
新增支持微信H5网页支付
2024-02-29 14:58:37 +08:00
杨宇庆
6f93363564
解决支付宝Wap创建的订单的超时时间无法生效的问题
...
Signed-off-by: 杨宇庆 <hiyyq@qq.com >
2024-02-29 06:17:33 +00:00
杨宇庆
57715e3cff
解决订单同步任务引起的对已关闭的订单却能成功支付的问题
...
Signed-off-by: 杨宇庆 <hiyyq@qq.com >
2024-02-29 05:52:39 +00:00
杨宇庆
5849f99d23
修补会员取消售后接口中未校验用户ID的安全漏洞
...
Signed-off-by: 杨宇庆 <hiyyq@qq.com >
2024-02-28 19:35:07 +00:00
杨宇庆
9c4d373f81
修补会员退货接口中未校验用户ID的安全漏洞
...
Signed-off-by: 杨宇庆 <hiyyq@qq.com >
2024-02-28 18:23:54 +00:00
dhb52
fbb624d826
feat: CRM/数据统计/员工客户分析/客户跟进次数分析
2024-02-28 23:07:38 +08:00
YunaiV
8b6bc7c54e
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
2024-02-28 23:04:18 +08:00
芋道源码
b135314482
!890 修复:CRM 更新回款报错、待办事项中即将到期的合同查询报错、新增商机产品不显示
...
Merge pull request !890 from 李占宏/develop
2024-02-28 14:56:07 +00:00
YunaiV
c3717b68c8
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2024-02-28 21:42:48 +08:00
YunaiV
1f4889c68e
✨ 全局:将 dict 组件,融合到 excel 组件里,减少 starter
2024-02-28 21:42:32 +08:00
dhb52
a0b413b3a3
refactor: CRM/数据统计/排行榜 重命名
2024-02-28 21:41:53 +08:00
dhb52
7d120a2f36
feat: CRM/数据统计/客户总量分析
2024-02-28 21:41:10 +08:00
YunaiV
91b3c16a90
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2024-02-28 21:04:19 +08:00
YunaiV
6dcb1277b3
✨ 全局:迁移 pay 组件到 pay 模块,迁移 flowable 组件到 bpm 模块
2024-02-28 21:03:40 +08:00
YunaiV
0dc23d38b9
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-captcha/src/main/java/cn/iocoder/yudao/framework/captcha/config/YudaoCaptchaConfiguration.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/captcha/core/RedisCaptchaServiceImpl.java
2024-02-28 20:32:16 +08:00
YunaiV
0317e4279d
✨ 全局:简化 captcha 组件,融合到 system 模块
2024-02-28 20:31:55 +08:00
YunaiV
2dc7376ec6
✨ 全局:简化 file 组件,融合到 infra 模块
2024-02-28 19:17:18 +08:00
YunaiV
0480cdf03f
✨ 全局:简化 file 组件,融合到 infra 模块
2024-02-28 19:17:00 +08:00
YunaiV
746133226f
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/file/FileContentDAOImpl.java
# yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/framework/file/core/s3/S3FileClientTest.java
2024-02-28 19:08:05 +08:00
YunaiV
77d634038c
✨ 全局:简化 file 组件,融合到 infra 模块
2024-02-28 18:59:33 +08:00
puhui999
720b54c353
CRM: 完善回款操作日志
2024-02-28 11:25:06 +08:00
zhanhong
b94cd08772
修复:CRM 新增商机产品不显示 CrmProductStatusEnum.ENABLE(1, "上架") CommonStatusEnum.DISABLE(1, "关闭");
2024-02-28 00:07:51 +08:00
puhui999
c3337f21ce
fix:主子表 props
2024-02-28 00:07:25 +08:00
zhanhong
89aca4572d
修复:CRM 合同配置不提醒,待办事项中即将到期的合同查询报错
2024-02-28 00:00:23 +08:00
zhanhong
8222c3a831
修复:CRM 更新回款报错 校验可回款金额超过上限 需要用到 不允许修改的字段的getContractId
2024-02-27 23:51:26 +08:00
puhui999
c4ff0a1038
Merge remote-tracking branch 'yudao/develop' into develop
2024-02-27 21:28:23 +08:00
YunaiV
ece338846a
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleRespVO.java
2024-02-27 21:01:52 +08:00
YunaiV
067ff6cc4d
✨ bugfix master 的一些 pr
2024-02-27 21:01:02 +08:00
芋道源码
ccc0a09317
!877 修正注释错误
...
Merge pull request !877 from moon69/master
2024-02-27 12:49:13 +00:00
芋道源码
74a669f6aa
!878 修复:错误的queryWrapper构建
...
Merge pull request !878 from oah/fixbug
2024-02-27 12:42:04 +00:00
YunaiV
d134bfc4a6
✨ 进一步同步 boot 和 cloud 代码,移除多余无用的类
2024-02-27 17:15:55 +08:00
dhb52
e4f1564ade
fix: 获取redis命令统计指令有误
...
Signed-off-by: dhb52 <dhb52@126.com >
2024-02-27 08:22:19 +00:00
YunaiV
2aade25e78
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21
2024-02-26 23:18:03 +08:00
芋道源码
b285548b9d
!882 fix: 兼容有些21jdk getFirst 会找不到符合的错误
...
Merge pull request !882 from e7c_corp/N/A
2024-02-26 15:08:09 +00:00
e7c_corp
a6e13da602
fix: 兼容有些21jdk getFirst 会找不到符合的错误
...
兼容有些21jdk getFirst 会找不到符合的错误
2024-02-26 15:00:50 +00:00
YunaiV
02466aca2e
✨ 2.0.1 版本发布准备
2024-02-26 13:14:39 +08:00
YunaiV
0c600a7358
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2024-02-26 13:09:59 +08:00
YunaiV
31e8777a7b
✨ CRM:更新最新代码,支持线索、客户、联系人、商机、合同等功能
2024-02-26 13:09:51 +08:00
YunaiV
656c3a77ec
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/util/ExcelUtils.java
# yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/event/BpmProcessInstanceResultEvent.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/bpm/listener/BpmServiceResultListener.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/backlog/CrmBacklogController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessStatusTypeController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessRespVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/status/CrmBusinessStatusSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/type/CrmBusinessStatusTypeSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmClueSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmClueTranslateReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/permission/CrmPermissionController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/product/vo/product/CrmProductSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/CrmReceivablePlanController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/vo/plan/CrmReceivablePlanUpdateReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/vo/receivable/CrmReceivableUpdateReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessStatusService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessStatusServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessStatusTypeService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessStatusTypeServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/bo/CrmBusinessUpdateProductReqBO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/clue/CrmClueService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/clue/CrmClueServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/CrmContactService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/CrmContactServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contract/listener/CrmContractResultListener.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/followup/bo/CrmUpdateFollowUpReqBO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/message/CrmBacklogService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/message/CrmBacklogServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/permission/bo/CrmPermissionTransferReqBO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/product/CrmProductCategoryService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/business/BusinessStatusTypeServiceImplTest.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessServiceImplTest.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/clue/CrmClueServiceImplTest.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/contract/ContractServiceImplTest.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImplTest.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/customerlimitconfig/CrmCustomerLimitConfigServiceImplTest.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/receivable/CrmCrmReceivablePlanServiceImplTest.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/receivable/CrmCrmReceivableServiceImplTest.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/dict/DictDataApiImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictDataServiceImpl.java
2024-02-26 12:57:56 +08:00
YunaiV
a390fb4519
✨ CRM:更新最新代码,支持线索、客户、联系人、商机、合同等功能
2024-02-26 12:55:58 +08:00
YunaiV
088fbb2096
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21
2024-02-26 12:25:55 +08:00
YunaiV
cb8d4e0976
✨ CRM:增加回款的待办事项逻辑
2024-02-26 12:24:40 +08:00
YunaiV
a531ba2902
✨ CRM:增加回款超过合同的退款金额校验
2024-02-26 09:27:13 +08:00
puhui999
dc695e3cda
Merge remote-tracking branch 'yudao/develop' into develop
2024-02-25 22:32:37 +08:00
puhui999
462a4ee823
重构 excel 导入模版下拉生成逻辑使用字段注解的方式配置下拉选择
2024-02-25 22:32:12 +08:00
YunaiV
5fbb423621
✨ CRM:完善合同的待回款金额
2024-02-25 20:50:37 +08:00
YunaiV
33b056e6c4
✨ CRM:完善回款的审批
2024-02-25 20:01:08 +08:00
YunaiV
2890de8103
✨ CRM:完善回款的新增/修改
2024-02-25 18:44:26 +08:00
YunaiV
332eb30b6c
✨ CRM:完善回款列表
2024-02-25 16:52:13 +08:00
YunaiV
91c179029f
✨ CRM:完善回款 plan 新增/修改
2024-02-25 16:09:16 +08:00
YunaiV
ba47402a7f
✨ CRM:完善回款 plan 列表
2024-02-25 09:23:42 +08:00
芋道源码
85c9524a2d
!880 CRM: 完善回款
...
Merge pull request !880 from puhui999/develop
2024-02-25 00:15:45 +00:00
puhui999
e5c3e69f5c
CRM: 完善回款
2024-02-25 02:11:19 +08:00
puhui999
b9ffb7833c
Merge remote-tracking branch 'yudao/develop' into develop
2024-02-25 00:39:47 +08:00
puhui999
88cb683752
CRM: 完善回款
2024-02-25 00:36:08 +08:00
YunaiV
c726cd3aff
✨ CRM:将 bi 调整成 statistics
2024-02-24 22:26:24 +08:00
YunaiV
cd87f2e4aa
✨ CRM:code review 客户导出的实现
2024-02-24 19:57:26 +08:00
YunaiV
e7bd2a568d
✨ CRM:增加商机关联联系人
2024-02-24 19:35:32 +08:00
YunaiV
53ebd39c73
✨ CRM:待办事项(接入合同)
2024-02-24 17:55:40 +08:00
YunaiV
0b0830f445
✨ CRM:增加合同配置表
2024-02-24 16:51:16 +08:00
YunaiV
616ae8eaeb
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
2024-02-24 16:08:37 +08:00
YunaiV
b6098cff83
✨ CRM:商机接入合同列表
2024-02-24 16:08:07 +08:00
YunaiV
29f1eb2c18
✨ CRM:优化 CRM 跟进记录的实现
2024-02-24 15:46:57 +08:00
芋道源码
67b091620d
!879 完善 Excel 导入模版下拉选择生成实现
...
Merge pull request !879 from puhui999/develop
2024-02-24 04:58:14 +00:00
puhui999
dd6981d901
Merge remote-tracking branch 'yudao/develop' into develop
...
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivablePlanServiceImpl.java
2024-02-24 11:44:52 +08:00
puhui999
5dc1dbb3b2
完善 Excel 导入模版下拉选择生成实现
2024-02-24 11:40:58 +08:00
YunaiV
3f8fa6b1bc
✨ CRM:简化 CRM 数据权限的实现
2024-02-24 11:14:30 +08:00
YunaiV
a8f6a3d324
✨ CRM:完善 CRM 相关实现
2024-02-24 08:18:10 +08:00
YunaiV
e53a0ca884
✨ CRM:code review 客户导入
2024-02-23 18:50:22 +08:00
芋道源码
a64da48aa3
!876 CRM:新增客户导入模版所属行业、客户等级、客户来源、客户地区单元格下拉选择
...
Merge pull request !876 from puhui999/develop
2024-02-23 07:01:08 +00:00
puhui999
be2431b73b
CRM: 完善回款审批逻辑
2024-02-23 14:37:03 +08:00
puhui999
eddd0a8801
Merge remote-tracking branch 'yudao/develop' into develop
...
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java
2024-02-23 14:16:24 +08:00
YunaiV
4066ad3e1a
✨ CRM:完善合同的审批逻辑
2024-02-23 12:59:16 +08:00
puhui999
5892c8897f
CRM: 流程状态转换封装
2024-02-23 12:20:08 +08:00
puhui999
0a97ff03c6
Merge remote-tracking branch 'yudao/develop' into develop
...
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java
2024-02-23 12:16:37 +08:00
puhui999
c6b133d919
CRM: 完善回款
2024-02-23 12:14:56 +08:00
puhui999
b3cfad9396
CRM: 完善回款计划
2024-02-23 10:42:36 +08:00
YunaiV
d604e76d16
✨ CRM:完善合同的跟进记录实现
2024-02-23 09:31:41 +08:00
YunaiV
b0def8b586
✨ CRM:完善合同的新增、修改实现
2024-02-23 00:04:57 +08:00
YunaiV
ef26b5e8dc
✨ CRM:完善合同的列表实现
2024-02-22 21:54:06 +08:00
puhui999
872fe53585
Merge remote-tracking branch 'yudao/develop' into develop
2024-02-22 21:26:28 +08:00
YunaiV
c97c9f882e
✨ CRM:完成商机状态的变更
2024-02-22 20:41:28 +08:00
JUNHAO
a345328a0c
修复:错误的queryWrapper构建
2024-02-22 18:12:59 +08:00
moon69
a8ee4a85ce
修正注释错误
2024-02-22 12:53:59 +08:00
puhui999
0f2d974e9c
Merge remote-tracking branch 'yudao/develop' into develop
2024-02-22 11:08:11 +08:00
puhui999
41b8575b8d
CRM:完善客户导入
2024-02-22 11:07:34 +08:00
YunaiV
740e9297fa
✨ CRM:完善商机和联系人之间的关联
2024-02-22 09:35:57 +08:00
puhui999
b26eb6266f
CRM:新增客户导入模版所属行业、客户等级、客户来源、客户地区单元格下拉选择
2024-02-22 00:58:50 +08:00
YunaiV
d9b0c9b4cf
✨ CRM:完善商机的跟进记录
2024-02-21 23:37:10 +08:00
芋道源码
df2441def9
!875 完善 review 提到的问题
...
Merge pull request !875 from puhui999/develop
2024-02-21 14:57:22 +00:00
puhui999
1ad5602a19
Merge remote-tracking branch 'yudao/develop' into develop
...
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessServiceImpl.java
2024-02-21 22:42:41 +08:00
YunaiV
77f98c4d12
✨ CRM:完善商机的新增、修改逻辑
2024-02-21 21:49:49 +08:00
YunaiV
f76a7cd941
✨ CRM:重构商机状态的代码实现,不调整表结构
2024-02-21 20:10:13 +08:00
YunaiV
e01dda9baf
✨ CRM:完善商机的列表
2024-02-21 18:45:10 +08:00
colorfulgray0
9878ebbf3b
fix: 错误码bug
2024-02-21 15:24:02 +08:00
puhui999
02b63de808
CRM:完善 review 提到的问题
2024-02-21 14:27:25 +08:00
YunaiV
7dd35f3295
✨ CRM:完善联系人的编辑、详情
2024-02-20 23:32:26 +08:00
YunaiV
66a34a6d90
✨ CRM:完善联系人的列表
2024-02-20 21:18:45 +08:00
YunaiV
4b41c3c692
✨ CRM:优化客户的 backlog 逻辑
2024-02-20 20:19:59 +08:00
YunaiV
b444312ea8
✨ CRM:优化客户的过期到公海的逻辑
2024-02-20 19:07:48 +08:00
YunaiV
3e6524932b
✨ CRM:优化客户的详情、更新成交状态
2024-02-20 12:55:44 +08:00
YunaiV
69a974ef02
📖 CRM:线索的跟进逻辑
2024-02-19 22:47:28 +08:00
芋道源码
bac476c131
!871 fix: 根据code-review修改Crm Backlog
...
Merge pull request !871 from dhb52/develop
2024-02-19 14:10:17 +00:00
YunaiV
38e410cae0
📖 CRM:线索的转化逻辑
2024-02-19 20:41:10 +08:00
YunaiV
fe330482b3
📖 CRM:线索 clue 新增/修改的完善
2024-02-19 19:02:12 +08:00
YunaiV
49bc70ed82
📖 CRM:线索 clue 列表的完善
2024-02-19 13:02:41 +08:00
dhb52
dca262c64b
fix: 根据code-review修改
2024-02-18 22:58:23 +08:00
YunaiV
1bfb406041
📖 CRM:code review 待提醒逻辑
2024-02-18 21:47:36 +08:00
芋道源码
51f52ff4b7
!870 feat: CRM/backlog 提醒数量
...
Merge pull request !870 from dhb52/develop
2024-02-18 13:27:44 +00:00
YunaiV
4bf4432f93
✨ CRM:单测暂时不写
2024-02-18 21:11:43 +08:00
YunaiV
9ea7bde751
📖 ERP:增加 ERP 首页的统计
2024-02-18 19:05:40 +08:00
dhb52
1ba2b7b600
fix: Customer,Clue增加followUpStatus自动查询
2024-02-18 00:21:10 +08:00
dhb52
cd1e73cc3f
Merge remote-tracking branch 'upstream/develop' into develop
...
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractService.java
2024-02-18 00:05:24 +08:00
dhb52
d23dfd4276
feat: CRM/backlog 提醒数量
2024-02-18 00:03:11 +08:00
YunaiV
123a009394
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2024-02-17 23:51:11 +08:00
YunaiV
21452af780
✨ 2.0.1 版本发布准备
2024-02-17 23:44:23 +08:00
YunaiV
3b2200ad80
✨ 2.0.1 版本发布准备
2024-02-17 23:26:50 +08:00
YunaiV
08c259424a
Merge remote-tracking branch 'origin/master'
2024-02-17 21:41:08 +08:00
YunaiV
fb66b2768e
✨ 2.0.1 版本发布准备
2024-02-17 21:41:02 +08:00
YunaiV
169c1e4907
✨ 2.0.1 版本发布准备
2024-02-17 21:40:50 +08:00
YunaiV
ce2975a0f1
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# pom.xml
# yudao-dependencies/pom.xml
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmModelController.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceCCReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/candidate/BpmCandidateSourceInfo.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/cc/BpmProcessInstanceCopyServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelService.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmProcessDefinitionServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskService.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/test/java/cn/iocoder/yudao/module/bpm/service/cc/BpmProcessInstanceCopyServiceTest.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/product/CrmBusinessProductSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmClueSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/CrmContractSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/CrmReceivablePlanController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/bo/CrmBusinessUpdateFollowUpReqBO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/clue/CrmClueService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/clue/CrmClueServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/CrmContactService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/CrmContactServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/bo/CrmContactUpdateFollowUpReqBO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contract/bo/CrmContractUpdateFollowUpReqBO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/followup/CrmFollowUpRecordService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/followup/CrmFollowUpRecordServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/followup/handle/CrmBusinessFollowUpHandler.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/followup/handle/CrmClueFollowUpHandler.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/followup/handle/CrmContactFollowUpHandler.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/followup/handle/CrmContractFollowUpHandler.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/followup/handle/CrmCustomerFollowUpHandler.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/message/CrmBacklogServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/permission/bo/CrmPermissionUpdateReqBO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivablePlanServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableServiceImpl.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImpl.java
# yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/comment/ProductCommentServiceImplTest.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notice/vo/NoticeSaveReqVO.java
2024-02-17 21:04:03 +08:00
YunaiV
20f8cb1606
✨ 2.0.1 版本发布准备
2024-02-17 21:01:59 +08:00
YunaiV
63f322cb17
📖 CRM:code review 前端直接上传
2024-02-17 20:35:48 +08:00
芋道源码
b2782e1d9a
!865 基础设施:前端直连上传文件
...
Merge pull request !865 from 疯狂的世界/develop
2024-02-17 11:21:06 +00:00
YunaiV
0fba56cda8
📖 CRM:code review 合同逻辑
2024-02-17 19:14:48 +08:00
YunaiV
c6041da3c4
Merge branch 'develop' of https://gitee.com/puhui999/ruoyi-vue-pro into develop
...
# Conflicts:
# yudao-module-erp/yudao-module-erp-biz/src/test/java/cn/iocoder/yudao/module/erp/service/product/ErpProductUnitServiceImplTest.java
2024-02-17 18:17:32 +08:00
芋道源码
24b0b166bd
!867 解决当某地区有人下单但无人支付时的空指针异常
...
Merge pull request !867 from 杨宇庆/N/A
2024-02-17 10:15:10 +00:00
YunaiV
c40ea1eaa6
📖 CRM:code review 商业智能的排行版
2024-02-17 18:14:28 +08:00
芋道源码
bba32c6ba3
!866 新增:CRM 商业智能,其他排名接口
...
Merge pull request !866 from 安浩浩/develop
2024-02-17 10:06:18 +00:00
YunaiV
5955f39e24
📖 CRM:code review 待办项目的实现
2024-02-17 18:02:48 +08:00
芋道源码
a03e661a56
!868 feat: 待回款提醒,即将到期的合同,待审核回款
...
Merge pull request !868 from dhb52/develop
2024-02-17 08:44:33 +00:00
YunaiV
c777237d93
✨ 增加 ERP 系统的介绍
2024-02-17 10:11:04 +08:00
YunaiV
94153cb59e
✨ 增加 ERP 系统的介绍
2024-02-17 10:10:09 +08:00
dhb52
a5d33692c1
refactor: TodayCustomer利用CrmCustomerController#getCustomerPage
2024-02-16 22:45:37 +08:00
dhb52
72113bbbc6
Merge remote-tracking branch 'upstream/develop' into develop
2024-02-16 22:16:44 +08:00
YunaiV
eefd787de6
✨ ERP:初始化 receipt 收款单的逻辑 100%
2024-02-16 08:13:21 +08:00
YunaiV
f93bad282f
✨ ERP:初始化 receipt 收款单的逻辑 30%
2024-02-15 19:28:54 +08:00
YunaiV
33f654b73b
✨ ERP:销售订单的 receiptPrice 调整,为接入财务的收款单做准备
2024-02-15 09:16:11 +08:00
dhb52
7936e27ea4
Merge remote-tracking branch 'upstream/develop' into develop
2024-02-14 19:43:04 +08:00
YunaiV
9e3858aea7
✨ ERP:完成 payment 付款单的逻辑 100%
2024-02-14 17:13:48 +08:00
YunaiV
0d551a4408
✨ ERP:初始化 payment 付款单的逻辑 30%
2024-02-14 08:09:15 +08:00
YunaiV
2d43c1f9be
✨ ERP:采购订单的 paymentPrice 调整,为接入财务的付款单做准备
2024-02-13 14:33:02 +08:00
YunaiV
2d02430768
✨ ERP:采购出库 50%
2024-02-12 20:42:37 +08:00
YunaiV
62ef4b16af
✨ ERP:采购入库 100%
2024-02-12 16:51:56 +08:00
YunaiV
0599f5392c
✨ ERP:采购入库 50%
2024-02-12 10:42:23 +08:00
YunaiV
5d092361ed
✨ ERP:基本完成采购订单 100%
2024-02-12 10:00:02 +08:00
YunaiV
c5d9ad59e0
✨ ERP:初始化采购订单 50%
2024-02-12 08:39:43 +08:00
YunaiV
798b72778e
✨ ERP:初始化销售退货逻辑 100%
2024-02-12 06:52:20 +08:00
YunaiV
926286fe08
✨ ERP:初始化销售退货逻辑 50%
2024-02-12 06:08:09 +08:00
YunaiV
dbc367ad95
✨ ERP:基本完成销售入库模块
2024-02-11 22:12:56 +08:00
YunaiV
0694bc8684
✨ ERP:完善 ERP 销售出库单的保存
2024-02-11 21:19:16 +08:00
YunaiV
09e4763c79
✨ ERP:增加 ERP 可出库订单列表
2024-02-11 10:33:37 +08:00
YunaiV
6f57987208
✨ ERP:增加 ERP 销售出库的实现 30%(列表)
2024-02-10 22:47:30 +08:00
YunaiV
3c6ab397f9
✨ ERP:初始化销售出库 30%
2024-02-10 18:20:59 +08:00
YunaiV
d06a22dab3
✨ ERP:增加结算账户 100%
2024-02-10 08:32:27 +08:00
YunaiV
5fd23cacc7
✨ ERP:增加 ERP 销售订单的实现 50%(详情)
...
新年快乐~
2024-02-10 00:07:08 +08:00
YunaiV
30de2176a4
✨ ERP:增加 ERP 销售订单的实现 50%
2024-02-09 20:03:02 +08:00
puhui999
51b53d6ed8
Merge remote-tracking branch 'yudao/develop' into develop
...
# Conflicts:
# yudao-module-erp/yudao-module-erp-biz/src/test/java/cn/iocoder/yudao/module/erp/service/product/ProductServiceImplTest.java
2024-02-08 11:54:04 +08:00
puhui999
9caaa96e5b
CRM-合同: 新增更新合同商品如果有关联商机的话则更新商机商品
2024-02-08 11:53:23 +08:00
YunaiV
94247addc6
✨ ERP:增加 ERP 盘点单的实现 100%
2024-02-08 06:59:19 +08:00
dhb52
3b612b2e6d
feat: 待回款提醒,即将到期的合同,待审核回款
2024-02-07 23:53:48 +08:00
YunaiV
573a79cad6
✨ ERP:增加 ERP 调拨单的实现 100%
2024-02-07 20:47:26 +08:00
YunaiV
f93963028f
✨ ERP:增加 ERP 调拨单的实现 50%
2024-02-07 17:01:33 +08:00
YunaiV
7495bb05d1
✨ ERP:增加 ERP 客户的实现
2024-02-07 15:41:00 +08:00
YunaiV
256d243507
✨ ERP:初始化其它出库的实现
2024-02-07 15:00:40 +08:00
YunaiV
dbc6134f80
✨ ERP:增加库存变更记录
2024-02-07 12:24:56 +08:00
YunaiV
3479ef8123
✨ ERP:增加金额计算的四舍五入
2024-02-07 10:34:23 +08:00
YunaiV
f6d3290426
✨ ERP:增加入库单号的自动生成
2024-02-07 00:37:42 +08:00
YunaiV
593e1fd59c
✨ ERP:增加入库单的审批功能
2024-02-06 23:28:57 +08:00
dhb52
6fc8c4809f
feat: 合同[审批状态]条件筛选
2024-02-06 22:58:01 +08:00
YunaiV
bfe3dc95fe
✨ ERP:增加供应商的实现
2024-02-06 17:59:44 +08:00
YunaiV
46d26659bf
✨ ERP:初始化其它入库的表单 50%
2024-02-06 15:58:29 +08:00
YunaiV
db79926c31
✨ ERP:完成 stock 产品库存、库存明细的实现
2024-02-05 19:24:33 +08:00
YunaiV
4f236c62ee
✨ 全局:修改 Vue3 + EP 版本的代码生成的注释相关
2024-02-05 19:04:44 +08:00
杨宇庆
5a2554205d
解决当某地区有人下单但无人支付时的空指针异常
...
Signed-off-by: 杨宇庆 <hiyyq@qq.com >
2024-02-04 18:59:53 +00:00
YunaiV
b7654eafea
✨ ERP:完成 stock 仓库信息的实现
2024-02-05 01:36:34 +08:00
YunaiV
a36ae0c469
✨ ERP:完成 product 信息、分类、单位的实现
2024-02-05 00:15:51 +08:00
puhui999
84f3b230d2
CRM-合同: 新增合同关联商品
2024-02-05 00:14:50 +08:00
安浩浩
3213cad317
新增:CRM 商业智能,其他排名接口
2024-02-04 23:54:58 +08:00
owen
787b0140e7
Merge remote-tracking branch 'origin/develop' into develop
2024-02-04 20:58:38 +08:00
owen
5804957149
基础设施:前端直连上传,优先使用自定义域名
2024-02-04 20:57:06 +08:00
YunaiV
e66ded2860
✨ ERP:初始化 product 信息、分类、单位的实现
2024-02-04 19:57:47 +08:00
owen
478db1bd39
基础设施:增加前端直连上传文件到S3服务的功能
2024-02-04 19:44:25 +08:00
YunaiV
bf8ec22144
📖 CRM:code review 合同的代码实现
2024-02-04 12:57:26 +08:00
YunaiV
3347d3320d
📖 CRM:code review 合同的代码实现
2024-02-04 09:41:50 +08:00
芋道源码
bb9173f7f0
!864 CRM-合同:完善 TODO
...
Merge pull request !864 from puhui999/develop
2024-02-04 01:13:25 +00:00
puhui999
ba6218b835
CRM-合同: transfer
2024-02-03 22:13:02 +08:00
puhui999
59dfa10461
Merge remote-tracking branch 'yudao/develop' into develop
...
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessServiceImpl.java
2024-02-03 20:52:08 +08:00
puhui999
53badfc367
CRM-CONTRACT: 完善合同编辑回显
2024-02-03 20:49:13 +08:00
YunaiV
9fbbce4e8d
📖 BPMN:code review bpmn 中辅助查找代码
2024-02-03 16:12:27 +08:00
芋道源码
b5777b57f1
!863 添加assigne处理器
...
Merge pull request !863 from 云开/feature/BPM_CC_COPY
2024-02-03 08:09:11 +00:00
kyle
66615f9e14
chore: 整理代码
2024-02-03 15:41:57 +08:00
kyle
b2370564a4
feat: 添加查找用户的处理器,用于在bpmn中辅助查找用户
2024-02-03 15:41:53 +08:00
puhui999
6a63f2f078
CRM-CONTRACT: 完善合同编辑回显
2024-02-03 14:08:06 +08:00
puhui999
59e6f23788
CRM-CONTRACT: 完善 TODO
2024-02-03 12:29:28 +08:00
YunaiV
e9a29e6dd4
CRM:优化合同金额排行、回款金额排行
2024-02-03 01:14:35 +08:00
芋道源码
1fd731a90a
!861 修改:CRM 商业智能,合并模块到 crm,优化查询
...
Merge pull request !861 from 安浩浩/develop
2024-02-02 01:29:35 +00:00
puhui999
1a96fb2ffc
Merge remote-tracking branch 'yudao/develop' into develop
...
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java
2024-02-01 14:17:15 +08:00
YunaiV
f5f827b59f
📖 CRM:code review 合同流程
2024-02-01 09:46:32 +08:00
puhui999
624b35988e
BPM: 实现业务流程结果监听器
2024-02-01 00:45:29 +08:00
安浩浩
46e01e07a8
修改:CRM 商业智能,合并模块到 crm,优化查询
2024-01-31 23:35:27 +08:00
芋道源码
acb8d3f23b
!858 CRM-客户: 完善客户导入
...
Merge pull request !858 from puhui999/develop
2024-01-30 04:41:14 +00:00
YunaiV
6f95f37117
📖 CRM:code review 待进入公海的客户
2024-01-30 12:40:23 +08:00
芋道源码
cd28128e42
!859 feat: CRM-backlog-待进入公海的客户
...
Merge pull request !859 from dhb52/crm-msg
2024-01-30 04:14:32 +00:00
YunaiV
52a68e1838
📖 CRM:code review 合同金额排行榜、回款金额排行榜
2024-01-30 09:24:42 +08:00
芋道源码
278f220cef
!860 新增:CRM 商业智能,合同金额排行榜和回款金额排行榜
...
Merge pull request !860 from 安浩浩/develop
2024-01-30 00:34:50 +00:00
anhaohao
bfed37af6f
修改:CRM 商业智能,回款金额排行榜时间字段 bug
2024-01-28 21:47:52 +08:00
puhui999
4418a7bebc
CRM-合同:完善新增合同插入关联的商品
2024-01-28 20:15:11 +08:00
anhaohao
fdd5d55fc8
Merge remote-tracking branch 'origin/develop' into develop
2024-01-28 20:11:00 +08:00
anhaohao
8d3ef13602
Merge remote-tracking branch 'origin/develop' into develop
2024-01-28 20:07:04 +08:00
anhaohao
65d7f8c4ab
新增:CRM 商业智能,合同金额排行榜和回款金额排行榜
2024-01-28 20:06:56 +08:00
anhaohao
ab43e89a48
修改:CRM 商业智能,合同金额排行榜和回款金额排行榜
2024-01-28 20:00:51 +08:00
puhui999
ea6752f15e
BPM: 新增通过流程标识获取流程图
2024-01-28 16:34:39 +08:00
puhui999
1cab3c009c
CRM-合同:新增发起合同审批
2024-01-28 01:50:27 +08:00
dhb52
5d8ca19b17
feat: CRM-backlog-待进入公海的客户
2024-01-28 00:22:58 +08:00
YunaiV
6e005f46d9
✨ ERP:【销售订单】初始化
2024-01-27 23:25:52 +08:00
YunaiV
ebd9222764
✨ ERP:初始化模块,立个 2024 年的 flag
2024-01-27 17:25:07 +08:00
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
2024-01-27 16:44:58 +08:00
puhui999
a877bb4731
CRM-客户: 完善客户导入
2024-01-27 15:15:30 +08:00
puhui999
4605e93105
CRM-客户: 完善客户导入
2024-01-27 14:30:30 +08:00
puhui999
d8b2da8eed
CRM-客户: 完善 TODO
2024-01-27 13:34:59 +08:00
YunaiV
3367b4b6d4
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2024-01-27 13:09:40 +08:00
YunaiV
35205edff9
✨ 全局:将 sms 融合到 system 模块里,减少 starter
2024-01-27 13:09:25 +08:00
YunaiV
b56db8aebe
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2024-01-27 13:06:37 +08:00
YunaiV
524ee8c467
✨ 全局:将 sms 融合到 system 模块里,减少 starter
2024-01-27 13:06:15 +08:00
YunaiV
ac0b18a808
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2024-01-27 11:27:04 +08:00
YunaiV
5acdd1554e
✨ 全局:将 sms 融合到 system 模块里,减少 starter
2024-01-27 11:25:43 +08:00
YunaiV
1b264365d3
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2024-01-27 10:26:22 +08:00
YunaiV
5b69df074c
✨ 全局:将 banner、error-code、desensitize 融合到 web 组件里,减少 starter
2024-01-27 10:25:25 +08:00
YunaiV
d492daced4
📖 CRM:code review 跟进记录
2024-01-27 00:55:42 +08:00
芋道源码
6a6f669c7f
!854 CRM:【线索】
...
Merge pull request !854 from Minh-X/develop
2024-01-26 15:46:47 +00:00
YunaiV
814b6f688d
📖 CRM:code review 跟进记录
2024-01-26 23:46:02 +08:00
芋道源码
1a7be60503
!853 CRM: 完善跟进日志 TODO
...
Merge pull request !853 from puhui999/develop
2024-01-26 15:18:17 +00:00
芋道源码
913c4e413d
!856 解决deploy.sh里停服务无法正常显示服务名的问题
...
Merge pull request !856 from 杨宇庆/N/A
2024-01-26 15:15:15 +00:00
芋道源码
f9b9fbc670
!855 修复【短信发送过于频率】的拼写错误
...
Merge pull request !855 from 杨宇庆/N/A
2024-01-26 15:10:50 +00:00
YunaiV
8f2f0ea096
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# pom.xml
# yudao-dependencies/pom.xml
2024-01-26 20:38:12 +08:00
YunaiV
0dff03b8b1
🔥 2.0.0 版本发布准备~
2024-01-26 20:37:38 +08:00
Minh-X
11ce24ad1e
修改CrmClueRespVO字段描述
...
Signed-off-by: Minh-X <bluesfish@yeah.net >
2024-01-25 14:17:24 +00:00
杨宇庆
443409f462
解决deploy.sh里停服务无法正常显示服务名的问题
...
解决deploy.sh里停服务无法正常显示服务名的问题
Signed-off-by: 杨宇庆 <hiyyq@qq.com >
2024-01-25 07:19:44 +00:00
杨宇庆
d611ebc0a2
修复【短信发送过于频率】的拼写错误
...
Signed-off-by: 杨宇庆 <hiyyq@qq.com >
2024-01-25 06:28:30 +00:00
min
ce397d4fbd
CRM:【线索】增加字段
2024-01-24 00:27:09 +08:00
puhui999
ed92bf45ce
CRM: 客户自动掉入公海
2024-01-23 23:30:13 +08:00
puhui999
6850c7c71d
CRM: 完善跟进日志 TODO
2024-01-23 22:31:51 +08:00
YunaiV
7bb171512a
📖 BPM:code review 抄送逻辑
2024-01-23 12:55:13 +08:00
芋道源码
986f953319
!849 流程抄送Review
...
Merge pull request !849 from 云开/feature/BPM_CC_develop
2024-01-23 01:40:51 +00:00
YunaiV
a86bce6f8b
📖 CRM:code review 商机模块
2024-01-23 09:35:45 +08:00
YunaiV
655fc03394
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
2024-01-23 09:24:00 +08:00
芋道源码
14d2195c6d
!850 商机模块代码优化
...
Merge pull request !850 from lzxhqs/develop
2024-01-23 01:23:52 +00:00
YunaiV
d732008ef8
📖 CRM:code review 跟进日志
2024-01-23 09:22:02 +08:00
芋道源码
ff7e492887
!851 CRM: 完善线索
...
Merge pull request !851 from puhui999/develop
2024-01-23 00:42:57 +00:00
puhui999
86a177226d
FIX: 修复启动报错
2024-01-22 23:23:00 +08:00
puhui999
ca9f3c522d
CRM-线索:完善操作日志
2024-01-22 22:46:52 +08:00
puhui999
8675d13548
CRM-线索:完善线索转客户
2024-01-22 22:23:23 +08:00
YunaiV
6898c17adf
Merge remote-tracking branch 'origin/master'
2024-01-22 21:09:45 +08:00
YunaiV
a039ab3a64
bugfix:redisson 版本过高,导致 Tuple NoClassDefFoundError
2024-01-22 21:09:39 +08:00
puhui999
f7d41186e4
CRM: 获取模块操作日志接口抽离
2024-01-22 20:30:12 +08:00
kyle
5fb0c51fad
refactor: 清理方法
2024-01-22 17:23:53 +08:00
lzxhqs
fb54c5fc89
商机模块代码优化
2024-01-22 16:48:59 +08:00
kyle
b4150cafa7
refactor: 调整代码分装层次
2024-01-22 13:59:37 +08:00
YunaiV
206899bfc0
📖 CRM:code review 待办事项
2024-01-22 12:23:24 +08:00
芋道源码
422b19caf7
!847 fix: 根据Code Review修改代办消息backlog
...
Merge pull request !847 from dhb52/crm-msg
2024-01-22 04:14:18 +00:00
kyle
97d6aab41c
fix: 修正运行时的流程抄送相关异常
2024-01-22 12:01:06 +08:00
kyle
5622ba8acf
review: 第一次修正合并
2024-01-22 11:21:17 +08:00
YunaiV
23ef3c8ae0
📖 CRM:code review 跟进记录
2024-01-22 08:53:59 +08:00
芋道源码
d7f04c94bb
!846 fix: 修复 CRM 的一些 bug
...
Merge pull request !846 from puhui999/develop
2024-01-22 00:45:29 +00:00
puhui999
227a4f126a
CRM: 完善跟进 TODO
2024-01-20 23:07:15 +08:00
puhui999
f366d440d8
Merge remote-tracking branch 'yudao/develop' into develop
2024-01-20 22:50:35 +08:00
puhui999
d293fdd474
fix: 修复 CRM 的一些 bug
2024-01-20 22:49:47 +08:00
dhb52
231fd68435
Merge remote-tracking branch 'upstream/develop' into crm-msg
2024-01-20 22:03:32 +08:00
YunaiV
c6c8dddfec
📖 CRM:code review 跟进记录
2024-01-20 19:05:16 +08:00
芋道源码
5b26d8fa00
!844 CRM: 完善跟进 TODO
...
Merge pull request !844 from puhui999/develop
2024-01-20 11:00:23 +00:00
YunaiV
39ae547b9d
📖 CRM:code review 线索逻辑
2024-01-20 18:55:28 +08:00
芋道源码
180a62699a
!845 CRM:线索相关内容
...
Merge pull request !845 from Minh-X/develop
2024-01-20 10:50:24 +00:00
YunaiV
16fd1a9639
🐛 oracle limit 查询不正确
2024-01-20 18:46:51 +08:00
puhui999
8920b9787d
fix: CRM selectBatchIds 权限查询 ids 筛选不生效的 bug
2024-01-20 18:42:06 +08:00
min
604611e1d2
CRM:【线索】补充相关日志
2024-01-20 15:38:55 +08:00
min
4ce9271ece
CRM:【线索】创建、删除线索时同时创建、删除数据权限
2024-01-20 15:08:45 +08:00
puhui999
7914423c66
CRM: 完善跟进 TODO
2024-01-20 14:56:31 +08:00
min
ba4f9207e2
CRM:【线索】使用工具类替换stream操作
2024-01-20 13:55:05 +08:00
芋道源码
91a7e6b44b
!841 去除通知保存VO里的Id不为空验证
...
Merge pull request !841 from smthhy/master
2024-01-20 01:25:51 +00:00
芋道源码
9572fef995
!843 Oracle limitN wrapper条件修正
...
Merge pull request !843 from Cool_Breeze/master
2024-01-20 01:25:35 +00:00
YunaiV
34bdf00d66
✨ 增加 jakartaPackage 标识,统一 Spring Boot 2.X 和 3.X 代码生成的模版
2024-01-20 00:45:34 +08:00
YunaiV
35a1908bc6
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# pom.xml
# yudao-dependencies/pom.xml
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/security/config/SecurityConfiguration.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java
2024-01-20 00:44:03 +08:00
YunaiV
5e8988b73b
✨ 增加 jakartaPackage 标识,统一 Spring Boot 2.X 和 3.X 代码生成的模版
2024-01-20 00:42:46 +08:00
YunaiV
499134cfa2
✨ 降低 podam 到 7.2.11,解决 Spring Boot 2.X 单测报错问题
2024-01-20 00:20:51 +08:00
YunaiV
2cdf61a56b
✨ 升级最新依赖
2024-01-19 22:47:30 +08:00
YunaiV
fcef0f7f50
✨ 升级最新依赖
2024-01-19 22:40:59 +08:00
YunaiV
6a6e95fcb6
✨ 对齐 BOOT 与 CLOUD 的代码
2024-01-19 22:13:55 +08:00
YunaiV
7f1ebb35cb
✨ 统一 JDK8 和 JDK21 相关代码
2024-01-19 12:43:14 +08:00
YunaiV
a6ef21b1b7
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/object/PageUtils.java
# yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/comment/ProductCommentServiceImplTest.java
2024-01-19 12:41:20 +08:00
YunaiV
292d35eed0
Merge remote-tracking branch 'origin/master'
2024-01-19 12:39:32 +08:00
YunaiV
a9891405aa
✨ 统一 JDK8 和 JDK21 相关代码
2024-01-19 12:39:10 +08:00
YunaiV
023a7b14d8
✨ 统一 JDK8 和 JDK21 相关代码
2024-01-19 12:38:57 +08:00
YunaiV
aa716642ab
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessStatusTypeController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessTransferReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessUpdateReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/CrmClueController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmClueCreateReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmClueRespVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmClueSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmClueUpdateReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/CrmContactController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/vo/CrmContactSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/vo/CrmContactUpdateReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contactbusinesslink/CrmContactBusinessLinkController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contactbusinesslink/vo/CrmContactBusinessLinkSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/CrmContractController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/CrmContractSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/CrmContractUpdateReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerLimitConfigController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerPoolConfigController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/CrmCustomerCreateReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/CrmCustomerSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/CrmCustomerTransferReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/CrmCustomerUpdateReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/limitconfig/CrmCustomerLimitConfigSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/limitconfig/CrmCustomerLimitConfigUpdateReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/poolconfig/CrmCustomerPoolConfigBaseVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/poolconfig/CrmCustomerPoolConfigSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/permission/CrmPermissionController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/product/CrmProductController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/product/vo/product/CrmProductSaveReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/CrmReceivableController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/CrmReceivablePlanController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/framework/permission/core/aop/CrmPermissionAspect.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessStatusService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessStatusTypeService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessStatusTypeServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/clue/CrmClueService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/clue/CrmClueServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/CrmContactService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/CrmContactServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contactbusinesslink/CrmContactBusinessLinkService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contactbusinesslink/CrmContactBusinessLinkServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerLimitConfigService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerLimitConfigServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerPoolConfigServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/permission/CrmPermissionService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/permission/CrmPermissionServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/product/CrmProductCategoryServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/product/CrmProductService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/product/CrmProductServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivablePlanService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivablePlanServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/util/CrmQueryPageUtils.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessServiceImplTest.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/clue/CrmClueServiceImplTest.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/contract/ContractServiceImplTest.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImplTest.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/customerlimitconfig/CrmCustomerLimitConfigServiceImplTest.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/receivable/CrmCrmReceivablePlanServiceImplTest.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/receivable/CrmCrmReceivableServiceImplTest.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/sku/ProductSkuApiImpl.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/spu/ProductSpuApiImpl.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/ProductCategoryController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/ProductCategoryCreateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/ProductCategorySaveReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/ProductCategoryUpdateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/comment/ProductCommentController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/comment/vo/ProductCommentBaseVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/comment/vo/ProductCommentRespVO.java
# 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/property/ProductPropertySaveReqVO.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/ProductPropertyValueSaveReqVO.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/ProductSkuRespVO.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/ProductSkuSaveReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuCreateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuSaveReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuUpdateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/category/AppCategoryController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/comment/AppProductCommentController.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/AppProductSpuPageReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryService.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryServiceImpl.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/comment/ProductCommentServiceImpl.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/property/ProductPropertyServiceImpl.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/property/ProductPropertyValueServiceImpl.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuService.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
# yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryServiceImplTest.java
# yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImplTest.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/combination/CombinationRecordApiImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/decorate/DecorateComponentController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/decorate/vo/DecorateComponentSaveReqVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/activity/AppActivityController.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-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/decorate/AppDecorateController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/diy/AppDiyTemplateController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/decorate/DecorateComponentServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/discount/DiscountActivityService.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/discount/DiscountActivityServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/diy/DiyTemplateServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/reward/RewardActivityService.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/reward/RewardActivityServiceImpl.java
# yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/controller/admin/trade/TradeStatisticsController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordServiceImpl.java
# yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/controller/admin/statistics/vo/MpStatisticsGetReqVO.java
# yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/service/message/MpMessageServiceImpl.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/wallet/AppPayWalletTransactionController.java
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/OperateLogApi.java
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/social/dto/SocialUserUnbindReqDTO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/logger/OperateLogApiImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/logger/OperateLogServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialClientServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImplTest.java
# yudao-server/src/main/resources/application-local.yaml
2024-01-19 09:13:18 +08:00
YunaiV
f4a55d3e26
🙂 同步 develop 最新开发代码
2024-01-19 09:10:26 +08:00
YunaiV
ba3fe15ec5
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21
2024-01-19 09:08:42 +08:00
YunaiV
fea84deca0
✨ Pay:code review 支付转账的部分逻辑
2024-01-18 23:58:44 +08:00
YunaiV
ee1870802f
BPM:抄送任务的 code review
2024-01-18 19:07:01 +08:00
coolbreeze
2655110865
Oracle limitN wrapper条件修正
2024-01-18 13:59:41 +08:00
芋道源码
a5dc4e7876
!839 流程增加抄送功能
...
Merge pull request !839 from 云开/feature/BPM_CC_develop
2024-01-18 04:18:43 +00:00
YunaiV
0abc618a1b
Merge remote-tracking branch 'origin/develop' into develop
2024-01-18 12:17:17 +08:00
YunaiV
6624a93a84
CRM:跟进记录 code review
2024-01-18 12:17:12 +08:00
芋道源码
3cc127496e
!842 update sql/mysql/ruoyi-vue-pro.sql.
...
Merge pull request !842 from jay浅蓝/N/A
2024-01-18 04:08:27 +00:00
YunaiV
ca55282516
CRM:商机 code review
2024-01-18 12:06:14 +08:00
jay浅蓝
867d8bc3cd
update sql/mysql/ruoyi-vue-pro.sql.
...
数据库缺少trade:order:query 和 trade:order:update权限,会导致订单的发货和更多按钮无法显示。
Signed-off-by: jay浅蓝 <565215951@qq.com >
2024-01-18 03:43:47 +00:00
YunaiV
4c200eda92
✨ MALL:清理多余的 MemberStatisticsDO 类
2024-01-18 00:00:42 +08:00
YunaiV
75f2b207a4
Merge remote-tracking branch 'origin/develop' into develop
2024-01-17 19:46:03 +08:00
YunaiV
dd0a2b73e8
✨ MALL:清理多余的 decorate 类
2024-01-17 19:45:57 +08:00
shihhy
93ff08863e
去除通知保存VO里的不为空验证
2024-01-17 14:01:21 +08:00
芋道源码
adfbb1433c
!840 CRM: 完善跟进,新增跟进信息处理器 handler 接口✔
...
Merge pull request !840 from puhui999/develop
2024-01-17 04:26:03 +00:00
puhui999
7b36eb888e
CRM-合同:RespVO 添加导出注解
2024-01-17 12:11:39 +08:00
puhui999
ff9cef6a92
CRM: 完善跟进,新增跟进信息处理器 handler 接口✔
2024-01-17 12:00:51 +08:00
kyle
3720a648d7
refactor: 添加相关缺少字段
2024-01-17 09:29:14 +08:00
YunaiV
6dbc942cdd
✨ MALL:修复售后确认退款时,缺少退款描述信息
2024-01-16 22:41:37 +08:00
kyle
fc2a8f1311
fix: 修正测试依赖路径
2024-01-16 11:50:12 +08:00
kyle
9df6cc76e7
feat: 修正依赖路径
2024-01-16 11:22:24 +08:00
kyle
8f171ba3d0
feat: 添加抄送人相关功能以及接口
2024-01-16 11:13:36 +08:00
kyle
1bc472b528
feat: 添加创建人以及创建事件
2024-01-16 11:13:33 +08:00
kyle
555bac151d
feat: 基本完成流程抄送
2024-01-16 11:13:31 +08:00
kyle
e21c262bd7
refactor: 重构查找候选人的逻辑
2024-01-16 11:13:26 +08:00
kyle
5ae1d0ab3e
fix: 修复3处问题
...
1. AreaConvert缺少两个方法导致编译报缺少转换函数
2. 修复SocialUserBindReqVO.java在因为lombok和mapstruct的问题,导致报未知属性的问题
3. 修复Bpm报缺少AsyncTaskExecutor的问题
2024-01-16 11:09:02 +08:00
dhb52
5105c6d16f
wip: LocalDate.now().atTime
2024-01-16 11:06:01 +08:00
dhb52
08e23a7dc4
wip: style-fix
2024-01-15 22:47:46 +08:00
YunaiV
9819e05d4e
Merge branch 'develop' of https://gitee.com/aberizofur/ruoyi-vue-pro into develop
2024-01-15 21:34:47 +08:00
YunaiV
a886ad9785
📖 CRM:跟进记录的 code review
2024-01-15 21:30:32 +08:00
lzxhqs
510b4fd3de
商机模块合并代码
2024-01-15 17:50:46 +08:00
dhb52
4bd97c4baf
wip: 根据code review优化代码
2024-01-15 17:41:21 +08:00
YunaiV
410c551e03
📖 CRM:跟进记录的 code review
2024-01-15 13:43:15 +08:00
芋道源码
e64e60c711
!832 CRM: 完善一些 TODO
...
Merge pull request !832 from puhui999/develop
2024-01-15 04:37:24 +00:00
芋道源码
cc6cb83507
!833 修改:CRM 产品,产品列表查询接入数据权限
...
Merge pull request !833 from 安浩浩/develop
2024-01-15 04:33:16 +00:00
YunaiV
9b7f6cfbac
📖 CRM:线索的 code review
2024-01-15 12:29:57 +08:00
芋道源码
4ca1f72d4f
!829 CRM:【线索】
...
Merge pull request !829 from Minh-X/develop
2024-01-15 04:22:23 +00:00
YunaiV
64e1d68923
📖 CRM:待办事项的 code review
2024-01-15 12:15:52 +08:00
anhaohao
454e800067
修改:CRM 产品,产品列表查询接入数据权限
2024-01-15 10:51:23 +08:00
芋道源码
e16f1caae0
!831 WIP: CRM-待办事项
...
Merge pull request !831 from dhb52/crm-msg
2024-01-15 00:53:04 +00:00
puhui999
0c30f59e02
Merge remote-tracking branch 'yudao/develop' into develop
2024-01-14 22:49:51 +08:00
puhui999
5efa0f327f
crm: 完善一些 TODO
2024-01-14 22:49:01 +08:00
dhb52
4558ecd836
wip: 待办事项
2024-01-14 22:45:16 +08:00
lzxhqs
b249c4e852
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
2024-01-14 15:16:39 +08:00
YunaiV
50f7be9976
✨ MALL:简化商评论的 VO 转化,去除无用的接口
2024-01-14 13:21:13 +08:00
lzxhqs
f361d05940
商机模块
2024-01-14 09:52:35 +08:00
puhui999
73c459f360
完善更进
2024-01-14 00:22:17 +08:00
min
2de0fb48ea
CRM:【线索】 线索如果不存在或者已经转化,抛出异常
2024-01-13 23:27:21 +08:00
min
fe0bde8417
CRM:【线索】 CrmClueExcelVO 融合到 CrmClueRespVO 里
2024-01-13 23:27:21 +08:00
YunaiV
ed34b18d82
✨ MALL:简化商品分类的 VO 转化
2024-01-13 22:58:24 +08:00
puhui999
eaa8e4be96
操作日志字段解析方法调整
2024-01-13 22:29:05 +08:00
YunaiV
d58da7b2b0
同步 https://gitee.com/zhijiantianya/yudao-cloud/pulls/90/files pr
2024-01-13 21:08:52 +08:00
YunaiV
8b3bfcbd6b
📖 MALL:code review 商品浏览记录
2024-01-13 20:23:58 +08:00
YunaiV
bbee720710
📖 CRM:code review 拼团记录的实现
2024-01-13 19:34:49 +08:00
芋道源码
1b87b8a42f
!822 接入拼团
...
Merge pull request !822 from 疯狂的世界/develop
2024-01-13 03:20:25 +00:00
芋道源码
7226f9b9b3
!828 【轻量级 PR】:优化 【代码生成】排序
...
Merge pull request !828 from 鲜de芒果/develop
2024-01-13 03:19:19 +00:00
YunaiV
df29f0682f
📖 CRM:线索模块的 review
2024-01-13 11:07:28 +08:00
YunaiV
8d2008f2b5
Merge branch 'develop' of https://gitee.com/Minh-X/ruoyi-vue-pro into develop
...
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/customer/CrmCustomerConvert.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/clue/CrmClueServiceImpl.java
2024-01-13 11:04:20 +08:00
YunaiV
6891b75e27
📖 CRM:产品模块的 review
2024-01-13 10:25:04 +08:00
芋道源码
19c0227cef
!826 CRM 产品分类和产品,优化了操作日志 ,新增获得产品操作日志
...
Merge pull request !826 from 安浩浩/develop
2024-01-13 02:04:37 +00:00
YunaiV
e79c750b46
📖 CRM:code review 跟进记录的实现
2024-01-13 09:56:53 +08:00
YunaiV
d80406acbb
Merge branch 'develop' of https://gitee.com/puhui999/ruoyi-vue-pro into develop
...
# Conflicts:
# yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryServiceImplTest.java
2024-01-13 09:23:56 +08:00
YunaiV
bf966cd610
✨ MALL:简化 SPU 属性 的 VO 转化
2024-01-12 23:18:00 +08:00
YunaiV
f6c8159dac
✨ MALL:简化 SPU 的 VO 转化
2024-01-12 22:48:58 +08:00
YunaiV
fe5c5e4223
✨ MALL:调整商品 SPU 字段,简化部分接口
2024-01-12 21:01:44 +08:00
DESKTOP-7VTMC9P\Administrator
f8e85575e0
【轻量级 PR】:优化 【代码生成】排序,从使用上来说,新导入的表是需要操作生成的,按照导入时间逆序符合简便使用习惯。
2024-01-12 14:03:34 +08:00
anhaohao
008f88d185
新增:CRM 产品,新增获得产品操作日志
2024-01-11 17:45:09 +08:00
anhaohao
803816b162
修改:CRM 产品分类和产品,优化了操作日志
2024-01-11 16:02:05 +08:00
owen
31a28cb40d
Review代码修改
2024-01-11 12:38:17 +08:00
owen
d6b59743a3
营销:接入 APP 装修页面
2024-01-11 11:55:25 +08:00
owen
680718c78f
营销:统一装修预览图片字段名称
2024-01-11 11:21:24 +08:00
owen
30fce2911f
Merge remote-tracking branch 'origin/develop' into develop
...
# Conflicts:
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/history/AppProductBrowseHistoryController.java
2024-01-11 11:11:05 +08:00
owen
2ab2b510cc
营销:修正拼团接口名称
2024-01-11 00:26:22 +08:00
owen
df609df2cf
商品:修正浏览记录
2024-01-11 00:25:55 +08:00
puhui999
6b426fcd01
CRM: 修复一下差异
2024-01-10 22:06:02 +08:00
puhui999
ad4044f932
Merge remote-tracking branch 'yudao/develop' into develop
...
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/customer/CrmCustomerConvert.java
2024-01-10 21:13:33 +08:00
puhui999
19fa65b0c3
CRM: 新增跟进记录
2024-01-10 21:09:08 +08:00
puhui999
ba103d6e86
CRM: 完善一些 TODO 提到的问题
2024-01-10 16:25:55 +08:00
puhui999
1a5fe6fa9a
CRM: 完善客户、联系人、合同、回款计划、回款的操作日志
2024-01-10 15:28:53 +08:00
puhui999
9bba1ce8a4
新增 ParseFunctionNameConstants 常量枚举
2024-01-10 11:29:29 +08:00
min
0ee7fedea8
CRM:【线索】使用BeanUtils替换mapstruct
2024-01-10 00:38:23 +08:00
min
99b8465e29
CRM:【线索】SaveReqVO去除客户编号字段
2024-01-10 00:16:37 +08:00
min
1280f49a04
CRM:【线索】转化为客户接口修改
2024-01-10 00:10:47 +08:00
YunaiV
722b33513c
📖 CRM:code review 线索模块
2024-01-09 21:58:50 +08:00
YunaiV
6a93484260
📖 CRM:code review 线索模块
2024-01-09 13:52:04 +08:00
芋道源码
e4936725f5
!819 CRM:【线索】
...
Merge pull request !819 from Minh-X/develop
2024-01-09 05:40:45 +00:00
min
81f838c5d2
CRM:【线索】创建、更新线索时添加校验,改用相同vo
2024-01-09 01:30:42 +08:00
min
4d68e5e747
CRM:【线索】创建线索时客户改为非必填
2024-01-09 01:27:53 +08:00
min
4237cfb4a9
CRM:【线索】线索转化为客户
2024-01-09 01:27:53 +08:00
YunaiV
63db275af1
✨ MALL:默认异步记录商品访问日志、访问次数
2024-01-08 19:14:09 +08:00
YunaiV
772b794374
📖 CRM:code review CRM 产品分类
2024-01-08 19:08:03 +08:00
芋道源码
dab0211385
!818 新增:CRM 产品分类和产品,接入操作日志,数据权限控制
...
Merge pull request !818 from 安浩浩/develop
2024-01-08 10:59:11 +00:00
anhaohao
4afff6185e
新增:CRM 产品分类和产品,接入操作日志,数据权限控制
2024-01-08 15:15:42 +08:00
YunaiV
2d1e57554d
📖 CRM:code review CRM 客户逻辑
2024-01-07 22:07:17 +08:00
芋道源码
3c7f63c356
!810 fix:修复 issues 提到的一些公众号上的问题
...
Merge pull request !810 from puhui999/develop
2024-01-07 13:23:53 +00:00
YunaiV
df9ff3fc5c
🐛 MALL:修复 issue 提到的 bug
2024-01-07 20:51:57 +08:00
芋道源码
761ab8a0e5
!809 修复BUG, 会员当前有等级的时候下订单会把当前等级给清空了。
...
Merge pull request !809 from 云扬四海/fix-member-level-bug-0102
2024-01-07 12:47:46 +00:00
芋道源码
d728c36c1e
!811 修复订单操作日志中快递公司名称模板与数据对不上的问题
...
Merge pull request !811 from 杨宇庆/N/A
2024-01-07 12:45:01 +00:00
YunaiV
19d5a0c2aa
📖 CRM:code review crm 联系人新增操作日志
2024-01-07 18:19:08 +08:00
芋道源码
450cd1baf1
!817 crm联系人新增操作日志
...
Merge pull request !817 from zyna/develop
2024-01-07 08:27:28 +00: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
zyna
44d828023c
crm联系人新增操作日志
2024-01-06 21:06:38 +08:00
YunaiV
a259e032e1
✨ MALL:增加商品列表的分类编号数组、商品编号的筛选
2024-01-06 20:42:32 +08:00
puhui999
68f5edaa88
CRM-客户: 完善一些 TODO
2024-01-06 15:28:10 +08:00
puhui999
3170e7fd97
CRM-客户: 简化客户公海配置 VO,完善相关操作日志
2024-01-06 13:48:22 +08:00
puhui999
9ce50ec369
CRM-客户限制配置:VO 简化
2024-01-06 13:04:30 +08:00
puhui999
269816446a
CRM-客户:日志表达式调整
2024-01-06 12:27:30 +08:00
YunaiV
f73cb540cf
✨ MALL:去除分销提现的银行配置
2024-01-05 22:46:35 +08:00
puhui999
a1c17b9b00
CRM-客户:日志表达式调整
2024-01-05 17:40:21 +08:00
owen
9203f485e9
Merge remote-tracking branch 'origin/develop' 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-05 15:40:29 +08:00
puhui999
d8bb55fc0b
CRM-客户:完善操作日志
2024-01-05 14:43:48 +08:00
YunaiV
3091a0882f
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2024-01-05 01:29:57 +08:00
YunaiV
ee250c74d6
✨ MALL:更新 uni-app + Vue3 实现
2024-01-05 01:28:39 +08:00
puhui999
ea4b4b8956
CRM-客户:精简 VO
2024-01-05 00:15:26 +08:00
puhui999
e6f4c1f0d5
Merge remote-tracking branch 'yudao/develop' into develop
2024-01-04 09:59:50 +08:00
YunaiV
a974d055b6
📖 CRM:【还款】code review 还款的代码,补全对应的 todo list
2024-01-04 09:41:58 +08:00
YunaiV
c6a9751511
📖 CRM:【合同】code review 合同的代码,补全对应的 todo list
2024-01-04 09:18:44 +08:00
YunaiV
2668e0cfeb
📖 CRM:【产品】code review 产品的代码,补全对应的 todo list
2024-01-04 08:01:04 +08:00
YunaiV
b9f1e8ffaf
📖 CRM:【联系人】code review 商机的代码,补全对应的 todo list
2024-01-04 07:53:00 +08:00
杨宇庆
9e895c8af1
修复订单操作日志中快递公司名称模板与数据对不上的问题
...
cn.iocoder.yudao.module.trade.enums.order.TradeOrderOperateTypeEnum中ADMIN_DELIVERY为deliveryName
Signed-off-by: 杨宇庆 <hiyyq@qq.com >
2024-01-03 18:50:23 +00:00
YunaiV
02324f9e60
✨ CRM:【联系人】统一字段
2024-01-03 23:30:25 +08:00
YunaiV
cff6e520ee
📖 CRM:【联系人】code review 联系人的代码,补全对应的 todo list
2024-01-03 22:07:20 +08:00
YunaiV
f8f5e525be
✨ CRM:新增跟进记录表
2024-01-03 20:56:28 +08:00
YunaiV
2e7c3e09a9
📖 CRM:code review 所有代码,补充对应 todo
2024-01-03 19:38:13 +08:00
YunaiV
d0df0e8e16
📖 CRM:【客户】优化锁定客户的逻辑实现
2024-01-03 13:06:49 +08:00
puhui999
e18ac461ea
fix: 修复公众号模块,当粉丝第一次关注的时候会出现错误(公众号粉丝不存在)
2024-01-03 11:11:20 +08:00
puhui999
90bdc1fd83
fix: 修复公众号统计接口字符串日期转 localDateTime 报错的问题
2024-01-03 10:09:41 +08:00
YunaiV
0253846fdf
Merge branch 'develop' of https://gitee.com/zh8790/ruoyi-vue-pro_develop into develop
...
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java
2024-01-02 22:21:14 +08:00
YunaiV
1da8006af3
📖 CRM:【客户】完善列表、新增、修改接口的 todo
2024-01-02 21:45:02 +08:00
YunaiV
9e3055ee1e
📖 CRM:code review 商机模块
2024-01-02 18:49:14 +08:00
yunlongn
39d26cc84d
会员当前有等级的时候下订单会把当前等级清空得bug修复
2024-01-02 15:33:13 +08:00
YunaiV
2d0537387b
Merge branch 'develop' of https://gitee.com/zyna/ruoyi-vue-pro into develop
...
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/CrmContactBusinessLinkServiceImpl.java
2023-12-30 21:43:04 +08:00
YunaiV
8c9b483ac5
📖 code review 操作日志的实现
2023-12-30 21:36:46 +08:00
芋道源码
9c3cf1d6b6
!806 操作日志:完善 code review 提到的问题
...
Merge pull request !806 from puhui999/develop
2023-12-30 12:14:40 +00: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
6c0978407b
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-dependencies/pom.xml
2023-12-30 19:23:35 +08:00
YunaiV
8a947990f4
🐛 升级 easyexcel 依赖,解决 JDK21 导出报错
2023-12-30 19:22:58 +08:00
YunaiV
a98d00a7fe
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2023-12-30 12:01:25 +08:00
YunaiV
2fb36563ec
🐛 修复 CacheUtils 异步缓存的 ThreadLocal 变量传递
2023-12-30 12:01:12 +08:00
YunaiV
81c726542b
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2023-12-30 11:24:15 +08:00
YunaiV
51968c4c19
🐛 腾讯云上传 bug
2023-12-30 11:23:59 +08:00
YunaiV
e35b8c45a0
🐛 REPORT:支持 SaaS 租户模式
2023-12-30 10:38:53 +08:00
YunaiV
baabebb5d1
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/ureport/config/UReportConfiguration.java
# yudao-server/src/main/resources/application-dev.yaml
# yudao-server/src/main/resources/application-local.yaml
2023-12-30 10:31:39 +08:00
YunaiV
078ead536b
🐛 REPORT:支持 SaaS 租户模式
2023-12-30 10:30:47 +08:00
YunaiV
be0e0f5d71
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2023-12-30 09:38:13 +08:00
YunaiV
9a03f1a796
🐛 BPM:多租户的工作流隔离
2023-12-30 09:38:01 +08:00
YunaiV
2ede505987
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
2023-12-29 22:35:26 +08:00
YunaiV
c48e0b9f48
Merge remote-tracking branch 'origin/master'
2023-12-29 22:34:50 +08:00
芋道源码
b5e19c63f7
!799 解决审批流自定义脚本无法获取流程变量
...
Merge pull request !799 from xiuuuu/master-jdk21
2023-12-29 14:34:06 +00:00
YunaiV
c38790655f
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2023-12-29 22:33:40 +08:00
YunaiV
d31a12aff7
🐛 修改了支付 demo 退款单匹配错误问题
2023-12-29 22:33:26 +08:00
芋道源码
8dc56cc3f5
!800 修改了支付demo退款单匹配错误问题
...
Merge pull request !800 from lynfgn/master
2023-12-29 14:30:54 +00:00
芋道源码
53a64272b9
!804 代码生成器Vue2,Excel导出下载修复
...
Merge pull request !804 from virtuecai/master
2023-12-29 14:27:21 +00:00
YunaiV
b0857aedbc
🐛 修复 ExcelUtils 报错
2023-12-29 22:23:07 +08:00
YunaiV
f0fd0c6677
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java
2023-12-29 22:21:45 +08:00
YunaiV
8de2eea1f7
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2023-12-29 22:21:11 +08:00
YunaiV
ed1b55fed7
🐛 文件路径 url 中文解码问题
2023-12-29 22:20:59 +08:00
芋道源码
b1be080e2f
!807 文件路径url中文解码问题
...
Merge pull request !807 from ccran/master
2023-12-29 14:19:48 +00:00
YunaiV
6d5fe962b7
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2023-12-29 21:53:03 +08:00
YunaiV
0f6f204320
🐛 修改 pay
模块>支付订单的同步 Job,查询指定创建时间前的待支付订单
2023-12-29 21:52:49 +08:00
芋道源码
06977644ce
!808 修改`pay 模块>支付订单的同步 Job,查询指定创建时间前的待支付订单
...
Merge pull request !808 from 骑士梦/qs
2023-12-29 13:50:18 +00:00
YunaiV
ff162e9c6c
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2023-12-29 21:45:55 +08:00
YunaiV
475e932aec
🐛 导出 Excel:Long 类型 ID 会丢失精度
2023-12-29 21:45:43 +08:00
wy
039a2b1278
支付订单的同步 Job,查询指定创建时间前的待支付订单
2023-12-29 16:47:28 +08:00
YunaiV
29405b9e41
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2023-12-29 12:59:31 +08:00
YunaiV
0861372755
🐛 修复修改短信渠道缓存没有更新
2023-12-29 12:59:20 +08:00
YunaiV
bc93325b9e
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-mybatis/pom.xml
2023-12-29 12:55:11 +08:00
YunaiV
829965e50a
🐛 fix(websocket): 修复 websocket 失效的问题
2023-12-29 12:54:52 +08:00
YunaiV
46e60d6b0a
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2023-12-29 12:49:13 +08:00
YunaiV
08ff391f78
🐛 Websocket 断开时,未删除会话缓存 bug
2023-12-29 12:48:36 +08:00
YunaiV
33c3686bef
✨ MALL:合并订单和售后订单的数量接口
2023-12-28 23:15:25 +08:00
YunaiV
1f3f3d789b
✨ MALL:营销文章增加 title 查询,简易解决常见问题、用户协议的编辑
2023-12-27 22:07:54 +08:00
YunaiV
c019136f07
✨ Member:增加积分记录的时间筛选
2023-12-27 20:39:14 +08:00
ccran
a1ee0991f1
fix:文件路径url中文解码
2023-12-27 12:52:49 +08:00
puhui999
e5377074d5
数据权限:完善 code review 提到的问题
2023-12-26 00:21:04 +08:00
puhui999
6950368991
操作日志:完善 code review 提到的问题
2023-12-26 00:04:20 +08:00
YunaiV
2f5afdb5c9
✨ Member:增加使用微信小程序 code 绑定手机号
2023-12-25 23:33:50 +08:00
YunaiV
5de6a8bd23
📖 code review:操作日志的实现
2023-12-25 21:40:16 +08:00
YunaiV
82a25474f6
Merge remote-tracking branch 'origin/develop' into develop
2023-12-25 08:43:38 +08:00
YunaiV
7542b6a78d
✨ Member:完善微信相关配置
2023-12-25 08:43:32 +08:00
芋道源码
525d41bad1
!805 重构操作日志记录实现;CRM-数据权限:完善数据权限补全管理员和公海相关情况处理逻辑
...
Merge pull request !805 from puhui999/develop
2023-12-25 00:42:51 +00:00
puhui999
7286f33a7f
Merge remote-tracking branch 'yudao/develop' into develop
2023-12-24 00:32:47 +08:00
puhui999
60e684c455
营销活动:获取商品近期参与的每个活动新增满减送和限时折扣活动
2023-12-24 00:32:17 +08:00
YunaiV
bd5c7d57dc
✨ Member:社交(三方)绑定接口,增加 openid 返回
2023-12-23 22:54:20 +08:00
YunaiV
7b482f5729
✨ Member:增加获取单个社交用户的接口
2023-12-23 21:48:33 +08:00
puhui999
e8ade5f1fe
crm:完善一些遗留的 TODO
2023-12-23 20:10:40 +08:00
YunaiV
59752d43b7
✨ Member:修复社交登录时,自动创建 user 后,未进行绑定的问题
2023-12-23 17:54:13 +08:00
YunaiV
d65c28d7f7
✨ Member:社交登录逻辑调整,如果登录时无用户,则自动创建用户,保持和各 App 统一逻辑
2023-12-23 09:59:58 +08:00
YunaiV
106c1ecf4c
📖 code review:店铺装修逻辑
2023-12-19 23:11:09 +08:00
owen
0944584029
商品:用户未登录时,不记录商品浏览记录
2023-12-19 21:44:04 +08:00
puhui999
a05d3bc1d1
Merge remote-tracking branch 'yudao/develop' into develop
2023-12-19 18:44:34 +08:00
puhui999
f56d8a2751
重构操作日志记录实现
2023-12-19 18:34:51 +08:00
puhui999
1fae341cae
重构操作日志记录实现
2023-12-19 16:29:13 +08:00
芋道源码
46f929ee8c
!792 修复代码生成模板文件中import的错误
...
Merge pull request !792 from 云开/fix-vm
2023-12-19 04:29:18 +00:00
芋道源码
1bdb389c89
!793 增加 东莞市下面的行政区信息
...
Merge pull request !793 from 风狗/N/A
2023-12-19 04:27:25 +00:00
YunaiV
cd45fc35ea
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
2023-12-19 12:27:11 +08:00
puhui999
55a215da44
CRM-数据权限:完善数据权限补全管理员和公海相关情况处理逻辑
2023-12-19 10:43:45 +08:00
puhui999
3e91ac73c4
CRM:完善数据分页查询条件构造 CrmQueryWrapperUtils
2023-12-19 10:29:41 +08:00
owen
9c341be4ae
Merge remote-tracking branch 'origin/develop' into develop
2023-12-19 09:53:35 +08:00
puhui999
3bab9748db
系统操作日志:使用自定义 starter 的方式重新集成 mzt-biz-log
2023-12-19 09:20:47 +08:00
YunaiV
09724adb8d
✨ PAY:增加充值日志分页
2023-12-18 23:04:42 +08:00
virtuecai
4cd36b2502
update yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm.
...
excel export download file bug fix
Signed-off-by: virtuecai <virtuecai@163.com >
2023-12-18 02:42:36 +00:00
YunaiV
b4612262b3
✨ MEMBER:修改密码时,发送验证码无需传递 mobile,通过 user 查询
2023-12-17 23:46:48 +08:00
YunaiV
e59f43408c
✨ Pay:增加钱包流水统计接口
2023-12-17 23:45:55 +08:00
owen
805190300f
Merge remote-tracking branch 'origin/develop' into develop
2023-12-17 19:34:44 +08:00
owen
0b7d42482f
统计:增加商品统计定时任务
2023-12-17 19:30:50 +08:00
zyna
bd76ea59a7
Merge remote-tracking branch 'origin/feature/crm' into develop
...
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/CrmContactController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contactbusinesslink/CrmContactBusinessLinkController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/CrmContactBusinessLinkServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/CrmContactServiceImpl.java
2023-12-17 17:47:46 +08:00
zyna
8434a8cd68
crm联系人商机功能修改
2023-12-17 17:33:52 +08:00
owen
f374e778bb
商品:增加商品浏览记录
2023-12-17 17:20:08 +08:00
owen
86a9c4bbf4
基础设施:优化vue3标准版API生成(导出xxAPI,方便IDE识别接口)
2023-12-17 11:16:29 +08:00
owen
de8f2800e5
基础设施:代码生成器javax替换为jakarta
2023-12-17 11:14:33 +08:00
YunaiV
ddb6fe7ec8
📖 CRM:code review 客户管理的数据权限、操作权限
2023-12-17 10:57:49 +08:00
owen
5851bcb479
Merge remote-tracking branch 'origin/develop' into develop
2023-12-17 10:05:13 +08:00
芋道源码
bada32750c
!795 CRM: 完善线索、商机、联系人、客户、合同、回款、回款计划数据权限
...
Merge pull request !795 from puhui999/develop
2023-12-17 01:54:29 +00:00
YunaiV
b0b6544887
✨ MALL:会员的个人信息,支持 sex 修改和返回
2023-12-17 09:51:24 +08:00
owen
4a007f0c98
统计:增加商品统计
2023-12-16 23:48:10 +08:00
YunaiV
e1bb546460
✨ MALL:1)优惠劵增加返回使用范围;2)商品分类增加 id 批量查询
2023-12-16 18:32:54 +08:00
lynfgn
8298896efd
修改了退款单号匹配错误问题
...
修改了退款单号匹配错误问题
Signed-off-by: lynfgn <707557870@qq.com >
2023-12-15 01:50:44 +00:00
Qiksy
35f796875d
fix 审批流-自定义规则脚本无法获取到流程变量(Process Variables)
2023-12-15 09:40:29 +08:00
YunaiV
07e610b3f7
🔥 MALL:移除商品收藏的批量操作接口,由前端自身 for 处理
2023-12-15 00:02:40 +08:00
YunaiV
8913572e51
🐛 修复创建订单评论的 scores、replyStatus 默认值未填写的问题
2023-12-14 22:00:04 +08:00
YunaiV
c1429dd3a0
✨ 增加售后日志列表 API
2023-12-14 20:07:35 +08:00
puhui999
daf4651a4f
系统操作日志:集成 mzt-biz-log 5,增加日志保存和查询接口
2023-12-14 18:45:13 +08:00
puhui999
289f0409d0
Merge remote-tracking branch 'yudao/develop' into develop
2023-12-13 17:52:32 +08:00
puhui999
3c74b22933
系统操作日志:集成 mzt-biz-log 4
2023-12-13 17:45:43 +08:00
owen
6de17c38fd
Merge remote-tracking branch 'origin/develop' into develop
2023-12-13 16:24:57 +08:00
puhui999
c74881c8f0
系统操作日志:集成 mzt-biz-log 3
2023-12-13 15:18:19 +08:00
puhui999
13d6c42a48
系统操作日志:集成 mzt-biz-log 2
2023-12-12 22:42:50 +08:00
puhui999
c5cc818a49
系统操作日志:集成 mzt-biz-log
2023-12-12 22:29:40 +08:00
puhui999
72cebfca14
CombinationRecordApiImpl 重命名一下 recordService 改为 combinationRecordService 解决和 mzt-biz-log 组件的 bean 冲突
2023-12-12 16:23:48 +08:00
YunaiV
1e5b0a1c0d
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2023-12-12 12:21:55 +08:00
YunaiV
a7189e7425
✨ 考虑到大家的接受度,master 还是保持 jdk8 版本(稳定),master-jdk21 使用 jdk21 版本(创新)
2023-12-12 12:21:38 +08:00
YunaiV
ff00748d11
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2023-12-12 12:20:32 +08:00
YunaiV
d2c071bbb6
✨ 考虑到大家的接受度,master 还是保持 jdk8 版本(稳定),master-jdk21 使用 jdk21 版本(创新)
2023-12-12 12:17:50 +08:00
YunaiV
e71867683e
📖 MALL:调整接口文档的说明
2023-12-12 12:11:28 +08:00
puhui999
8fa8f2890b
CRM: 线索、联系人、回款、回款计划新增数据权限转移
2023-12-11 17:36:09 +08:00
puhui999
c234f5b5f8
CRM: 完善数据权限
2023-12-11 16:48:21 +08:00
puhui999
63431082e5
member: 完善连续签到 review 提到的问题
2023-12-11 16:37:14 +08:00
puhui999
1ac68aca97
CRM-回款计划:添加数据权限
2023-12-11 15:56:12 +08:00
puhui999
e4d3175f06
CRM-数据权限:完善 review 提到的问题
2023-12-11 12:02:41 +08:00
风狗
a6a9f4e3a6
增加 东莞市下面的行政区信息
...
Signed-off-by: 风狗 <909275705@qq.com >
2023-12-11 02:47:22 +00:00
kyle
6a8baff080
fix: 修复vm文件中,import依赖路径的错误
2023-12-11 09:28:43 +08:00
owen
1316f92081
Merge remote-tracking branch 'origin/develop' into develop
2023-12-09 21:38:45 +08:00
Joey
9bac10c6f7
完善客户锁定/解锁接口,校验锁定上限
2023-12-09 17:25:47 +08:00
YunaiV
a8c14614ab
✨ 增加《迁移功能到精简版》的说明地址
2023-12-09 15:39:29 +08:00
YunaiV
5c60202c14
🐛 移除多余的 yudao-spring-boot-starter-security 依赖
2023-12-09 15:39:29 +08:00
YunaiV
23df8633f4
📖 CRM:code review 数据权限的实现
2023-12-09 10:50:47 +08:00
芋道源码
8f578a9a82
!789 完善数据权限,新增权限关联、场景分页查询,新增权限关联批量查询
...
Merge pull request !789 from puhui999/develop
2023-12-09 01:47:17 +00:00
YunaiV
517f3bc187
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk8
2023-12-09 01:10:09 +08:00
YunaiV
8c67d1d0ba
✨ 增加《迁移功能到精简版》的说明地址
2023-12-09 01:05:25 +08:00
puhui999
7c54affb16
CRM-合同:完善数据权限,新增权限关联、场景分页查询,新增权限关联批量查询
2023-12-08 22:43:45 +08:00
YunaiV
57b8411f03
Merge remote-tracking branch 'origin/master-jdk8' into master-jdk8
2023-12-08 22:19:01 +08:00
YunaiV
72865b5ebb
⬇️ 保持 JDK8 + Spring Boot 2.7.18 持续维护
2023-12-08 22:17:52 +08:00
YunaiV
802ac89b73
⬇️ 保持 JDK8 + Spring Boot 2.7.18 持续维护
2023-12-08 22:17:52 +08:00
YunaiV
10d245afc3
🐛 移除多余的 yudao-spring-boot-starter-security 依赖
2023-12-08 22:17:13 +08:00
puhui999
f69a18fd23
CRM-联系人:完善数据权限,新增权限关联、场景分页查询,新增权限关联批量查询
2023-12-08 18:08:41 +08:00
puhui999
490418a1fc
CRM-线索:完善数据权限,新增权限关联、场景分页查询,新增权限关联批量查询
2023-12-08 17:52:02 +08:00
puhui999
9ea0607339
CRM-商机:完善数据权限,新增权限关联、场景分页查询,新增权限关联批量查询
2023-12-08 17:16:34 +08:00
puhui999
5c395fc1c4
CRM: 完善 code review 数据权限提到的问题,重新封装 CrmQueryWrapperUtils
2023-12-08 15:27:58 +08:00
owen
f8604e17a1
营销:修正文章字段名、接口方法名
2023-12-08 10:20:16 +08:00
YunaiV
8b80c9f415
Merge remote-tracking branch 'origin/master-jdk8' into master-jdk8
2023-12-07 23:23:03 +08:00
YunaiV
a0d72ffb00
⬇️ 保持 JDK8 + Spring Boot 2.7.18 持续维护
2023-12-07 23:22:46 +08:00
YunaiV
7e806c65dc
⬇️ 保持 JDK8 + Spring Boot 2.7.18 持续维护
2023-12-07 23:21:23 +08:00
YunaiV
db62d70f3f
⬆️ JDK21 + Spring Boot 3.2.0 晋升 master 分支,开启 2.0.0 版本
2023-12-07 23:21:05 +08:00
YunaiV
9574b23d9a
Merge remote-tracking branch 'origin/master-jdk8' into master-jdk8
2023-12-07 23:19:01 +08:00
YunaiV
8f2a156f30
⬇️ 保持 JDK8 + Spring Boot 2.7.18 持续维护
2023-12-07 23:18:21 +08:00
YunaiV
0be3947199
⬆️ JDK21 + Spring Boot 3.2.0 晋升 master 分支,开启 2.0.0 版本
2023-12-07 23:17:02 +08:00
YunaiV
a321805ff0
⬇️ 保持 JDK8 + Spring Boot 2.7.18 持续维护
2023-12-07 23:16:45 +08:00
YunaiV
59ff4be03d
⬇️ 保持 JDK8 + Spring Boot 2.7.18 持续维护
2023-12-07 23:11:20 +08:00
YunaiV
3cd27c83d2
⬆️ JDK21 + Spring Boot 3.2.0 晋升 master 分支,开启 2.0.0 版本
2023-12-07 20:58:32 +08:00
YunaiV
98697ee075
⬆️
2023-12-07 20:48:11 +08:00
芋道源码
a8e8c14ab3
!787 合并最新商城代码
...
Merge pull request !787 from 芋道源码/feature/mall_product
2023-12-07 11:48:54 +00:00
YunaiV
2ad27a487f
Merge remote-tracking branch 'origin/master'
2023-12-07 07:37:39 +08:00
YunaiV
a9ae7b0865
✅ 完善 UReport2 的集成
2023-12-07 07:37:32 +08:00
YunaiV
30bf72f50e
🚚 将运维相关的统一到 script 目录下,简化根目录
2023-12-07 07:36:33 +08:00
YunaiV
77e8600040
🚚 将运维相关的统一到 script 目录下,简化根目录
2023-12-07 07:36:33 +08:00
YunaiV
39b4cac33f
🔥 gitattributes 文件
2023-12-07 07:36:33 +08:00
YunaiV
b8f8cab699
🐛 修复 Spring Cache Redis 单冒号,而不是双 :: 冒号,避免 Redis Desktop Manager 多余空格
2023-12-07 07:36:33 +08:00
YunaiV
7cbdd1670b
🐛 禁用 CodegenEngineVue3Test 暂时,避免单测报错
2023-12-07 07:36:33 +08:00
puhui999
6b1f94f122
代码生成测试:生成测试文件
2023-12-07 07:36:33 +08:00
puhui999
ae98d17473
代码生成测试:系统不一样生成的文件也有差异,那就各自生成各自。新增根据操作系统动态获取测试文件资源路径
2023-12-07 07:36:33 +08:00
YunaiV
090b1bcd45
🚚 将运维相关的统一到 script 目录下,简化根目录
2023-12-06 22:15:08 +08:00
YunaiV
f9fede3ea7
🚚 将运维相关的统一到 script 目录下,简化根目录
2023-12-06 22:11:12 +08:00
YunaiV
ea59975d54
🔥 gitattributes 文件
2023-12-06 22:03:54 +08:00
YunaiV
85994b6920
🐛 修复 Spring Cache Redis 单冒号,而不是双 :: 冒号,避免 Redis Desktop Manager 多余空格
2023-12-06 21:30:11 +08:00
YunaiV
c9482452e3
🐛 禁用 CodegenEngineVue3Test 暂时,避免单测报错
2023-12-06 21:27:13 +08:00
芋道源码
7038db5785
!785 代码生成:完善单元测试
...
Merge pull request !785 from puhui999/master
2023-12-06 13:10:41 +00:00
YunaiV
6a4449e03f
Merge remote-tracking branch 'origin/feature/ureport2' into feature/ureport2
...
# Conflicts:
# yudao-dependencies/pom.xml
2023-12-06 21:03:08 +08:00
YunaiV
076bf13687
📈 REPORT:code review ureport2 实现
2023-12-06 21:02:26 +08:00
liuhongfeng
0d3efe4f80
【优化】ureport2菜单,初始化数据,按照规范重新进行命名处理
2023-12-06 21:02:26 +08:00
YunaiV
5e9cbb9cad
report:code review ureport 的集成
2023-12-06 21:02:26 +08:00
liuhongfeng
9350523b35
【新增】ureport2菜单,初始化数据
2023-12-06 21:02:26 +08:00
liuhongfeng
5894d2be01
【修改】ureport2 集成的SQL语句,并适配数据库存储方式
2023-12-06 21:02:26 +08:00
liuhongfeng
7c43c3a2b1
【新增】ureport2 集成的SQL语句
2023-12-06 21:02:26 +08:00
liuhongfeng
8507fa9172
【新增】ureport2 集成
2023-12-06 21:02:25 +08:00
YunaiV
9d10c74599
📈 REPORT:code review ureport2 实现
2023-12-06 21:00:31 +08:00
YunaiV
5bf7cd396f
Merge remote-tracking branch 'origin/master'
2023-12-06 20:28:59 +08:00
YunaiV
9451287264
✨ CRM:同步最新功能,基本跑通客户信息的维护
2023-12-06 20:28:53 +08:00
胡桃云
160e3584d3
商城-商品库存为零可以展示商品列表
2023-12-06 20:27:23 +08:00
芋道源码
9eb4f49b4d
!773 【优化】ureport2菜单,初始化数据,按照规范重新进行命名处理
...
Merge pull request !773 from souvc/feature/ureport2
2023-12-06 12:24:39 +00:00
芋道源码
f333aa38c1
!777 商城模块,商品库存为零也可显示商品信息
...
Merge pull request !777 from 奕泽云/master
2023-12-06 12:17:00 +00:00
YunaiV
3707662187
📈 CRM:code review 数据权限
2023-12-06 20:04:15 +08:00
YunaiV
d430063eec
Merge remote-tracking branch 'puhui/feature/crm' into feature/crm
...
# Conflicts:
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java
2023-12-06 19:33:04 +08:00
YunaiV
a36fe8c40e
📈 CRM:code review 联系人商机功能
2023-12-06 19:26:45 +08:00
芋道源码
21a3870c00
!775 crm联系人商机功能
...
Merge pull request !775 from zyna/feature/crm
2023-12-06 05:57:51 +00:00
YunaiV
3678752a61
🔨 CRM:优化产品分类代码的实现
2023-12-06 12:56:44 +08:00
YunaiV
c94f71a3df
🔨 CRM:优化产品分类代码的实现
2023-12-06 12:56:35 +08:00
puhui999
a9b2656971
代码生成测试:生成测试文件
2023-12-06 00:30:52 +08:00
puhui999
e0bdc4f4c1
代码生成测试:系统不一样生成的文件也有差异,那就各自生成各自。新增根据操作系统动态获取测试文件资源路径
2023-12-06 00:30:18 +08:00
YunaiV
73e76ab453
Merge remote-tracking branch 'origin/master' into feature/crm
...
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/contract/ContractServiceImplTest.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictDataController.java
2023-12-05 22:42:53 +08:00
YunaiV
a11d5dc5f1
🔨 CRM:优化产品代码的实现
2023-12-05 22:41:58 +08:00
puhui999
d59d1428d7
Merge remote-tracking branch 'yudao/feature/crm' into feature/crm
2023-12-05 22:25:49 +08:00
芋道源码
c463f831f4
!776 【CRM:优化产品以及产品分类】
...
Merge pull request !776 from ZanGe丶/feature/crm
2023-12-05 12:15:54 +00:00
芋道源码
9a898a81fd
!783 ✅ 增加 system 和 infra 的代码覆盖率,提升稳定性
...
Merge pull request !783 from 芋道源码/feature/vo-optimize
2023-12-05 12:08:05 +00:00
YunaiV
c69fbe540a
✅ 增加 codegen 模块的单测覆盖率
2023-12-05 20:00:29 +08:00
puhui999
455a4ebc7b
CRM-客户:实现数据权限、场景检索和公海数据分页查询
2023-12-05 15:04:53 +08:00
puhui999
78165f2161
CRM: 新增 CRM 分页查询工具类,实现通用构造 crm 数据类型数据分页查询条件
2023-12-05 15:03:22 +08:00
puhui999
b2621c8891
CRM-客户: 新增关注和取消关注客户接口
2023-12-05 11:04:40 +08:00
puhui999
9c1687dc25
CRM: 新增关注数据模块
2023-12-05 11:00:34 +08:00
YunaiV
a62399fbca
✅ 增加 infra logger 模块的单测覆盖率
2023-12-04 20:43:23 +08:00
YunaiV
da829f7cf5
✅ 增加 sms/tenant/senstiveword 模块的单测覆盖率
2023-12-04 13:14:18 +08:00
YunaiV
c2e9ecf7be
✅ 增加 social 模块的单测覆盖率
2023-12-04 09:54:47 +08:00
胡桃云
6f237a10b5
商城-商品库存为零可以展示商品列表
2023-12-03 23:08:50 +08:00
YunaiV
f656888965
✅ 增加 permission 模块的单测覆盖率
2023-12-03 21:55:17 +08:00
ZanGe丶
d2e965fb02
【CRM:优化产品以及产品分类】
2023-12-03 21:33:01 +08:00
YunaiV
4dab6d0217
✅ 增加 dept 模块的单测覆盖率
2023-12-03 21:26:43 +08:00
YunaiV
dab751dc74
✅ 增加 dict 模块的单测覆盖率
2023-12-03 21:15:06 +08:00
zyna
910bc09e19
crm联系人商机功能
2023-12-03 20:01:00 +08:00
YunaiV
319c73feaf
🐛 修复微信小程序的一键登录时,缺少 state 参数
2023-12-03 19:15:21 +08:00
芋道源码
47b77d7360
!774 简化 system 和 infra 大模块模块的 VO
...
Merge pull request !774 from 芋道源码/feature/vo-optimize
2023-12-03 10:58:57 +00:00
YunaiV
30fef09eee
🔧 简化 errorLog 和 accessLog 模块的 VO
2023-12-03 18:32:47 +08:00
YunaiV
e541fe6324
🔧 简化 job 模块的 VO
2023-12-03 18:11:45 +08:00
liuhongfeng
c7386d9e04
【优化】ureport2菜单,初始化数据,按照规范重新进行命名处理
2023-12-03 17:25:32 +08:00
YunaiV
35d171b1d9
🔧 简化 file 模块的 VO
2023-12-03 10:33:43 +08:00
YunaiV
fc3bb430c3
🔧 简化 dataSourceConfig 模块的 VO
2023-12-03 10:06:56 +08:00
YunaiV
645e6f3cc8
🔧 简化 config 模块的 VO
2023-12-03 09:57:34 +08:00
YunaiV
42dc4b6194
🔧 简化 user 模块的 VO
2023-12-03 01:02:59 +08:00
YunaiV
d4cf945af7
🔧 简化 tenant 模块的 VO
2023-12-02 23:42:57 +08:00
YunaiV
5bb8fdca7e
🔧 简化 social 模块的 VO
2023-12-02 23:01:15 +08:00
YunaiV
e61ecb63dd
🔧 简化 sms 模块的 VO
2023-12-02 22:39:23 +08:00
YunaiV
8b67111733
🔧 简化 sensitiveWord 模块的 VO
2023-12-02 21:59:08 +08:00
YunaiV
2dd835893a
🔧 简化 permission 模块的 VO
2023-12-02 21:47:03 +08:00
YunaiV
73d53dbaad
🔧 简化 oauth2 模块的 VO
2023-12-02 20:48:51 +08:00
YunaiV
9aed06af5d
🔧 简化 notify 模块的 VO
2023-12-02 20:25:10 +08:00
YunaiV
5eb5472dec
🔧 简化 notice 模块的 VO
2023-12-02 20:07:54 +08:00
YunaiV
b77b6322e1
🔧 简化 mail 模块的 VO
2023-12-02 19:54:58 +08:00
YunaiV
4225db217d
🔧 简化 loginLog 和 operateLog 模块的 VO
2023-12-02 19:25:25 +08:00
YunaiV
8eb04d6805
🔧 简化 errorCode 模块的 VO
2023-12-02 18:40:31 +08:00
YunaiV
c493397653
🔧 简化 dictType 和 dictData 模块的 VO
2023-12-02 18:21:40 +08:00
YunaiV
a9c8f6c8e9
🔧 简化 post 和 dept 模块的 VO
2023-12-02 10:18:27 +08:00
YunaiV
72969e921e
crm: 增加基于客户查询回款计划分页
2023-12-01 22:46:13 +08:00
YunaiV
f02b9464bd
crm: 增加基于客户查询回款分页
2023-12-01 19:37:44 +08:00
YunaiV
a5c59c6079
1.9.0 版本发布
2023-12-01 07:37:38 +08:00
YunaiV
8ecc8cddba
1.9.0 版本发布
2023-11-30 21:22:59 +08:00
YunaiV
eeeafcc10c
1.9.0 版本发布
2023-11-30 21:14:13 +08:00
芋道源码
fa1aa51c96
!771 同步最新的 CRM 代码
...
Merge pull request !771 from 芋道源码/feature/crm
2023-11-30 12:50:49 +00:00
YunaiV
bc6cdecb23
Merge remote-tracking branch 'origin/feature/sub-table'
2023-11-30 20:49:37 +08:00
芋道源码
58b901a8c1
!769 fix:修复 vue2 代码生成后 api 导入路径不正确的问题
...
Merge pull request !769 from puhui999/feature/sub-table
2023-11-30 12:48:51 +00:00
YunaiV
db03b10d24
crm: 增加基于客户查询商机分页
2023-11-30 20:21:39 +08:00
YunaiV
2d9f5cc4d0
crm: 1)调整合同的 CRM 前缀;2)增加基于客户查询合同分页
2023-11-30 19:12:37 +08:00
YunaiV
fe4b51b9ad
crm: 完善数据权限的逻辑
2023-11-30 13:42:36 +08:00
YunaiV
53b8e37f36
crm: 增加联系人,基于客户的读取接口
2023-11-29 22:33:47 +08:00
puhui999
103e38b82c
Merge remote-tracking branch 'yudao/feature/sub-table' into feature/sub-table
2023-11-29 18:57:31 +08:00
puhui999
25595a13f4
fix:修复 vue2 代码生成后 api 导入路径不正确的问题
2023-11-29 18:57:09 +08:00
YunaiV
1a93e3a110
crm:code review 联系人
2023-11-28 21:07:23 +08:00
芋道源码
591bc36737
!763 crm联系人review修改
...
Merge pull request !763 from zyna/feature/crm
2023-11-28 13:03:04 +00:00
YunaiV
36a51b68d9
crm:code review 数据权限
2023-11-28 20:36:57 +08:00
芋道源码
6f882ca24e
!762 crm:完善 code review 数据权限提到的问题
...
Merge pull request !762 from puhui999/feature/crm
2023-11-28 12:33:19 +00:00
芋道源码
7724d6e830
!765 Vue2 + Element UI 代码生成器
...
Merge pull request !765 from 芋道源码/feature/sub-table
2023-11-28 12:28:30 +00:00
芋道源码
d3a565f011
!761 代码生成:vue2 代码模版格式调整;代码生成:准备 CodegenEngineVue2Test 所需测试文件
...
Merge pull request !761 from puhui999/feature/sub-table
2023-11-28 12:26:50 +00:00
芋道源码
b79f6a8859
!764 返回使用过优惠券逻辑---->状态字段取错了
...
Merge pull request !764 from Ai3_刘小龙/N/A
2023-11-28 12:25:05 +00:00
Ai3_刘小龙
7b587a79ca
返回使用过优惠券逻辑---->状态字段取错了
...
Signed-off-by: Ai3_刘小龙 <wisty0317@163.com >
2023-11-28 09:16:58 +00:00
puhui999
79600774ec
crm-客户:分页查询 mapper 还是得拆成两个,怎么查逻辑交给 service 去做处理
2023-11-28 14:27:36 +08:00
zyna
1580789334
crm联系人review修改
2023-11-27 23:42:04 +08:00
puhui999
6c536caad4
crm:完善 code review 数据权限提到的问题
2023-11-27 21:47:56 +08:00
puhui999
c437201236
代码生成:CodegenEngineVue2Test 所需测试文件
2023-11-27 21:15:32 +08:00
puhui999
b4d16b368d
Merge remote-tracking branch 'yudao/feature/sub-table' into feature/sub-table
2023-11-27 21:07:45 +08:00
puhui999
5ebebf1579
代码生成:vue2 代码模拟格式调整
2023-11-27 21:05:41 +08:00
YunaiV
fd2af50202
Merge remote-tracking branch 'origin/feature/crm' into feature/crm
...
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java
2023-11-27 20:52:44 +08:00
YunaiV
492adfe8e5
crm:code review 数据权限
2023-11-27 20:51:51 +08:00
YunaiV
455f8e49fb
crm:code review 联系人
2023-11-27 20:42:35 +08:00
zyna
16084d468d
crm联系人删除多余文件
2023-11-27 20:42:35 +08:00
zyna
3f3899f5d3
crm联系人review修改,新增地区字段
2023-11-27 20:42:34 +08:00
YunaiV
d6d4e50c4b
crm:code review 联系人
2023-11-27 20:28:18 +08:00
芋道源码
4e897f3a9b
!755 crm联系人review修改
...
Merge pull request !755 from zyna/feature/crm
2023-11-27 12:06:53 +00:00
YunaiV
df51a678eb
code review:vue2 主子表的生成
2023-11-27 17:09:53 +08:00
芋道源码
12bcee2a72
!734 代码生成:重构 vue2 代码生成模版,使用 async await 优化代码层次,适配树表和主子表
...
Merge pull request !734 from puhui999/feature/sub-table
2023-11-27 08:53:41 +00:00
puhui999
6d228828f4
application-local.yaml 恢复
2023-11-27 16:34:55 +08:00
puhui999
4f42e7ca68
代码生成:Vue2 界面:修正 $refs
2023-11-27 16:31:06 +08:00
puhui999
86160f40de
代码生成:重构 vue2 代码生成模版,使用 async await 优化代码层次
2023-11-27 16:30:30 +08:00
puhui999
4a51b20155
crm-客户:修复合并差异
2023-11-27 12:14:32 +08:00
puhui999
f87d73724b
Merge remote-tracking branch 'yudao/feature/crm' into feature/crm
...
# Conflicts:
# yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/business/BusinessStatusTypeServiceImplTest.java
2023-11-27 12:12:52 +08:00
puhui999
8f06d02293
crm-客户:完善 code review 提到的问题
2023-11-27 12:00:53 +08:00
puhui999
7f569f3299
crm-数据权限:完善数据权限
2023-11-27 10:55:32 +08:00
zyna
930b5a8dd5
crm联系人删除多余文件
2023-11-26 22:03:06 +08:00
zyna
d2c6c285f7
crm联系人review修改,新增地区字段
2023-11-26 22:00:14 +08:00
YunaiV
f766474ff4
crm:code review 客户配置
2023-11-26 19:57:40 +08:00
芋道源码
18c8a11a89
!751 feat: 客户配置 review 修改
...
Merge pull request !751 from wanwan/feature/crm
2023-11-26 11:46:53 +00:00
YunaiV
e4378e5628
修复 WxPayOrderNotifyV3Result 的重命名
2023-11-26 19:24:11 +08:00
芋道源码
b580356051
!753 优化对 dameng 工作流的适配
...
Merge pull request !753 from 芋道源码/feature/bpm-dameng
2023-11-26 11:21:19 +00:00
YunaiV
81f1800f40
优化对 dameng 工作流的适配
2023-11-26 19:19:31 +08:00
芋道源码
d07869f461
!723 feat: 达梦flowable 6.8适配
...
Merge pull request !723 from dhb52/master
2023-11-26 10:55:13 +00:00
YunaiV
a1e6348a37
移除 weixin starter 组件,直接改成 wxjava starter
2023-11-26 17:08:16 +08:00
芋道源码
ee25b8aedb
!752 使用 justauth 替代现有 yudao-spring-boot-starter-biz-social 依赖,减少 starter
...
Merge pull request !752 from 芋道源码/feature/justauth-op
2023-11-26 03:42:16 +00:00
YunaiV
0bf24c6d16
使用 spring-boot-starter-justauth 替代原本 social starter
2023-11-26 11:39:29 +08:00
Wanwan
fbf864b6b4
fix: 修复客户公海配置设置为不启用时保存字段没有清空的 bug
2023-11-26 02:00:23 +08:00
Wanwan
033f13c6ad
feat: 客户配置 review 修改
2023-11-26 00:27:09 +08:00
Wanwan
ab3748d102
feat: 客户配置 review 修改
2023-11-25 23:54:08 +08:00
YunaiV
f2ff30e465
优化 error-code 加载逻辑,失败不影响启动
2023-11-25 23:00:31 +08:00
YunaiV
6d7491fb02
!69fix(system): 修复更新账号时岗位为空时发生的空指针异常
2023-11-25 22:34:08 +08:00
YunaiV
6b3a54c8df
!69fix(system): 修复更新账号时岗位为空时发生的空指针异常
2023-11-25 22:28:05 +08:00
YunaiV
bb06c11405
更新 README.md,增加主子表、WebSocket 的说明
2023-11-25 22:26:23 +08:00
YunaiV
c7ab595460
简化 yudao-ui 目录
2023-11-25 22:05:57 +08:00
YunaiV
bd91276155
websocket:重新封装 websocket 组件,支持 token 认证,并增加 WebSocketMessageListener 方便处理消息
2023-11-25 20:44:36 +08:00
芋道源码
ae763f727f
!749 增加 WebSocket 的全新支持
...
Merge pull request !749 from 芋道源码/feature/websocket
2023-11-25 11:31:02 +00:00
YunaiV
63f9bcb0a3
crm:code review 商机类型、状态
2023-11-25 12:02:03 +08:00
YunaiV
3e9eb59de3
crm:code review 数据权限的实现
2023-11-25 10:55:47 +08:00
YunaiV
899e40deb9
crm:code review 数据权限的实现
2023-11-25 10:02:55 +08:00
YunaiV
d1579499f4
Merge remote-tracking branch 'ljlleo/feature/crm' into feature/crm
...
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/customer/CrmCustomerMapper.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java
2023-11-24 23:58:49 +08:00
YunaiV
8e480162c4
Merge remote-tracking branch 'origin/feature/crm' into feature/crm
...
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/customer/CrmCustomerMapper.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java
2023-11-24 23:55:10 +08:00
YunaiV
13e5d70be7
crm:解决冲突
2023-11-24 23:54:23 +08:00
YunaiV
ec67e63c67
crm:code review 客户的公海领取和分配
2023-11-24 23:53:28 +08:00
YunaiV
1842549634
crm:code review 客户的公海领取和分配
2023-11-24 23:11:58 +08:00
芋道源码
9a5f6f13b4
!739 客户的公海领取和分配,按照要修调整代码格式
...
Merge pull request !739 from QingX/feature/crm
2023-11-24 14:58:23 +00:00
YunaiV
fb8f5b6339
report:code review ureport 的集成
2023-11-24 22:18:59 +08:00
芋道源码
8bcc732c33
!744 【新增】ureport2 集成
...
Merge pull request !744 from souvc/master
2023-11-24 12:41:21 +00:00
芋道源码
d4bc6ce52d
!742 mysql脚本的菜单数据中promotion:combination-activity:query后多个tab
...
Merge pull request !742 from PeterChina/master-pr
2023-11-24 11:57:46 +00:00
YunaiV
4a3aa1fa08
营销:适配商城装修组件【优惠券】
2023-11-24 19:55:07 +08:00
芋道源码
3021b405d2
!743 商城装修
...
Merge pull request !743 from 疯狂的世界/feature/mall_product
2023-11-24 11:52:32 +00:00
YunaiV
a597eb17d4
websocket:修复 RedisWebSocketMessageConsumer 注册失效的问题
2023-11-24 18:56:19 +08:00
ljlleo
4e1d9d6292
商机、商机状态类型和商机状态
2023-11-24 14:24:04 +08:00
YunaiV
0233b092b8
websocket:重新封装 websocket 组件,支持 sender 广播
2023-11-24 00:32:52 +08:00
dhb52
be20178f12
Merge remote-tracking branch 'upstream/master'
2023-11-23 22:44:03 +08:00
puhui999
0d821d705d
crm-客户管理:完善客户、公海客户分页查询
2023-11-23 10:12:50 +08:00
YunaiV
1941a7b3e6
websocket:重新封装 websocket 组件,支持 token 认证,并增加 WebSocketMessageListener 方便处理消息
2023-11-22 23:17:50 +08:00
YunaiV
6a61db8508
security: query string 支持传递 token 参数,解决 ws token 认证
2023-11-22 23:02:59 +08:00
liuhongfeng
6b86793b9d
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2023-11-22 22:31:17 +08:00
liuhongfeng
05369a36a3
【新增】ureport2菜单,初始化数据
2023-11-22 22:15:08 +08:00
liuhongfeng
770086ac5b
【修改】ureport2 集成的SQL语句,并适配数据库存储方式
2023-11-22 22:13:05 +08:00
puhui999
b41d469d46
crm-客户管理:新增客户放入公海和领取公海客户
2023-11-22 18:44:49 +08:00
puhui999
77d7bcc73f
crm-数据权限:完善数据权限 code review 提到的问题
2023-11-22 17:56:13 +08:00
puhui999
780526f484
crm-数据权限:完善数据权限相关操作接口
2023-11-22 17:27:00 +08:00
owen
49accc946d
营销:适配商城装修组件【优惠券】
2023-11-22 16:58:01 +08:00
JiangQi
0955ad0fc0
promotion:combination-activity:query后多个tab
2023-11-22 09:22:40 +08:00
芋道源码
41c324acc3
!741 sms:移除 SmsCodeMapping + SmsCommonResult,简化短信的封装
...
Merge pull request !741 from 芋道源码/feature/sms-op
2023-11-21 15:34:58 +00:00
dhb52
edea17e781
Merge remote-tracking branch 'upstream/master'
2023-11-21 23:19:49 +08:00
YunaiV
7506a1b012
sms:移除 sendCode、sendMsg 字段
2023-11-21 22:53:57 +08:00
YunaiV
6f135303d8
sms:移除 SmsCodeMapping + SmsCommonResult,简化短信的封装
2023-11-21 22:14:07 +08:00
puhui999
3d2022e31f
代码生成:完善 vue2 代码生成单元测试
2023-11-21 16:22:16 +08:00
puhui999
c50d27f5cb
代码生成:完善 vue2 模版,适配树表和主子表
2023-11-21 11:58:04 +08:00
puhui999
80db28ee5b
代码生成:重构 vue2 模版,适配树表和主子表
2023-11-21 10:49:43 +08:00
liuhongfeng
b5a667cb9c
【新增】ureport2 集成的SQL语句
2023-11-20 23:31:21 +08:00
YunaiV
822e441765
使用 justauth 替代现有 yudao-spring-boot-starter-biz-social 依赖,减少 starter
2023-11-20 23:27:41 +08:00
liuhongfeng
a0e3cb11ab
【新增】ureport2 集成
2023-11-20 23:14:52 +08:00
puhui999
737ea4635c
Merge remote-tracking branch 'yudao/feature/sub-table' into feature/sub-table
...
# Conflicts:
# sql/mysql/ruoyi-vue-pro.sql
2023-11-20 09:57:24 +08:00
xiaqing
87778f7fd9
客户的公海领取和分配,按照要修调整代码格式
2023-11-19 23:23:52 +08:00
YunaiV
827897807f
提升启动速度
2023-11-19 18:46:16 +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
7f75f0abfc
bpm:code review 指定审批人
2023-11-19 18:28:00 +08:00
YunaiV
6fd8d0095c
Merge branch 'feature/bpm-earlyAssignee' of https://gitee.com/ykhcool/ruoyi-vue-pro
2023-11-19 18:17:28 +08:00
YunaiV
c7a21b2a64
mall:优化商品收藏的分页接口
2023-11-19 00:58:12 +08:00
芋道源码
667957c941
!737 【修改】最新的SQL字符编码不一致导致创建表失败,修改utf8mb4_0900_ai_ci=》utf8mb4_unicode_ci
...
Merge pull request !737 from souvc/master
2023-11-18 16:57:03 +00:00
芋道源码
867293a4f9
!724 会员中心商品收藏
...
Merge pull request !724 from niou233/feature/mall_product_org
2023-11-18 16:40:00 +00:00
YunaiV
6270975902
优化启动速度
2023-11-19 00:37:30 +08:00
芋道源码
7e1ffcbc0c
!738 同步部分 CRM 的实现
...
Merge pull request !738 from 芋道源码/feature/crm
2023-11-18 16:35:45 +00:00
YunaiV
f589881de5
code review:客户的分配和领取
2023-11-19 00:05:06 +08:00
YunaiV
e519b41244
Merge branch 'feature/crm' of https://gitee.com/SummerQing/ruoyi-vue-pro into feature/crm
...
# Conflicts:
# yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java
2023-11-18 23:56:08 +08:00
YunaiV
86050d411b
code review:权限模块
2023-11-18 23:45:24 +08:00
liuhongfeng
58ede7d69c
【修改】最新的SQL字符编码不一致导致创建表失败,修改utf8mb4_0900_ai_ci=》utf8mb4_unicode_ci
2023-11-18 23:30:24 +08:00
YunaiV
716b081464
crm:合并最新的数据权限
2023-11-18 22:31:05 +08:00
dhb52
677a6d348f
Merge remote-tracking branch 'upstream/master'
2023-11-18 22:28:24 +08:00
YunaiV
8c9873c425
Merge branch 'feature/crm' of https://gitee.com/puhui999/ruoyi-vue-pro into feature/crm
...
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/contact/ContactConvert.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/customer/CrmCustomerConvert.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/ContactServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/dept/PostConvert.java
2023-11-18 22:25:13 +08:00
YunaiV
8c9c91f0ca
crm:code review 配置管理
2023-11-18 22:12:12 +08:00
YunaiV
90f135ad95
Merge branch 'feature/crm' of https://gitee.com/jiangwanwan/ruoyi-vue-pro into feature/crm
...
# Conflicts:
# sql/mysql/crm.sql
2023-11-18 21:17:11 +08:00
YunaiV
5122aee924
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm
...
# Conflicts:
# sql/mysql/ruoyi-vue-pro.sql
# yudao-ui-admin/src/views/system/user/index.vue
2023-11-18 20:44:06 +08:00
YunaiV
966690125b
crm:code review 联系人
2023-11-18 20:43:32 +08:00
芋道源码
bf8bfef8cb
!727 crm联系人字段修改
...
Merge pull request !727 from zyna/feature/crm
2023-11-18 12:12:08 +00:00
芋道源码
a440b354ba
!735 商城装修
...
Merge pull request !735 from 疯狂的世界/feature/mall_product
2023-11-18 11:25:05 +00:00
芋道源码
29ff418091
!736 新增主子表、树表的代码生成
...
Merge pull request !736 from 芋道源码/feature/sub-table
2023-11-18 09:57:59 +00:00
YunaiV
7ac74b44d8
同步最新 SQL 脚本
2023-11-18 17:49:01 +08:00
YunaiV
ac80aa97b3
代码生成:优化前端模版的 package 路径
2023-11-18 17:41:37 +08:00
zhijiantianya@gmail.com
067d53ac48
代码生成器:增加单元测试, 🛫
2023-11-17 19:39:32 +08:00
puhui999
a25fea18e7
Merge remote-tracking branch 'yudao/feature/sub-table' into feature/sub-table
...
# Conflicts:
# yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm
2023-11-17 18:19:51 +08:00
puhui999
a88c93fc60
代码生成:重构 vue2 模版,适配树表和主子表(90%)
2023-11-17 18:18:27 +08:00
puhui999
df69fecbb4
代码生成:重构 vue2 模版,适配树表和主子表(80%)
2023-11-17 17:03:35 +08:00
YunaiV
ee918a6d3f
代码生成:增加主子表 erp 模式的示例
2023-11-17 13:21:07 +08:00
owen
330380c2d0
营销:适配商城装修组件【商品卡片】
2023-11-17 09:56:52 +08:00
YunaiV
d2aee55ed2
代码生成:增加主子表 inner 模式的示例
2023-11-16 23:48:12 +08:00
YunaiV
2aecdbf09e
代码生成:增加主子表 normal 模式的示例
2023-11-16 23:23:46 +08:00
YunaiV
5b9879ca8d
代码生成:增加 tree 示例
2023-11-16 20:40:13 +08:00
YunaiV
01a55b93c2
代码生成:增加更全的 tree 场景下的新增/修改校验
2023-11-16 20:01:44 +08:00
YunaiV
f5ea270be3
部门:优化父部门的校验逻辑,为代码生成做个铺垫?!
2023-11-16 12:55:43 +08:00
YunaiV
a2f7067494
代码生成:支持树形表结构的配置
2023-11-16 00:11:31 +08:00
YunaiV
0d49691aa0
代码生成:增加 crud 单表示例
2023-11-15 23:48:30 +08:00
YunaiV
d83e0413b8
清理一波 demo 示例代码,准备重新生成
2023-11-15 21:46:10 +08:00
zhijiantianya@gmail.com
413640f593
代码生成器:简化 vo 和 convert 的生成逻辑
2023-11-15 21:05:00 +08:00
zhijiantianya@gmail.com
91d7938ddf
代码生成器:简化 vo 和 convert 的生成逻辑
2023-11-15 21:03:16 +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
5e6e02e4f4
vo 简化:使用 BeanUtils 替代 mapstruct 转换
2023-11-15 09:19:51 +08:00
YunaiV
ddb5bce0a2
vo 简化:post 重构
2023-11-14 22:37:46 +08:00
zhijiantianya@gmail.com
b47c4fbd8d
代码生成器:增加树形结构的 vm 模版
2023-11-14 19:37:35 +08:00
YunaiV
06649624e5
代码生成:支持设置主子表的信息
2023-11-14 12:57:55 +08:00
puhui999
794649ea8a
CRM-数据权限:完善团队成员相关操作
2023-11-14 11:23:52 +08:00
YunaiV
a75bb825d7
代码生成:支持设置主子表的信息
2023-11-14 09:51:10 +08:00
YunaiV
a51e9645ef
代码生成:进一步完成 erp 模版
2023-11-13 21:46:54 +08:00
zhijiantianya@gmail.com
7c48aaba8a
代码生成器:进一步完善 erp 生成模版
2023-11-13 20:37:15 +08:00
zhijiantianya@gmail.com
01bdb33696
代码生成器:进一步完善 erp 生成模版
2023-11-13 20:35:03 +08:00
YunaiV
90842542a9
代码生成:主子表(inner)部分模版
2023-11-13 13:57:31 +08:00
YunaiV
a4b1395e92
代码生成:主子表(inner)部分模版
2023-11-13 09:52:48 +08:00
YunaiV
256c560d43
代码生成:增加主子表的示例
2023-11-12 22:33:18 +08:00
YunaiV
e67a6a2fe9
代码生成:1)增加 one 情况下的示例代码;2)修复 vue3 模版现有的 bug
2023-11-12 19:50:20 +08:00
Wanwan
322411304c
feat: CRM 客户限制
2023-11-12 14:34:49 +08:00
YunaiV
07e71e2ab0
代码生成:主子表 normal 模式,1 对 1 的 form 生成
2023-11-12 00:15:44 +08:00
zyna
7af80ba248
crm联系人表结构
2023-11-11 23:32:42 +08:00
zyna
7598ed05cf
crm联系人第二版新增字段
2023-11-11 23:31:09 +08:00
YunaiV
0a8257a565
代码生成:主子表 normal 模式,1 对多的 form 生成
2023-11-11 22:06:38 +08:00
Wanwan
5b295d56b6
feat: CRM 客户限制
2023-11-11 20:49:52 +08:00
YunaiV
055eb350aa
代码生成:简化现有 crud 模版的各种 pretty 相关的判断,交给 Java 代码后置统一处理。
2023-11-11 12:56:58 +08:00
YunaiV
ebb8f04fb5
Merge remote-tracking branch 'origin/feature/sub-table' into feature/sub-table
2023-11-09 22:47:43 +08:00
zhijiantianya@gmail.com
7c09a1fc86
代码生成器:主子表,支持普通、内嵌、ERP 三种模式
2023-11-09 20:49:52 +08:00
Wanwan
2915b46fa5
feat: CRM 客户公海配置
2023-11-09 00:01:43 +08:00
Wanwan
9abff2c7ad
feat: CRM 客户公海配置
2023-11-08 23:16:55 +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
5a5a42463b
refactor: 会员商品收藏
2023-11-08 17:22:00 +08:00
niou233
92be763c6f
refactor: 会员商品收藏
2023-11-08 17:18:28 +08:00
niou233
670c0962a7
refactor: 会员商品收藏
2023-11-08 17:03:37 +08:00
puhui999
f4c92089e5
CRM-客户:添加分页数据场景过滤
2023-11-08 16:42:22 +08:00
puhui999
388e07c834
CRM:完善模块数据放入公海、公海数据领取
2023-11-08 16:05:23 +08:00
puhui999
533b7295ab
Merge remote-tracking branch 'yudao/feature/crm' into feature/crm
2023-11-08 14:46:33 +08:00
puhui999
c8ed99a5a4
CRM-客户:完善客户详情、分页、公海数据获取
2023-11-08 14:41:51 +08:00
niou233
cbaadc3a77
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product_org
2023-11-08 14:39:01 +08:00
niou233
5facac7330
refactor: 会员商品收藏
2023-11-08 14:37:18 +08:00
niou233
daa7d14b09
reafactor: 会员商品收藏
2023-11-08 14:36:44 +08:00
dhb52
cba0b08730
doc: 优化文档,patch文件可以放入任意启用的模块
2023-11-08 14:30:46 +08:00
dhb52
e04c4b11df
feat: 达梦flowable 6.8适配
2023-11-08 13:09:49 +08:00
xiaqing
18de22dc39
增加客户的公海领取和
2023-11-08 10:51:10 +08:00
xiaqing
645fe827a3
Merge remote-tracking branch 'origin/feature/crm' into feature/crm
2023-11-08 10:47:42 +08:00
xiaqing
b06432b8f8
增加客户的公海领取和分配
2023-11-08 10:46:59 +08:00
YunaiV
2afc2caf1d
代码生成:主子表的部分实现
2023-11-08 09:42:16 +08:00
Wanwan
71574da2cf
feat: CRM 客户公海配置
2023-11-08 00:42:46 +08:00
YunaiV
53afc9d50a
codegen:移除多余的 test 类
2023-11-07 23:41:26 +08:00
jason
4ae3d34801
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
2023-11-07 23:11:25 +08:00
jason
15313c2992
转账 - 增加转账定时任务
2023-11-07 23:11:07 +08:00
Wanwan
4235beec3b
Merge remote-tracking branch 'origin/feature/crm' into feature/crm
2023-11-07 22:54:54 +08:00
zhijiantianya@gmail.com
9705ae061c
codegen:1)增加 vue3 + crud 模式下的单测;2)增加主子表的 db 字段
2023-11-07 20:43:53 +08:00
puhui999
668fae9398
CRM-数据权限:完善 code review 提到的问题
2023-11-07 17:52:18 +08:00
Wanwan
a24919e555
style: 客户 review 修改
2023-11-06 21:59:23 +08:00
YunaiV
e8bc284dd0
优化:默认只引入 mysql driver,减少打包大小
2023-11-06 21:41:28 +08:00
YunaiV
9762a2a7c3
优化:默认只引入 mysql driver,减少打包大小
2023-11-06 21:17:27 +08:00
芋道源码
d48a236d4c
!720 1. 完善达梦的兼容性;2. 增加域名解析租户编号
...
Merge pull request !720 from 芋道源码/feature/dameng
2023-11-06 11:57:57 +00:00
芋道源码
e63ae8e1e7
!719 添加达梦数据库适配指引
...
Merge pull request !719 from dhb52/master
2023-11-06 11:48:14 +00:00
YunaiV
feba904fd8
多租户:登录界面,根据 host 域名获取对应的租户编号
2023-11-06 19:47:21 +08:00
YunaiV
c162b39e1e
多租户:调整 tenant 表的 domain 字段为 website,避免 dm 数据库的关键字冲突
2023-11-06 19:04:01 +08:00
jason
09d45e6393
转账 - 增加转账通知
2023-11-06 11:33:08 +08:00
dhb52
24b9688894
doc: 添加达梦数据库适配指引
2023-11-06 00:15:16 +08:00
YunaiV
8efdf3141a
code review:crm 商品逻辑
2023-11-05 20:47:56 +08:00
芋道源码
381b8ea63a
!716 【增加CRM:产品以及产品分类】
...
Merge pull request !716 from ZanGe丶/feature/crm
2023-11-05 12:28:22 +00:00
kehaiyou
9537669d01
fix: 去除无用行
2023-11-05 20:14:21 +08:00
YunaiV
370d6df473
完善 README.md,补全新的消息队列
2023-11-05 18:28:34 +08:00
YunaiV
023b592299
前端项目,独立仓库
2023-11-05 18:11:34 +08:00
kehaiyou
ca184026cf
feat: 创建流程实例时,提前指派审批人
2023-11-05 14:21:37 +08:00
kehaiyou
b400aaac36
Merge remote-tracking branch 'upstream/master'
2023-11-05 13:26:38 +08:00
YunaiV
989d7c44d0
code review 店铺装修
2023-11-04 22:52:41 +08:00
YunaiV
1eff9822ce
同步最新 master 代码
2023-11-04 20:52:37 +08:00
YunaiV
787de1be94
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
...
# Conflicts:
# sql/mysql/mall.sql
# sql/mysql/ruoyi-vue-pro.sql
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/wallet/vo/recharge/AppPayWalletRechargeCreateReqVO.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletRechargeServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialUserService.java
2023-11-04 20:48:27 +08:00
YunaiV
f9e64a9f0a
同步最新 SQL
2023-11-04 20:43:18 +08:00
ZanGe丶
bf42f8e9ff
【增加CRM:产品以及产品分类】
2023-11-04 19:48:20 +08:00
YunaiV
87bc3f510c
优化:社交登录、用户的管理
2023-11-04 14:37:36 +08:00
YunaiV
e9317bf293
Merge branch 'feature/mall_product_tmp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
...
# Conflicts:
# yudao-module-member/yudao-module-member-biz/src/test/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceTest.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialUserServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/social/SocialUserServiceImplTest.java
2023-11-04 12:03:54 +08:00
芋道源码
01641cd1be
!696 新增社交客户端 CRUD,新增社交用户 RUD
...
Merge pull request !696 from puhui999/feature/mall_product_tmp
2023-11-04 04:00:12 +00:00
YunaiV
ecf728966f
code review:客户逻辑
2023-11-04 10:13:43 +08:00
芋道源码
9ee6a27b86
!715 feat: 客户详情 + review 修改
...
Merge pull request !715 from wanwan/feature/crm
2023-11-04 01:39:34 +00:00
Wanwan
64db1a9c90
feat: 客户详情 + review 修改
2023-11-04 03:21:20 +08:00
芋道源码
e6d79eaf8d
!707 新增用户时,归属部门赋默认值
...
Merge pull request !707 from 派森强哥/wgs
2023-11-03 16:06:56 +00:00
YunaiV
acdfc28ee6
code review:客户锁定的逻辑
2023-11-03 23:43:04 +08:00
芋道源码
9a007de947
!713 新增接口
...
Merge pull request !713 from Joey/feature/crm
2023-11-03 15:37:55 +00:00
YunaiV
5bb91f139e
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm
2023-11-03 23:34:37 +08:00
YunaiV
b7900c2035
code review:回款逻辑
2023-11-03 23:02:01 +08:00
Joey
0a58790c6b
新增客户锁定和解锁 接口
2023-11-03 22:07:47 +08:00
Joey
fdaa08c258
Merge remote-tracking branch 'origin/feature/crm'
2023-11-03 21:46:10 +08:00
芋道源码
71ce831d59
!706 完善回款管理和回款计划功能
...
Merge pull request !706 from souvc/feature/crm
2023-11-03 11:16:48 +00:00
芋道源码
20b11092c2
!712 商城装修
...
Merge pull request !712 from 疯狂的世界/feature/mall_product
2023-11-03 11:04:53 +00:00
zhijiantianya@gmail.com
4092f298ed
code review:crm 权限模块的实现
2023-11-03 18:53:40 +08:00
owen
bdfb5b8894
营销:装修页面适配
2023-11-03 09:18:04 +08:00
jason
cf114409b0
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
2023-11-03 08:43:40 +08:00
jason
f4d600398c
转账 - 管理后台增加转账单查询
2023-11-03 08:43:21 +08:00
owen
9996608da6
营销:装修模板APP接口
2023-11-03 06:38:49 +08:00
芋道源码
497d826ac4
!711 增加 RocketMQ、Kafka、RabbitMQ 消息队列的支持
...
Merge pull request !711 from 芋道源码/feature/mq-optimize
2023-11-02 12:53:26 +00:00
YunaiV
c886e7eff2
mq:增加 Rabbitmq 教程内容
2023-11-02 20:18:45 +08:00
YunaiV
456b0c8ddd
mq:增加 kafka 配置项
2023-11-02 12:25:50 +08:00
YunaiV
20725e3dfd
mq:增加 rabbitmq 配置项
2023-11-02 08:22:05 +08:00
YunaiV
b8d5a665be
mq:增加 rocketmq 配置项
2023-11-02 00:07:38 +08:00
YunaiV
e1c34e9124
mq:优化 redis stream 的命名
2023-11-01 22:46:02 +08:00
zhijiantianya@gmail.com
f8ed0e15f0
mq:增加 kafka、rocketmq、rabbitmq 的实现支持
2023-11-01 19:58:56 +08:00
puhui999
68c9d563bc
CRM-商机:新增获得商机公海分页接口
2023-11-01 16:39:23 +08:00
puhui999
23cfbfe491
CRM-数据权限:完善数据团队操作-添加、编辑、移除团队成员,退出团队
2023-11-01 16:24:36 +08:00
puhui999
7a8ffd9ccb
CRM-商机:完善获取权限过滤后的分页数据
2023-11-01 11:28:05 +08:00
puhui999
91dd61edc0
完善 review 提到的问题
2023-11-01 10:21:56 +08:00
芋道源码
bee4b761ec
!709 营销:完善商城装修
...
Merge pull request !709 from 疯狂的世界/feature/mall_product
2023-11-01 00:47:06 +00:00
puhui999
a385a37c4a
完善 CRM-客户 数据权限校验2
2023-10-31 17:42:44 +08:00
puhui999
c6422dc657
完善 CRM-客户 数据权限校验2
2023-10-31 17:24:19 +08:00
dongshanshan
98aae5ed1a
feat: 会员商品收藏
2023-10-31 16:51:56 +08:00
owen
32499be98f
营销:完善商城装修
...
1. 拆分页面设计用的属性修改接口
2. 增加模板的页面保存
3. 增加唯一名称校验
4. 增加页面编辑器,默认选中组件判断
2023-10-31 16:01:23 +08:00
wgs7909
3dade7fd54
新增用户时,给部门增加默认值。
...
对应Issue,Cloud版本库。
https://gitee.com/zhijiantianya/yudao-cloud/issues/I8C4B5
2023-10-31 07:07:11 +08:00
wgs7909
a0c142f886
新增用户时,给部门增加默认值。
...
对应Issue,Cloud版本库。
https://gitee.com/zhijiantianya/yudao-cloud/issues/I8C4B5
2023-10-31 06:42:12 +08:00
wgs7909
ab9dc8ad71
新增用户时,给部门增加默认值。
...
对应Issue,Cloud版本库。
https://gitee.com/zhijiantianya/yudao-cloud/issues/I8C4B5
2023-10-31 06:39:57 +08:00
liuhongfeng
95e9dc81c9
【修改】回款计划和回款管理统一带上Crm前缀,防止和其他模块冲突。
2023-10-31 01:09:40 +08:00
liuhongfeng
f1f180ff77
【新增】字典归类
...
【修改】规范实体命名和字段类型修改
2023-10-31 00:35:41 +08:00
liuhongfeng
798dd3269f
Merge branch 'feature/crm' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm
2023-10-30 21:35:14 +08:00
liuhongfeng
921c2ab757
【新增】负责人
...
【修改】规范命名:期数:indexNo-》period
2023-10-30 21:33:28 +08:00
YunaiV
c066ea46f9
mq 重构:默认的 redis 实现:
...
1)默认 channel 和 stream key
2)移除 enabled 开关,通过 listener 是否存在来实现
3)调整包名,为接入 rocketmq 作为 mq 实现做准备
2023-10-30 21:15:22 +08:00
芋道源码
df8a81f658
!705 修复 vben 代码生成错误
...
Merge pull request !705 from xingyu/fix/vben_codegen
2023-10-30 12:08:54 +00:00
zhijiantianya@gmail.com
4dab376ca9
code review:数据权限的实现
2023-10-30 19:28:33 +08:00
xingyu
7767a8f837
chore: up mybatis-plus-join 1.4.7
2023-10-30 18:17:17 +08:00
xingyu
5bfb8098d6
fix: vben codegen
2023-10-30 18:15:22 +08:00
芋道源码
9f1b92abd9
!704 完善 CRM-数据权限校验方式
...
Merge pull request !704 from puhui999/feature/crm
2023-10-30 09:34:59 +00:00
puhui999
7cd5272e7f
Merge remote-tracking branch 'yudao/feature/crm' into feature/crm
2023-10-30 16:54:14 +08:00
puhui999
c2fd817989
完善 CRM-客户 数据权限校验
2023-10-30 16:52:01 +08:00
puhui999
e6eaa3a24a
完善 CRM-数据权限校验方式
2023-10-30 16:29:24 +08:00
YunaiV
d048daf7d6
mq 重构:默认的 mq 实现,采用 event,减少对 redis、rocketmq 等消息队列的依赖
2023-10-30 12:53:54 +08:00
puhui999
19c9b6ae93
新增 CRM-数据权限 service
2023-10-30 11:17:43 +08:00
puhui999
bec8a27a21
新增 CRM-数据权限 注解实现
2023-10-30 00:49:36 +08:00
jason
48b1c19f28
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
2023-10-29 23:36:26 +08:00
jason
ccccd9f226
转账 - 转账代码修改,新增转账示例
2023-10-29 23:36:06 +08:00
芋道源码
1d3ef770a0
!703 商城装修
...
Merge pull request !703 from 疯狂的世界/feature/mall_diy
2023-10-29 14:15:55 +00:00
owen
b5f9ed9edf
营销:装修SQL调整
2023-10-29 22:04:21 +08:00
芋道源码
87fb47ca6a
!698 fix: 修复PayWalletRechargeCerate参数校验
...
Merge pull request !698 from JaysonAlbert/fix/validate-pay-wallet
2023-10-29 13:07:18 +00:00
liuhongfeng
fc087fa252
Merge branch 'feature/crm' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm
2023-10-29 19:27:16 +08:00
YunaiV
054d80b472
code review:同步 crm 最新代码
2023-10-29 19:23:09 +08:00
YunaiV
53afce0bff
code review:crm 回款
2023-10-29 19:22:09 +08:00
YunaiV
973b710992
code review:crm 商机
2023-10-29 19:14:15 +08:00
YunaiV
d1978d318b
code review:crm 合同
2023-10-29 19:05:36 +08:00
owen
c637a172ec
营销:装修代码整理
2023-10-29 18:50:55 +08:00
YunaiV
67ac11b56c
code review:crm 客户转移
2023-10-29 18:39:54 +08:00
liuhongfeng
9608cf0539
Merge branch 'feature/crm' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm
2023-10-29 18:03:01 +08:00
liuhongfeng
677e8ab2fc
【修改】回款计划-修改字段类型
...
【修改】修改回款计划-创建逻辑,添加客户的数据校验
2023-10-29 18:00:34 +08:00
芋道源码
f73b857551
!702 CRM【商机】【联系人】【合同】新增 transfer 接口
...
Merge pull request !702 from puhui999/feature/crm
2023-10-29 09:55:09 +00:00
YunaiV
fe50356ae8
code review:crm 客户模块的实现
2023-10-29 17:38:59 +08:00
YunaiV
0657c357bf
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm
2023-10-29 14:25:38 +08:00
芋道源码
d8e49fa0f6
!701 feat: 调整 CRM 客户表的字段
...
Merge pull request !701 from wanwan/feature/crm
2023-10-29 02:36:55 +00:00
puhui999
722e9c8a04
CRM-商机:新增商机转移接口
2023-10-29 02:04:26 +08:00
puhui999
36a76c5ce6
CRM-联系人:新增联系人转移接口
2023-10-29 01:42:22 +08:00
puhui999
d9f6fb241a
合同:新增合同转移接口
2023-10-29 01:23:06 +08:00
Wanwan
3af9688383
feat: 调整客户表的字段
2023-10-29 00:33:42 +08:00
Wanwan
c18f5baa4b
feat: 调整客户表的字段
2023-10-28 22:47:56 +08:00
Jayson Albert
f4ea648ac9
fix: 修复PayWalletRechargeCerate参数校验
2023-10-28 19:45:06 +08:00
liuhongfeng
b0ddd522fb
Merge branch 'feature/crm' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm
2023-10-28 00:37:59 +08:00
liuhongfeng
301f497527
【新增】回款计划-审批枚举类
...
【新增】回款计划-回款方式枚举类
【新增】回款计划-枚举类校验
【修改】回款计划-错误码调整
【修改】修改回款计划-创建逻辑,添加合同数据的校验
2023-10-28 00:37:47 +08:00
YunaiV
81b6aebf47
code review:商机表的实现
2023-10-27 23:27:08 +08:00
YunaiV
bf247a6626
Merge branch 'feature/crm' of https://gitee.com/ljlleo/ruoyi-vue-pro into feature/crm
...
# Conflicts:
# sql/mysql/crm.sql
2023-10-27 23:11:16 +08:00
YunaiV
74f786f8ed
code review:客户表的实现
2023-10-27 22:56:46 +08:00
芋道源码
0719efb4c2
!695 feat: 客户表的 crud
...
Merge pull request !695 from wanwan/feature/crm
2023-10-27 14:41:38 +00:00
芋道源码
ecb36eef67
!691 crm联系人前端
...
Merge pull request !691 from zyna/feature/crm
2023-10-27 14:33:38 +00:00
owen
3a2ccc9d6b
营销:装修模板、装修页面
2023-10-27 14:58:04 +08:00
puhui999
8552e86d8a
完善三方登录
2023-10-26 17:03:26 +08:00
ljlleo
75115bcc48
1、商机前端页面;
...
2、商机状态类型和商机状态字段的处理;
2023-10-26 16:22:44 +08:00
jason
5f29399cf4
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
2023-10-25 23:42:25 +08:00
jason
626bd0bd55
转账 - code review 修改
2023-10-25 23:41:59 +08:00
puhui999
12ae5bf128
新增社交用户 RUD
2023-10-25 16:57:13 +08:00
puhui999
738fcef453
新增社交客户端 CRUD
2023-10-25 16:07:17 +08:00
puhui999
eb4b719b4b
添加社交客户端测试 sql
2023-10-25 15:09:34 +08:00
Wanwan
866eaedfeb
feat: 客户表的 crud
2023-10-25 00:32:49 +08:00
Wanwan
04613af0cd
feat: 客户表的 crud
2023-10-25 00:25:00 +08:00
YunaiV
126dc610b1
1.8.3 版本发布
2023-10-24 23:14:14 +08:00
YunaiV
3fdc132c17
1.8.3 版本发布
2023-10-24 20:53:37 +08:00
YunaiV
3a9ac56f96
修复 banner 返回字段不对
2023-10-24 20:29:15 +08:00
YunaiV
c11300d33a
解决启动问题
2023-10-24 19:54:49 +08:00
YunaiV
a4aa1fac0b
Merge branch 'feature/v2.7.17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2023-10-24 19:13:09 +08:00
YunaiV
52e735f360
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
# Conflicts:
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/coupon/CouponTemplateApiImpl.java
2023-10-24 19:09:01 +08:00
YunaiV
07dbfc5546
code review:sign 签到逻辑
2023-10-24 19:08:08 +08:00
芋道源码
c7695def5e
!694 完善 review 提到的问题,商品模块移除对营销模块的依赖
...
Merge pull request !694 from puhui999/feature/mall_product
2023-10-24 10:49:13 +00:00
YunaiV
dd2f5ba2c3
统一 boot 和 cloud 代码
2023-10-24 18:48:02 +08:00
puhui999
ff3b1e942a
Banner: market ==> promotion
2023-10-24 18:00:35 +08:00
YunaiV
d9a5ef3321
统一 boot 和 cloud 代码
2023-10-24 13:58:35 +08:00
YunaiV
df00126fa4
统一 boot 和 cloud 代码
2023-10-24 13:39:21 +08:00
YunaiV
af788e36ce
bpm:code review
2023-10-24 08:47:46 +08:00
jason
86598dd177
转账 - 动态收款人字段修改
2023-10-24 08:44:30 +08:00
YunaiV
fc2d30cfaf
pay:修复单元测试报错
2023-10-24 08:09:47 +08:00
YunaiV
7bff98b658
统一 boot 和 cloud 代码
2023-10-23 23:48:06 +08:00
jason
9095394fed
钱包 - 创建钱包充值校验修改
2023-10-23 21:47:36 +08:00
YunaiV
633a4c5687
pay:微调 enum 的包名
2023-10-23 19:56:30 +08:00
YunaiV
054569a3d3
promotion:去除已经不使用的代码
2023-10-23 19:24:04 +08:00
puhui999
3672d0f245
商品模块移除对营销模块的依赖
2023-10-23 17:29:26 +08:00
puhui999
6723cae781
营销活动:完善 review 提到的问题
2023-10-23 12:02:13 +08:00
xingyu
a39a0e68a0
fix: vben codegen
2023-10-23 11:49:23 +08:00
xingyu
98561731f5
chore: update deps
2023-10-23 11:38:55 +08:00
xingyu
f0d3614c34
fix: reset config
2023-10-23 11:38:41 +08:00
xingyu
1611dd4b23
docs: up springboot 2.7.17
2023-10-23 11:38:28 +08:00
xingyu
f3f2efcced
feat: update springboot 2.7.17
2023-10-23 11:38:01 +08:00
YunaiV
a778c25075
product:优化代码实现,简化重复判空
2023-10-22 21:44:05 +08:00
zyna
918ffc40ae
crm联系人前端init
2023-10-22 16:40:57 +08:00
YunaiV
728308cbc0
member:优化部分变量的命名
2023-10-22 16:35:48 +08:00
YunaiV
94c2ad5d1d
修复报错的单元测试
2023-10-22 08:55:27 +08:00
YunaiV
d0caa77f80
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2023-10-22 08:25:27 +08:00
YunaiV
ec27a1bae5
修复报错的单元测试
2023-10-22 08:24:47 +08:00
YunaiV
55f9e0131c
code review:CRM 客户联系人的管理
2023-10-21 22:20:00 +08:00
YunaiV
723707c7ed
Merge branch 'feature/crm' of https://gitee.com/zyna/ruoyi-vue-pro into feature/crm
...
# Conflicts:
# sql/mysql/crm.sql
# yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
2023-10-21 22:13:34 +08:00
YunaiV
b5560fa0be
code review:CRM 线索表的逻辑
2023-10-21 22:05:37 +08:00
YunaiV
9cf4cfca86
Merge branch 'feature/crm' of https://gitee.com/jiangwanwan/ruoyi-vue-pro into feature/crm
...
# Conflicts:
# sql/mysql/crm.sql
2023-10-21 22:00:15 +08:00
YunaiV
f942e2c7f2
code review:CRM 回款计划的逻辑
2023-10-21 21:55:21 +08:00
YunaiV
56b59cf383
Merge branch 'feature/crm' of https://gitee.com/souvc/ruoyi-vue-pro into feature/crm
...
# Conflicts:
# sql/mysql/crm.sql
# sql/mysql/crm_menu.sql
# yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
2023-10-21 21:41:16 +08:00
YunaiV
6f8fd383f7
code review:CRM 商机的逻辑
2023-10-21 21:35:35 +08:00
芋道源码
24e6deb82b
!682 商机
...
Merge pull request !682 from 刘先生/feature/crm
2023-10-21 13:19:46 +00:00
YunaiV
9697aee898
code review:钱包的逻辑
2023-10-21 21:17:49 +08:00
YunaiV
3bb3e4caf6
code review:工作流的加减签
2023-10-21 21:04:20 +08:00
芋道源码
cc67174f87
!689 【工作流】--加签减签review
...
Merge pull request !689 from Youkehai/feature/bpm-addSignAndSubSign
2023-10-21 11:59:22 +00:00
YunaiV
0db4581030
code review:签到逻辑
2023-10-21 19:56:53 +08:00
芋道源码
3e570b8b89
!685 完善遗留的问题
...
Merge pull request !685 from puhui999/feature/mall_product
2023-10-21 11:31:56 +00:00
kehaiyou
6dfef29834
feat: 控制查找子任务次数和清除递归代码
2023-10-21 18:31:30 +08:00
kehaiyou
aca65a66b5
feat: 【工作流】--加减签review修改
2023-10-21 18:16:21 +08:00
YunaiV
785fbeeb5b
code review:限时折扣活动
2023-10-21 18:16:09 +08:00
芋道源码
90fb2c62b8
!683 mall模块
...
Merge pull request !683 from zxiaoxiu/discount
2023-10-21 09:23:50 +00:00
puhui999
0e754a9924
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
2023-10-21 17:09:24 +08:00
puhui999
f363c598d8
Banner:完善 review 提到的问题
2023-10-21 17:09:04 +08:00
jason
89e847c8cd
钱包,转账 review 修改
2023-10-21 15:28:07 +08:00
puhui999
1bb2010dc0
签到记录:完善 review 提到的问题
2023-10-21 01:11:10 +08:00
puhui999
2f7371b4ea
签到记录:完善 review 提到的问题
2023-10-21 01:01:06 +08:00
913752709@qq.com
e4eeaa1d69
feat: crm 线索表完善 review 提到的问题
2023-10-21 00:53:18 +08:00
913752709@qq.com
435d7dcfca
Merge remote-tracking branch 'origin/feature/crm' into feature/crm
...
# Conflicts:
# yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/CrmClueController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmClueBaseVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmCluePageReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/clue/CrmClueDO.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/clue/CrmClueServiceImplTest.java
2023-10-21 00:09:44 +08:00
liuhongfeng
34a5785768
【新增】回款计划 功能
2023-10-20 23:48:19 +08:00
zyna
e4943f0dfa
crm联系人
2023-10-20 23:42:22 +08:00
jason
db0fbf0596
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
2023-10-20 23:22:16 +08:00
jason
183206e2d3
转账 - 支付宝转账修改, 支付宝 Client 支持公钥证书模式
2023-10-20 23:20:47 +08:00
puhui999
f18a4741a9
营销活动:完善 review 提到的问题
2023-10-20 22:32:37 +08:00
liuhongfeng
73f4fc8ceb
【新增】回款管理 功能
2023-10-20 22:16:34 +08:00
puhui999
f462ac7f96
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
2023-10-20 21:04:47 +08:00
zhangshuai
04061b028c
mall模块-限时折扣功能
2023-10-20 20:54:16 +08:00
puhui999
283ca908b7
SPU: 完善选择优惠卷
2023-10-20 16:35:49 +08:00
ljlleo
01490c879c
商机sql
2023-10-20 16:14:45 +08:00
ljlleo
bee6f41211
商机
2023-10-20 16:01:54 +08:00
puhui999
6e11154010
SPU: 添加选择优惠卷
2023-10-20 11:35:16 +08:00
YunaiV
52ebcaaad7
同步 https://gitee.com/zhijiantianya/yudao-cloud/pulls/59/
2023-10-20 00:31:35 +08:00
YunaiV
6c8e82ca5a
code review:自提统计
2023-10-20 00:30:27 +08:00
芋道源码
8bd1942083
!676 交易:核销订单
...
Merge pull request !676 from 疯狂的世界/feature/mall_product
2023-10-19 15:59:00 +00:00
芋道源码
3590336b1c
!677 基础设施:数据库文档增加忽略前端FLW_
...
Merge pull request !677 from 疯狂的世界/pr/infra
2023-10-19 15:52:56 +00:00
YunaiV
453f69931f
code review:营销文章
2023-10-19 23:41:39 +08:00
YunaiV
64b842ed94
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
2023-10-19 23:31:45 +08:00
芋道源码
e21422d119
!678 营销活动:完善 review 提到的问题
...
Merge pull request !678 from puhui999/feature/mall_product
2023-10-19 15:31:36 +00:00
YunaiV
f8e4aece31
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
2023-10-19 23:31:21 +08:00
YunaiV
14f006088a
code review:敏感词
2023-10-19 23:25:17 +08:00
芋道源码
630890d0ac
!665 修复敏感词单字符检验失败问题
...
Merge pull request !665 from 摸鱼散人/master
2023-10-19 15:18:31 +00:00
YunaiV
439edcd1be
code review:crm 线索的 crud
2023-10-19 23:15:18 +08:00
wanwan
48661f980c
!679 feat: CRM 线索表 crud
...
* feat: CRM 线索表 crud
* feat: CRM 线索表 crud
2023-10-19 14:52:16 +00:00
YunaiV
979b484d7f
saas:支持社交应用的多租户配置(wx 小程序)
2023-10-19 21:42:39 +08:00
YunaiV
6f757e5297
saas:支持社交应用的多租户配置(mp)
2023-10-19 12:54:44 +08:00
YunaiV
d256275099
saas:支持社交应用的多租户配置
2023-10-18 23:48:14 +08:00
913752709@qq.com
1b6c8574cd
feat: CRM 线索表 crud
2023-10-18 20:02:53 +08:00
913752709@qq.com
a09ee495b6
feat: CRM 线索表 crud
2023-10-18 19:53:15 +08:00
zhijiantianya@gmail.com
00e18a480f
code review:钱包、充值、转账的实现
2023-10-18 18:39:05 +08:00
puhui999
ffbf9278b8
营销文章:修正文章浏览量类型错误,新增时初始化浏览量
2023-10-18 11:27:14 +08:00
puhui999
6081ce30d5
营销活动:完善 review 提到的问题
2023-10-18 11:09:20 +08:00
owen
2f69389982
基础设施:数据库文档增加忽略前端FLW_
2023-10-18 09:46:24 +08:00
owen
0c4713b7e0
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
...
# Conflicts:
# sql/mysql/mall.sql
2023-10-17 23:29:11 +08:00
YunaiV
5842a361e2
同步最新 SQL 脚本
2023-10-17 23:23:17 +08:00
owen
0612a13cce
交易:核销订单
2023-10-17 23:18:08 +08:00
芋道源码
ee1d5c7e60
!675 线上修改 文件管理->文件配置->更换主配置 导致文件上传报错
...
Merge pull request !675 from 人生三两事/master
2023-10-17 15:14:52 +00:00
YunaiV
b133acd8cd
code review:crm 合同流程
2023-10-17 22:52:14 +08:00
lan
43985bff93
逻辑错误。已缓存master时,修改master会因为id不匹配config导致引用错误的FileClient实现类
2023-10-17 22:01:34 +08:00
zhijiantianya@gmail.com
4b0333f3e9
code review:订单统计
2023-10-17 20:42:22 +08:00
zhijiantianya@gmail.com
0dcab0363d
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
2023-10-17 20:29:54 +08:00
芋道源码
3c6c8aab01
!672 Review代码修改
...
Merge pull request !672 from 疯狂的世界/feature/mall_product
2023-10-17 12:28:47 +00:00
芋道源码
07f3d09e38
!671 CRM/合同管理 CRUD初稿
...
Merge pull request !671 from dhb52/feature/crm
2023-10-17 12:02:20 +00:00
zhijiantianya@gmail.com
0af205ede1
Merge remote-tracking branch 'origin/master'
2023-10-17 18:49:59 +08:00
zhijiantianya@gmail.com
c629fd2208
code review:工作流逻辑
2023-10-17 18:49:35 +08:00
owen
b1e0129046
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
...
# Conflicts:
# sql/mysql/statistics.sql
2023-10-17 16:13:46 +08:00
owen
5e65512a92
交易:订单核销
2023-10-17 16:09:37 +08:00
zhijiantianya@gmail.com
ba271da427
Merge branch 'feature/bpm-addSignAndSubSign' of https://gitee.com/ykhcool/ruoyi-vue-pro into feature/mall_product
2023-10-17 10:56:36 +08:00
dhb52
164be5732b
feat: CRM/合同管理 - SQL
2023-10-16 23:53:27 +08:00
dhb52
eedb528412
feat: CRM/合同管理 - crud
2023-10-16 23:53:17 +08:00
dhb52
e26bd20a5b
feat:添加测试配置及excel依赖
2023-10-16 23:45:18 +08:00
YunaiV
d842708c23
code review:数据统计
2023-10-16 23:42:54 +08:00
YunaiV
d2112458d2
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
2023-10-16 22:51:28 +08:00
YunaiV
1ff9bc6a71
code review:文章管理
2023-10-16 22:51:19 +08:00
jason
34210d3534
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
2023-10-16 22:43:54 +08:00
jason
7d0bcf5d3b
wallet - 管理端钱包余额菜单脚本
2023-10-16 22:43:39 +08:00
owen
b89ae001ad
统计:trade_statistics 字段【order_wallet_pay_price】改为【wallet_pay_price】
2023-10-16 22:09:20 +08:00
owen
7aa1ecceeb
统计:Review修改
2023-10-16 22:03:37 +08:00
芋道源码
cebdc190b6
!668 营销活动:完善文章相关 app 端接口,完善 review 提到的问题
...
Merge pull request !668 from puhui999/feature/mall_product
2023-10-16 13:55:47 +00:00
owen
6fbb7d6d6d
终端类型参数改为从Controller传入
2023-10-16 21:01:01 +08:00
zhijiantianya@gmail.com
b6e63e885d
code review:商城统计
2023-10-16 20:01:25 +08:00
puhui999
4273b8f09c
营销活动:完善 review 提到的问题
2023-10-16 18:53:25 +08:00
puhui999
01ef5f7911
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
...
# Conflicts:
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/article/ArticleController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/article/vo/article/ArticleExcelVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/article/vo/article/ArticleExportReqVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/article/ArticleConvert.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/article/ArticleMapper.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/article/ArticleService.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/article/ArticleServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/article/ArticleServiceImplTest.java
2023-10-16 17:47:17 +08:00
芋道源码
1502159608
!669 商城首页
...
Merge pull request !669 from 疯狂的世界/feature/mall_product
2023-10-16 09:33:22 +00:00
owen
76f512fc7a
1. APP增加终端Header[terminal]
...
2. 订单、会员注册记录来源终端
2023-10-16 15:06:59 +08:00
owen
b6d400e04a
统计:会员终端统计接口实现
2023-10-16 14:23:53 +08:00
owen
6f08645f61
会员:增加字段【注册终端】
2023-10-16 14:22:43 +08:00
owen
d3385dcb4f
统计:会员分析数据接口重构
2023-10-16 13:52:00 +08:00
owen
8e35a786ba
统计:处理会员性别统计,存在未知的情况
2023-10-16 13:25:15 +08:00
owen
4f731e9904
统计:处理会员地区统计,存在未知省份的情况
2023-10-16 13:20:11 +08:00
owen
bb82c631e9
统计:Review修改
2023-10-16 13:00:14 +08:00
owen
ea810bb5d6
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
2023-10-16 10:02:04 +08:00
YunaiV
7345933d6b
code review:文章管理
2023-10-16 09:57:57 +08:00
owen
df70402484
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
2023-10-16 09:55:17 +08:00
owen
f5dac38ca5
商城:增加商城首页
2023-10-16 09:51:20 +08:00
YunaiV
69268b525a
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
2023-10-16 09:07:13 +08:00
YunaiV
4359c584bb
code review:拼团逻辑
2023-10-16 09:07:02 +08:00
jason
3db7b30e66
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
2023-10-16 08:46:44 +08:00
jason
fcbbbc737d
wallet - 管理端, 充值套餐脚本
2023-10-16 08:46:27 +08:00
jason
4f7c7f5619
wallet - 管理端 钱包余额流水查询
2023-10-16 08:36:28 +08:00
puhui999
0d45acaf20
营销活动:完善文章相关 app 端接口
2023-10-15 22:41:18 +08:00
芋道源码
7bc3b7b2ff
!666 营销活动:新增文章管理,文章分类管理
...
Merge pull request !666 from puhui999/feature/mall_product
2023-10-15 14:05:35 +00:00
YunaiV
7e312aae02
初始化 crm 模块
2023-10-15 20:16:46 +08:00
jason
7cb8f8fab9
wallet - 管理端 钱包余额查询
2023-10-15 17:33:55 +08:00
puhui999
b009f0b058
application-local.yaml 恢复
2023-10-15 16:43:04 +08:00
puhui999
26d3672668
营销活动: 文章分类管理软件包调整
2023-10-15 16:40:27 +08:00
puhui999
1fe6c82899
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
2023-10-15 16:17:14 +08:00
puhui999
55eed1377a
营销活动: 新增文章管理
2023-10-15 16:16:41 +08:00
daiwencheng
944e3862a5
修复敏感词检验问题
...
1.修复排序,优先使用较短的前缀失效问题
2.修复敏感词为单个字符校验失败问题
2023-10-15 14:30:43 +08:00
puhui999
a47ab32800
营销活动: 新增文章分类管理
2023-10-15 01:29:30 +08:00
YunaiV
6e4a9c3b01
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
2023-10-14 22:00:52 +08:00
YunaiV
ca5e3f7bd1
优化最新的商城的 sql
2023-10-14 22:00:30 +08:00
芋道源码
8fd814e0c1
!636 测试站内信接口增加Member 用户类型的支持。
...
Merge pull request !636 from 风狗/feature/mall_product
2023-10-14 09:53:41 +00:00
芋道源码
82fd800ad2
!641 操作日志搜索参数名修改
...
Merge pull request !641 from ligitee/N/A
2023-10-14 09:52:11 +00:00
芋道源码
fa600dbb44
!662 【工作流】添加vue2版本的退回和委派前端代码
...
Merge pull request !662 from LiuMoffett/moffett
2023-10-14 09:51:00 +00:00
YunaiV
3110e427fb
同步 https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/647/files
2023-10-14 17:45:49 +08:00
YunaiV
970e524088
code review:交易统计
2023-10-14 13:15:14 +08:00
YunaiV
1ac2f2b5c2
code review:会员统计
2023-10-14 01:26:06 +08:00
YunaiV
0eb86ca269
Merge branch 'feature/mall_product' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product
...
# Conflicts:
# yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/member/MemberStatisticsServiceImpl.java
2023-10-13 20:41:17 +08:00
YunaiV
82545ddaac
优化 README.md,减少静态资源加载
2023-10-13 18:27:30 +08:00
puhui999
a4613f0af9
拼团活动: 完善 review 提到的问题
2023-10-13 12:07:28 +08:00
jason
e06f61ef39
wallet - 充值套餐 管理端
2023-10-13 10:46:10 +08:00
jason
8cd7941fc3
wallet - 充值套餐 管理端
2023-10-13 10:43:04 +08:00
YunaiV
04d491b90d
优化 README.md,减少静态资源加载
2023-10-13 09:39:40 +08:00
YunaiV
625504333b
优化 README.md
2023-10-13 09:35:23 +08:00
YunaiV
3105d86b7d
优化 README.md
2023-10-13 09:34:33 +08:00
jason
2e207019b3
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
2023-10-12 22:21:17 +08:00
jason
571961b4da
充值套餐修改
2023-10-12 22:20:42 +08:00
YunaiV
7a9dbfe41d
Merge remote-tracking branch 'origin/master'
2023-10-12 21:59:04 +08:00
YunaiV
b30754a0a4
同步最新 mall 代码
2023-10-12 21:58:56 +08:00
YunaiV
a72869b97e
code review:修复部分统计报错
2023-10-12 21:54:06 +08:00
liuxiaolu
9a876cff3d
feat:【工作流】添加vue2版本的退回和委派前端代码
2023-10-11 16:08:39 +08:00
owen
4be709b815
统计:Review修改
2023-10-11 15:26:17 +08:00
owen
66cdf4ca4c
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
2023-10-11 15:06:09 +08:00
YunaiV
fef808d88c
code review:统计代码
2023-10-11 12:32:28 +08:00
YunaiV
704087ce86
Merge branch 'feature/mall_product' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product
...
# Conflicts:
# yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApi.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApiImpl.java
2023-10-11 11:30:03 +08:00
YunaiV
670a098aa8
code review:拼团记录流程
2023-10-11 11:04:22 +08:00
owen
8d40f1d71a
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
2023-10-11 08:27:57 +08:00
芋道源码
708af92a0f
!660 优化订单 OrderHandler 实现
...
Merge pull request !660 from 芋道源码/feature/mall_product_tmp
2023-10-10 23:51:10 +00:00
YunaiV
b0179457ce
重构:将订单的分支流程,抽到 TradeOrderHandler 实现类中(补全各种排重逻辑)
2023-10-11 07:49:23 +08:00
YunaiV
41e5cf5285
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product_tmp
...
# Conflicts:
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeBargainOrderHandler.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeCombinationOrderHandler.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeSeckillOrderHandler.java
2023-10-10 20:42:33 +08:00
芋道源码
7181ccbcef
!657 营销活动:完成砍价、秒杀库存回滚。完成拼团过期和虚拟成团处理
...
Merge pull request !657 from puhui999/feature/mall_product
2023-10-10 12:39:26 +00:00
YunaiV
150a1c9771
重构:将订单的分支流程,抽到 TradeOrderHandler 实现类中(取消的排重逻辑)
2023-10-10 20:38:20 +08:00
YunaiV
2e5cc0537b
重构:将订单的分支流程,抽到 TradeOrderHandler 实现类中
2023-10-10 19:20:12 +08:00
puhui999
cfbc8b4849
拼团记录(admin-api):增加 page-by-headId 接口获取指定 headId 完整拼团列表分页
2023-10-10 17:21:37 +08:00
puhui999
bccd270fc7
营销活动:完成砍价、秒杀库存回滚。完成拼团过期和虚拟成团处理
2023-10-10 15:30:58 +08:00
youkehai
599d13b1ac
feat: 随便测试
2023-10-10 11:36:24 +08:00
puhui999
fdbebc406c
秒杀活动:纠正秒杀库存和秒杀总库存扣减错误的问题
2023-10-10 10:57:17 +08:00
puhui999
42fcbe0501
砍价活动:完成订单取消时恢复活动库存
2023-10-10 10:47:25 +08:00
youkehai
bc781d9473
fix: 【工作流】按 review 修改代码
2023-10-10 10:46:16 +08:00
puhui999
245f14b8f1
秒杀活动:完成订单取消时恢复活动库存和商品库存
2023-10-10 10:25:57 +08:00
owen
2c10dde195
统计:修复错误
2023-10-09 23:53:50 +08:00
owen
91d0bbf8b1
合并代码
2023-10-09 23:40:11 +08:00
owen
74a5e40d8d
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
...
# Conflicts:
# yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApi.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApiImpl.java
2023-10-09 23:33:51 +08:00
owen
df16278a03
统计:会员统计
2023-10-09 23:27:10 +08:00
zhijiantianya@gmail.com
6388950ab2
code review:【工作流】—— 加签的实现
2023-10-09 20:57:23 +08:00
puhui999
831983e314
营销活动:重构 getCombinationActivityBySpuIdsAndStatus 方法
2023-10-09 18:17:20 +08:00
zhijiantianya@gmail.com
45a2cd70f0
Merge branch 'feature/bpm-addSignAndSubSign' of https://gitee.com/ykhcool/ruoyi-vue-pro
2023-10-09 17:45:46 +08:00
youkehai
5d6faa8023
fix: 【工作流】-加减签父任务处理逻辑完善
2023-10-09 16:40:31 +08:00
puhui999
e845872adc
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
2023-10-09 16:26:42 +08:00
puhui999
57407a39d2
营销活动:修正 selectListBySpuIdsAndStatus 查询 sql,添加接口测试
2023-10-09 16:25:06 +08:00
puhui999
c869d99a0f
修复:启动报错-循环依赖
2023-10-09 16:25:04 +08:00
puhui999
cd887511d8
营销活动:修正 selectListBySpuIdsAndStatus 查询 sql,添加接口测试
2023-10-09 16:18:00 +08:00
puhui999
e09f07475a
修复:启动保存-循环依赖
2023-10-09 16:11:02 +08:00
puhui999
53e67c0437
拼团活动:完善 review 提到的问题
2023-10-09 11:53:02 +08:00
kehaiyou
10af05066c
feat: 【工作流】--任务列表只返回顶级任务,拼装成父子关系并返回
2023-10-08 22:35:02 +08:00
YunaiV
7b727d5ce2
code review:拼团记录流程
2023-10-08 21:14:54 +08:00
芋道源码
781ec1028f
!656 拼团活动:完善 review 提到的问题
...
Merge pull request !656 from puhui999/feature/mall_product
2023-10-08 12:06:35 +00:00
puhui999
2c0f1121ca
拼团活动:完善 review 提到的问题
2023-10-08 17:46:48 +08:00
puhui999
2e559ebe06
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
...
# Conflicts:
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImpl.java
2023-10-08 17:33:21 +08:00
puhui999
c71bdd158a
拼团活动:完善 review 提到的问题
2023-10-08 17:19:39 +08:00
puhui999
c8a9d68933
拼团活动:完善 review 提到的问题
2023-10-08 12:08:17 +08:00
YunaiV
8a11ca8126
code review:拼团记录流程
2023-10-08 09:59:53 +08:00
YunaiV
01e6140d67
code review:拼团记录流程
2023-10-08 09:53:09 +08:00
YunaiV
99649bfdb8
code review:拼团记录流程
2023-10-08 07:43:25 +08:00
YunaiV
6a38da4ad9
promotion:合并最新代码
2023-10-07 23:00:13 +08:00
YunaiV
c917f01d83
promotion:code review 拼团相关的部分代码
2023-10-07 22:47:45 +08:00
puhui999
6636ee7420
拼团记录(APP):新增一个取消拼团的接口
2023-10-07 18:46:19 +08:00
puhui999
1a0fda23b1
拼团记录:调整团长的 headId 为 CombinationRecordDO#HEAD_ID_GROUP
2023-10-07 17:11:25 +08:00
puhui999
89b240c1f9
订单:介入 TradeOrderHandler#cancelOrder
2023-10-07 16:58:40 +08:00
puhui999
c485c6e04d
订单:重构拼团下单流程更改为订单支付后再创建拼团记录
2023-10-07 16:30:28 +08:00
puhui999
c95317577d
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
...
# Conflicts:
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImpl.java
2023-10-07 14:33:09 +08:00
puhui999
f40bd23f6a
拼团记录:完善拼团记录创建前的条件校验规则
2023-10-07 14:30:25 +08:00
YunaiV
ec2c3e508a
promotion:优化拼团记录的详情代码
2023-10-07 13:58:12 +08:00
YunaiV
c7b5df930e
promotion:修复拼团下单时,相关字段记录不正确的情况。
2023-10-07 07:09:15 +08:00
YunaiV
c8f1269d6e
promotion:修复砍价活动返回的 combinationPrice 为空的问题
2023-10-06 22:29:11 +08:00
芋道源码
1d9db4874f
!654 拼团记录:完善拼团记录后台管理接口
...
Merge pull request !654 from puhui999/feature/mall_product
2023-10-06 14:00:23 +00:00
puhui999
6099786c1b
拼团记录:完善拼团记录后台管理接口
2023-10-06 21:26:53 +08:00
puhui999
8b480c52cc
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
...
# Conflicts:
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationRecordMapper.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordService.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImpl.java
2023-10-06 21:15:06 +08:00
YunaiV
34bf360da6
trade:调整拼团活动列表接口
2023-10-06 21:04:37 +08:00
puhui999
ce77d510bb
拼团记录:添加拼团记录后台管理接口
2023-10-06 20:27:22 +08:00
owen
383439f902
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
2023-10-06 14:17:14 +08:00
owen
4f33a0c9c0
统计:交易统计Review修改
2023-10-06 14:15:59 +08:00
芋道源码
a76760c419
!653 完善拼团活动下单流程
...
Merge pull request !653 from puhui999/feature/mall_product
2023-10-06 02:20:21 +00:00
YunaiV
8e7b295d24
trade:砍价记录的详情 100%
2023-10-06 10:17:41 +08:00
YunaiV
5f57cc6247
trade:砍价记录的详情 50%
2023-10-06 02:06:38 +08:00
puhui999
3d51c67f1a
拼团活动:app-api 获得拼团活动列表增加 Spring Cache 缓存
2023-10-06 01:43:56 +08:00
puhui999
92da91a7dc
订单:修改订单收货地址添加日志记录
2023-10-06 01:32:57 +08:00
puhui999
9d7285c4ed
营销活动:实现 list-by-spu-ids 接口
2023-10-06 01:19:32 +08:00
puhui999
07493bc7e5
营销活动:实现 list-by-spu-id 接口
2023-10-06 01:04:36 +08:00
puhui999
3f6f7f404b
拼团活动:更改创建拼团记录的校验方式
2023-10-06 00:24:40 +08:00
puhui999
474eebd8c9
拼团活动:更改创建拼团记录的校验方式
2023-10-06 00:20:00 +08:00
puhui999
f732e7a750
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
...
# Conflicts:
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/bargain/BargainRecordApiImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainRecordServiceImpl.java
2023-10-06 00:05:28 +08:00
puhui999
038e23a6b3
拼团活动:完善拼团 app-api 相关接口
2023-10-06 00:03:03 +08:00
YunaiV
aec8e853e4
trade:完善砍价的下单流程
2023-10-05 23:24:44 +08:00
puhui999
0b2943ba8b
拼团活动:完善拼团下单金额结算
2023-10-05 21:28:38 +08:00
puhui999
07d6ab5842
拼团活动:完善 TradeCombinationHandler
2023-10-05 19:14:19 +08:00
YunaiV
1bda3c8b53
promotion:完善砍价 API ~ 提交下,准备出门吃饭!!!!
2023-10-05 17:22:17 +08:00
YunaiV
6a04d6c458
promotion:新增助力记录列表
2023-10-05 12:43:14 +08:00
YunaiV
269da3d56d
promotion:新增砍价记录列表
2023-10-05 12:07:05 +08:00
YunaiV
cd45be1fe2
promotion:优化砍价活动的分页结果
2023-10-05 02:18:14 +08:00
YunaiV
16e436a0f5
promotion:增加助力砍价的接口
2023-10-05 00:05:20 +08:00
YunaiV
cc087e4eca
promotion:增加创建砍价的接口
2023-10-04 21:55:05 +08:00
YunaiV
a37427c355
stat:增加用户统计的设计
2023-10-04 18:53:49 +08:00
YunaiV
c5824eedf7
Merge branch 'feature/mall_product' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product
...
# Conflicts:
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
2023-10-04 17:33:14 +08:00
YunaiV
6f39b2c030
trade:1、重构 order handler 的参数;2、增加砍价商品的价格计算
2023-10-04 17:30:07 +08:00
YunaiV
8dbabb9efc
trade:1、重构 order handler 的参数;2、增加砍价商品的价格计算
2023-10-04 11:29:38 +08:00
owen
7a15b340b0
交易:核销
2023-10-04 10:51:36 +08:00
owen
60ea719b46
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
...
# Conflicts:
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/order/TradeOrderMapper.java
2023-10-04 09:12:48 +08:00
owen
8e905f706d
交易:核销
2023-10-04 09:11:51 +08:00
YunaiV
dc1347184f
code review:拼团、砍价活动
2023-10-04 00:47:17 +08:00
YunaiV
20f5834d9a
trade:价格计算时,接入优惠劵逻辑
2023-10-04 00:30:03 +08:00
YunaiV
a1e9bedf34
promotion:完善秒杀的 uniapp 接口
2023-10-03 21:45:51 +08:00
owen
5819b08740
交易:Review修改
2023-10-03 21:25:23 +08:00
owen
3c5917a6cd
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
2023-10-03 21:21:48 +08:00
owen
a9e822762d
统计:交易统计定时任务
2023-10-03 21:21:11 +08:00
YunaiV
ac55a9657c
promotion:完善秒杀模块
2023-10-03 18:41:41 +08:00
YunaiV
c66b4e7bc0
code review:日志清理 Job
2023-10-03 11:02:33 +08:00
YunaiV
1bc1be14fb
Merge branch 'feature/mall_product' of https://gitee.com/lanxindx/ruoyi-vue-pro into feature/mall_product
...
# Conflicts:
# yudao-server/src/main/resources/application-local.yaml
2023-10-03 10:33:22 +08:00
YunaiV
df4716d5a1
code review:分销
2023-10-03 10:23:40 +08:00
芋道源码
d874346d42
!649 Review代码修改
...
Merge pull request !649 from 疯狂的世界/feature/mall_product
2023-10-02 15:58:31 +00:00
owen
b7359706db
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
2023-10-02 23:52:25 +08:00
owen
d0f0bc5888
分销:调整推广人列表查询方式
2023-10-02 23:51:49 +08:00
owen
7fdd36d979
Review代码修改
2023-10-02 21:27:46 +08:00
YunaiV
1f910992d6
trade:新增是否自提的配置项
2023-10-02 21:18:52 +08:00
j-sentinel
2f0483ce9f
[新增][定时任务]重新申请 ApiAccessLog、ApiErrorLog、JobLog 3个日志的定时清理
2023-10-02 19:18:36 +08:00
YunaiV
fdb10aeced
trade:优化运费模版的实现
2023-10-02 18:30:14 +08:00
YunaiV
6f4c04d944
trade:完善退款详情
2023-10-02 15:44:41 +08:00
YunaiV
0c1f5c9582
trade:完善订单详情
2023-10-02 10:34:52 +08:00
YunaiV
f8b4a08fae
code review:访问日志、错误日志的清理 Job 实现
2023-10-02 00:06:28 +08:00
YunaiV
d4417d2474
code review:积分、优惠劵、佣金等逻辑
2023-10-01 23:31:07 +08:00
YunaiV
057952bdeb
Merge branch 'feature/mall_product' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product
...
# Conflicts:
# yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/LocalDateTimeUtils.java
2023-10-01 22:00:31 +08:00
YunaiV
b74169acfc
trade:优化订单列表的查询
2023-10-01 21:59:51 +08:00
芋道源码
4f7d6b4959
!643 订单:完善拼团活动和一些 TODO
...
Merge pull request !643 from puhui999/feature/mall_product
2023-10-01 13:56:43 +00:00
芋道源码
00c2153fd3
!646 ApiAccessLog、ApiErrorLog、JobLog 3 个日志的 定时 物理清理
...
Merge pull request !646 from lanxindx/feature/mall_product
2023-10-01 13:55:00 +00:00
owen
abfebebdd5
交易:增加 积分抵扣计算器 单元测试
2023-10-01 17:12:33 +08:00
j-sentinel
11921fab5a
[新增][定时任务]ApiAccessLog、ApiErrorLog、JobLog 3个日志的定时清理
2023-10-01 16:53:17 +08:00
owen
afd306a71d
交易:增加 赠送积分计算器 单元测试
2023-10-01 16:23:41 +08:00
owen
2168145c3e
会员:会员配置的积分相关字段加上point前缀
2023-10-01 10:41:21 +08:00
owen
ab35fcbe9b
会员:积分配置改为会员配置
2023-10-01 10:25:18 +08:00
owen
4f03635fcd
签到:签到后增加用户积分、经验
2023-10-01 09:53:54 +08:00
owen
a04a3a27a9
Review代码修改
2023-09-30 23:41:11 +08:00
puhui999
d3f03540f8
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
2023-09-30 23:35:19 +08:00
puhui999
82210a9583
订单:完善拼团活动
2023-09-30 23:34:45 +08:00
owen
7d68bdc7c8
分销:重构下级分销统计
2023-09-30 23:30:06 +08:00
owen
cafa938ff4
common:LocalDateTimeUtils 增加方法:月份开始时间、月份结束时间
2023-09-30 22:21:47 +08:00
owen
e7876b1520
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
2023-09-30 22:09:49 +08:00
YunaiV
3875c80471
wallet:钱包支付,接入 user 付款界面
2023-09-30 22:08:15 +08:00
owen
d2c5eaf916
优惠券:重构是否领取检查方式
2023-09-30 22:05:11 +08:00
owen
aaa01de21d
分销:修改佣金排名查询算法
2023-09-30 19:55:18 +08:00
owen
d0d21b2787
优惠券:新增/修改时,校验对应的商品、分类是否存在
2023-09-30 19:39:02 +08:00
YunaiV
16cea61435
wallet:增加充值套餐
2023-09-30 18:54:10 +08:00
owen
42a899c5d3
交易:订单增加字段 推广人编号
2023-09-30 17:49:38 +08:00
owen
fc432ba073
优惠券:新人券使用 MQ 发放
2023-09-30 17:29:32 +08:00
ligiteezhanghao
9d71dff2a4
操作日志搜索参数名修改
...
Signed-off-by: ligiteezhanghao <3550906264@qq.com >
2023-09-30 09:10:02 +00:00
owen
497ea2eee8
会员详情,修改会员积分
2023-09-30 15:50:13 +08:00
kehaiyou
d7ae944438
feat: 【工作流】--减签逻辑优化
2023-09-30 15:35:14 +08:00
kehaiyou
cd678e997a
feat: 【工作流】--减签和加签共用处理父任务逻辑
2023-09-30 14:56:16 +08:00
owen
be6399238b
会员详情,查询钱包信息
2023-09-30 12:40:22 +08:00
芋道源码
86e2523069
!638 修改springdoc版本,解决Swagger文档都是form提交。
...
Merge pull request !638 from fangyuan/master
2023-09-30 04:35:25 +00:00
YunaiV
3489144757
新任务:日志的清理 job
2023-09-30 12:31:18 +08:00
YunaiV
367b45e3bd
code review:数据统计
2023-09-30 12:30:01 +08:00
puhui999
597eacaaeb
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
...
# Conflicts:
# yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
2023-09-30 11:35:51 +08:00
puhui999
0b35d4a7e3
订单:完善拼团活动部分 TODO
2023-09-30 11:27:24 +08:00
puhui999
5ecd0d94eb
订单:添加 order handler 默认抽象实现类,子类可以选择性地实现抽象方法,而不必实现所有方法
2023-09-30 11:24:52 +08:00
芋道源码
b376de1ad3
!640 交易统计
...
Merge pull request !640 from 疯狂的世界/feature/mall_product
2023-09-30 03:00:12 +00:00
owen
6b7f071988
Review代码修改
2023-09-29 22:47:04 +08:00
owen
26628913cb
错误码分段
2023-09-29 21:34:38 +08:00
owen
929ff4286a
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
2023-09-29 21:08:49 +08:00
owen
171161e6c7
统计:交易统计
2023-09-29 21:08:15 +08:00
YunaiV
96b1662e4a
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
2023-09-29 20:52:22 +08:00
YunaiV
9ee0aebd3f
promotion:增加 coupon 的 code review
2023-09-29 20:52:11 +08:00
kehaiyou
80d532b0f1
feat: 【工作流】--减签
2023-09-29 15:51:00 +08:00
kehaiyou
7d497ce09b
feat: 【工作流】--加签
2023-09-29 14:57:28 +08:00
jason
71ec06393a
merge 冲突修改
2023-09-29 14:56:32 +08:00
jason
57d782bc94
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
...
# Conflicts:
# yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java
2023-09-29 14:06:12 +08:00
jason
ce6f7ab1b1
Pay: 新增转账示例单
2023-09-29 14:01:58 +08:00
jason
aa2f651124
Pay: 转账单实现
2023-09-29 13:50:06 +08:00
YunaiV
666ba351a2
trade:退款理由的维护
2023-09-29 13:35:40 +08:00
YunaiV
3c643f814c
trade:补全售后日志的记录
2023-09-29 11:46:43 +08:00
YunaiV
d402bdb7e0
trade:优化售后取消订单的实现代码
2023-09-29 10:08:20 +08:00
wangfy
62f821abf2
wangfangyuan,fix:修改springdoc版本,解决Swagger文档都是form提交。
2023-09-28 23:15:00 +08:00
YunaiV
f9bf41d773
code review:分佣剩余部分的 review
2023-09-28 22:22:38 +08:00
YunaiV
b1ce971a2f
code review:解决分佣的 npe 问题
2023-09-28 16:39:07 +08:00
YunaiV
9cd36abf10
同步 master 分支代码
2023-09-28 15:28:40 +08:00
YunaiV
5913ee0706
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
...
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
# 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/bargain/vo/activity/AppBargainActivityDetailRespVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityRespVO.java
# yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementReqVO.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
# yudao-server/src/main/resources/application-local.yaml
2023-09-28 15:18:59 +08:00
YunaiV
eeb8873b1d
trade:微调交易配置的注释
2023-09-28 15:10:56 +08:00
YunaiV
9e3564bd6a
code review:优惠劵逻辑
2023-09-28 09:23:42 +08:00
芋道源码
8811ce0200
!637 完善优惠券功能
...
Merge pull request !637 from 疯狂的世界/feature/mall_product
2023-09-28 00:11:43 +00:00
owen
b2c608e7a5
交易:发货订单日志
2023-09-27 21:27:55 +08:00
owen
565a8e0e6b
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
2023-09-27 21:24:37 +08:00
YunaiV
b9018baa03
trade:简化价格调整的逻辑
2023-09-27 19:14:48 +08:00
YunaiV
c5f2d07c87
商城:增加 stat 统计设计
2023-09-27 19:14:32 +08:00
YunaiV
26dfbfb2ac
trade:发货逻辑,增加订单日志
2023-09-27 09:55:04 +08:00
owen
be426235dd
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
2023-09-27 01:20:40 +08:00
owen
bc07e1dbf4
售后:重构售后更新订单的逻辑
2023-09-27 01:19:49 +08:00
owen
74ef98f8fc
售后:售后成功后,回滚 SKU 库存
2023-09-27 00:24:22 +08:00
owen
2766dd672a
优惠券:过期定时任务
2023-09-27 00:15:12 +08:00
owen
11ffa45b89
积分:Review代码修改
2023-09-26 23:54:43 +08:00
YunaiV
53bd1b9ec1
trade:订单评论超时时,自动评论
2023-09-26 23:50:54 +08:00
owen
cd2d0b7089
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
2023-09-26 23:23:12 +08:00
owen
77f7763560
优惠券:完善优惠券领取接口
2023-09-26 23:21:01 +08:00
YunaiV
cf41347cb3
trade:支付订单成功时,记录订单日志
2023-09-26 22:48:21 +08:00
owen
b1ac3a0b8b
优惠券:完善优惠券匹配接口
2023-09-26 22:46:06 +08:00
owen
f9aec7d8fd
优惠券:完善我的优惠券接口
2023-09-26 21:08:11 +08:00
YunaiV
debf568750
code review:增加取消售后的优化建议
2023-09-26 20:57:10 +08:00
owen
0a3a6825d5
优惠券:完善APP优惠券查询接口
2023-09-26 20:44:22 +08:00
YunaiV
ad535e674f
trade:积分相关的价格计算
2023-09-26 20:11:54 +08:00
YunaiV
a8c78f3097
trade:增加自动收货的 job
2023-09-26 19:27:37 +08:00
owen
a431bccc02
分销:Review代码修改
2023-09-26 15:11:48 +08:00
YunaiV
9e99b04375
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
2023-09-26 00:04:18 +08:00
YunaiV
826d792ff2
trade:增加自动取消的 job
2023-09-26 00:04:11 +08:00
绮梦
5a5f92d2e9
feat: 测试站内信接口增加Member 用户类型的支持。
2023-09-25 15:54:31 +08:00
puhui999
bce96b29a6
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
...
# Conflicts:
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateReqBO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateRespBO.java
2023-09-25 15:06:57 +08:00
puhui999
42c47d9b44
秒回活动:订单金额计算初步设计
2023-09-25 14:56:56 +08:00
YunaiV
f088fdff84
code review:委托逻辑
2023-09-25 13:59:44 +08:00
芋道源码
8649b285cf
!631 【工作流】委派
...
Merge pull request !631 from Youkehai/feature/bpm-delegate
2023-09-25 05:42:12 +00:00
youkehai
3972fbd1d9
fix: 根据review结果修改
2023-09-25 11:30:44 +08:00
jason
437185cb1d
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
2023-09-25 10:48:32 +08:00
jason
6fcff0863a
支付宝统一退款接口 subCode == ACQ.SYSTEM_ERROR 返回 WAITING 状态
2023-09-25 10:43:23 +08:00
芋道源码
56c4595058
!633 up springboot 2.7.16
...
Merge pull request !633 from xingyu/feature/v2.7.16
2023-09-25 01:41:32 +00:00
YunaiV
e384b810bf
code review:分销逻辑
2023-09-25 09:39:39 +08:00
youkehai
1553900193
fix: 解决冲突
2023-09-25 09:22:11 +08:00
youkehai
d6e736bd56
Merge branch 'master' into feature/bpm-delegate
...
# Conflicts:
# yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/ErrorCodeConstants.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java
2023-09-25 09:15:59 +08:00
芋道源码
c92365128a
!635 分销Review代码修改
...
Merge pull request !635 from 疯狂的世界/feature/mall_product
2023-09-25 00:39:16 +00:00
owen
16af31d980
分销:@Select sql语句增加逻辑删除字段过滤
2023-09-25 08:36:55 +08:00
jason
0f0e6eb8ba
Pay Client 新增转账接口
2023-09-25 08:34:58 +08:00
owen
3dca66eefa
分销:提现统计
2023-09-25 08:05:29 +08:00
YunaiV
f864aa1cfd
Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro
...
# Conflicts:
# sql/mysql/ruoyi-vue-pro.sql
2023-09-24 23:25:14 +08:00
YunaiV
0669b9da34
Merge remote-tracking branch 'origin/master'
2023-09-24 23:24:32 +08:00
YunaiV
9b7c757942
1.8.2 版本发布
2023-09-24 23:24:24 +08:00
owen
0b84c18736
分销:修正分享海报
2023-09-24 23:18:51 +08:00
芋道源码
3a297271eb
!634 fix: MemberUserServiceImpl需要填充exception错误信息中的参数
...
Merge pull request !634 from dhb52/master
2023-09-24 15:09:19 +00:00
YunaiV
83a133b344
bpm:优化 BpmnModelUtils
2023-09-24 23:06:04 +08:00
owen
967e578d54
分销:重命名提现类型字段
2023-09-24 22:32:13 +08:00
owen
9856e17974
分销:根据商品,计算推广员可以得到的佣金
2023-09-24 22:27:24 +08:00
dhb52
96d4e7bc56
fix: 需要填充错误信息中的参数
2023-09-24 22:23:31 +08:00
YunaiV
ffdaf3a859
bpm:简化流程驳回的逻辑实现,提升可读性
2023-09-24 22:19:36 +08:00
owen
e9fd377772
分销:Review代码修改
2023-09-24 20:28:44 +08:00
xingyu
63fee66657
chore: update okio fix minio bug
2023-09-24 18:04:48 +08:00
xingyu
cfec4b12ca
docs: update springboot 2.7.16
2023-09-24 17:46:48 +08:00
xingyu
13f135abe9
chore: update deps
2023-09-24 17:44:35 +08:00
xingyu
a98a7c7645
chore: lombok 1.18.30
2023-09-24 17:38:18 +08:00
xingyu
22041b6f8d
chore: hutool 5.8.22
2023-09-24 17:36:42 +08:00
xingyu
8187398bdf
chore: springboot 2.7.16
2023-09-24 17:36:09 +08:00
YunaiV
0b649fd3e1
bpm:简化获得可回退节点的实现
2023-09-24 16:08:50 +08:00
kehaiyou
4efa93b03b
feat: 【工作流】--委派
2023-09-24 15:43:35 +08:00
芋道源码
3826846368
!629 工作流-》流程实例的任务节点回退
...
Merge pull request !629 from Youkehai/master
2023-09-24 07:17:51 +00:00
kehaiyou
921f99d39d
fix: 方法,变量名词,注释规范
2023-09-24 13:13:55 +08:00
YunaiV
421bb7d154
code review:分销逻辑
2023-09-24 11:56:00 +08:00
jason
60f766f35c
钱包充值允许多次退款
2023-09-24 10:49:13 +08:00
芋道源码
51899c4c13
!627 trade: 分销业务 - 提现申请
...
Merge pull request !627 from 疯狂的世界/brokerate
2023-09-24 02:15:39 +00:00
owen
f7296d18b9
Merge remote-tracking branch 'origin/feature/mall_product' into brokerate
...
# Conflicts:
# yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/common/PromotionTypeEnum.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderItemDO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateRespBO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradePriceCalculatorHelper.java
# yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/dto/MemberUserRespDTO.java
2023-09-24 10:10:53 +08:00
芋道源码
b420c5b8fe
!630 对具有软删除的表去除UNIQUE INDEX
...
Merge pull request !630 from dhb52/master
2023-09-24 02:01:53 +00:00
芋道源码
9b8312f596
!626 发起流程成功后,用户流程列表未刷新
...
Merge pull request !626 from samisgod/master
2023-09-24 02:01:33 +00:00
owen
29b806e675
Framework:增加LocalDate、LocalTime序列化
2023-09-24 09:57:09 +08:00
芋道源码
798ae7c2c7
Merge pull request #344 from Shimada666/patch-1
...
fix: 使初始化数据脚本兼容 mysql5.7
2023-09-24 09:24:09 +08:00
dhb52
2a9aa357cb
fix: 对具有软删除的表去除UNIQUE INDEX
2023-09-24 08:29:56 +08:00
YunaiV
b4587fd79e
product:订单表,增加 vip 优惠字段
2023-09-24 00:45:32 +08:00
YunaiV
53e789dfdc
trade:订单表,增加 vip 优惠字段
2023-09-23 23:58:22 +08:00
owen
bf0e7d2c77
System:字典数据列表过滤已关闭的数据
2023-09-23 23:42:20 +08:00
YunaiV
aa5525d1f5
code review:营销活动 & 交易订单的对接
2023-09-23 22:21:23 +08:00
YunaiV
1da14a3f53
trade:删除订单的实现
2023-09-23 20:23:28 +08:00
YunaiV
a9485ad6bf
trade:取消订单、确认收货,增加订单日志
2023-09-23 18:13:35 +08:00
YunaiV
e9c9ac0cab
trade:确认收货时,增加订单日志
2023-09-23 17:47:39 +08:00
kehaiyou
b13f71424b
feat: 工作流-》流程实例的任务节点回退
2023-09-23 14:47:34 +08:00
owen
052328c5fa
积分:完善积分获得、退还、使用 相关逻辑
2023-09-23 14:11:16 +08:00
YunaiV
71d6311bd4
code review:拼团、秒杀等逻辑
2023-09-23 09:27:29 +08:00
芋道源码
54fe0174bc
!625 完善订单和活动 review 提到的问题,完善 app 端获取拼团活动分页、列表、详情接口
...
Merge pull request !625 from puhui999/feature/mall_product
2023-09-23 01:03:00 +00:00
YunaiV
9451342aae
trade:营销商品(拼团、砍价)不能使用优惠劵
2023-09-22 23:54:18 +08:00
owen
dc46dff62c
Merge remote-tracking branch 'origin/feature/mall_product' into brokerate
2023-09-22 23:15:31 +08:00
owen
f30fa39067
修改Review代码
2023-09-22 23:15:10 +08:00
owen
bbd18afbcc
分佣: 简化推广用户关系树查询方式
2023-09-22 23:13:39 +08:00
owen
6e6486ccae
Trade: 完善配置
2023-09-22 22:51:46 +08:00
owen
ad0513c87c
分佣: 推广人列表
2023-09-22 22:12:15 +08:00
YunaiV
bf40767fa1
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
2023-09-22 21:56:17 +08:00
YunaiV
7c4fbc63dc
trade:物流费用计算,增加金额 divide 分拆逻辑
2023-09-22 21:56:09 +08:00
owen
ee15b802b2
分佣: 推广人排行
2023-09-22 21:12:09 +08:00
owen
972b01c001
分佣: 佣金排行
2023-09-22 20:55:05 +08:00
jason
92f6c8f4d6
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
2023-09-22 19:05:20 +08:00
jason
910ffa7a5a
钱包充值退款
2023-09-22 19:04:59 +08:00
owen
7a8a440eb6
分佣: 佣金记录
2023-09-22 18:49:26 +08:00
owen
eddc897cd8
分佣: 提现记录
2023-09-22 18:48:16 +08:00
owen
637ae8ce1d
分佣: 提现记录
2023-09-22 18:35:43 +08:00
owen
c146c98b72
分佣: 提现
2023-09-22 18:06:11 +08:00
owen
f72a087007
分佣: 我的推广统计接口
2023-09-22 15:42:59 +08:00
owen
594e4d5fee
system: uniapp增加字典数据查询接口
2023-09-22 15:11:06 +08:00
owen
a7de955926
trade: 分销业务 - 提现申请
2023-09-22 00:27:45 +08:00
owen
5ed99a9105
trade: 分销业务 - 整理包名
2023-09-22 00:26:32 +08:00
YunaiV
24111c1548
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
2023-09-21 22:02:30 +08:00
YunaiV
5949727c8d
trade:全局配送价格配置
2023-09-21 22:02:22 +08:00
jason
c880dbfa60
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
2023-09-21 17:32:43 +08:00
jason
dbd7ab5f23
code review 修改
2023-09-21 17:31:58 +08:00
samisgod
b94f89b4f5
refresh after task add
2023-09-21 15:08:35 +08:00
puhui999
8060aeb5e7
秒杀: app 端返回增加秒杀活动状态
2023-09-21 09:07:37 +08:00
YunaiV
35569c5ec8
trade:下单时,如果是门店自提,增加核销码的生成
2023-09-20 23:21:00 +08:00
YunaiV
1b477aaa0d
trade:优化下单逻辑的实现
2023-09-20 20:21:41 +08:00
puhui999
583a0a2dd5
砍价+拼团: 修复 selectList limit 条件执行报错问题
2023-09-20 16:28:41 +08:00
puhui999
6ef94ade6a
完善订单和活动 review 提到的问题
2023-09-20 16:06:29 +08:00
puhui999
52848d6341
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
...
# Conflicts:
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/AppSeckillActivityController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainActivityService.java
2023-09-20 10:14:43 +08:00
puhui999
1d2a6ad065
拼团活动: 完善 app 端获取活动分页、列表、详情接口
2023-09-20 10:09:15 +08:00
YunaiV
c766f7daa5
code review:砍价、秒杀的逻辑
2023-09-20 01:07:41 +08:00
YunaiV
1b154699c6
code review:处理错误的 mysql 连接
2023-09-20 00:10:18 +08:00
YunaiV
2278ad4652
Merge branch 'feature/mall_product' of https://gitee.com/puhui999/ruoyi-vue-pro into feature/mall_product
...
Conflicts:
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
2023-09-20 00:03:18 +08:00
YunaiV
962f2bbf69
code review:提现逻辑
2023-09-19 23:58:16 +08:00
YunaiV
9630f236f8
Merge branch 'feature/auth' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
...
Conflicts:
README.md
2023-09-19 22:28:45 +08:00
芋道源码
de7699d972
!624 trade: 分销业务 - 佣金提现
...
Merge pull request !624 from 疯狂的世界/brokerate
2023-09-19 14:25:43 +00:00
owen
e22c577f7a
trade: 分销业务 - 佣金提现后台管理
2023-09-19 22:20:32 +08:00
YunaiV
8cfb738db3
code review:分销逻辑
2023-09-19 22:16:25 +08:00
owen
32e1fc66ce
trade: 分销业务 - 佣金提现后台管理
2023-09-19 22:03:28 +08:00
芋道源码
581f9d4101
!622 trade: 分销业务review代码修改
...
Merge pull request !622 from 疯狂的世界/brokerate
2023-09-19 13:48:07 +00:00
芋道源码
edfa7bcefb
update README.md.
...
Signed-off-by: 芋道源码 <zhijiantianya@gmail.com >
2023-09-19 11:34:35 +00:00
puhui999
04a391cd4b
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
...
# Conflicts:
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/combination/CombinationActivityApiImpl.java
2023-09-19 18:58:53 +08:00
puhui999
408df683d8
秒杀活动: 完善 app 端获取活动分页、列表、详情接口
2023-09-19 18:57:28 +08:00
owen
f998d43e68
infra: 修正 查询实体列表方法,传入的ID集合为空时,会导致异常的问题
2023-09-19 17:14:42 +08:00
owen
a3e161a9a3
trade: 分销业务review代码修改
2023-09-19 16:50:43 +08:00
xingyu
6c80ef38f5
docs: spring boot3
2023-09-19 16:37:54 +08:00
owen
a3e8b42be6
trade: 分销业务review代码修改
2023-09-19 16:37:51 +08:00
puhui999
af6016bba5
砍价活动: 完善 app 端获取活动分页、列表、详情接口
2023-09-19 16:35:21 +08:00
owen
75874035a4
Merge remote-tracking branch 'origin/feature/mall_product' into brokerate
2023-09-19 15:31:14 +08:00
YunaiV
be1ecf96d4
code review:会员签到逻辑
2023-09-18 22:18:42 +08:00
YunaiV
477342d324
Merge branch 'feature/mall_product' of https://gitee.com/SummerQing/ruoyi-vue-pro into feature/mall_product
2023-09-18 13:49:07 +08:00
YunaiV
080c32b9f3
code review:钱包充值
2023-09-18 13:07:54 +08:00
YunaiV
b81ebe6f19
修复 common 下的 test 引入不正确的问题,减少包依赖大小
2023-09-17 01:37:10 +08:00
YunaiV
436fef7efa
1. 移除 netty-all,减少依赖
...
2. 修复 xss 无法禁用的问题
2023-09-17 00:37:11 +08:00
YunaiV
222daa5366
pay 缓存,使用 guava 替代 job 扫描,目的:提升启动速度,加快缓存失效
2023-09-16 23:22:58 +08:00
YunaiV
a51579a77d
fileConfig 缓存,使用 guava 替代 job 扫描,目的:提升启动速度,加快缓存失效
2023-09-16 21:35:05 +08:00
YunaiV
48fd4972da
sms 缓存,使用 guava 替代 job 扫描,目的:提升启动速度,加快缓存失效
2023-09-16 20:58:34 +08:00
YunaiV
ab800aa891
1. 简化 JsonUtils 初始化方式,去掉 BeanPostProcessor
...
2. 减少日志打印
目的:优化启动速度
2023-09-16 18:05:50 +08:00
YunaiV
50371b3676
1. 禁用 member 模块
...
2. 减少 mybatis 日志打印
3. 降低 local 环境的初始连接
目的:提升项目的启动速度
2023-09-16 17:04:59 +08:00
YunaiV
62c4838ba7
默认禁用 spring boot admin 的启动
2023-09-16 15:30:02 +08:00
YunaiV
ebb3a04251
优化多租户 Job 的实现,采用 AOP 替代 BeanPostProcessor,提升启动速度
2023-09-16 14:06:15 +08:00
YunaiV
6a371f06b0
默认禁用 spring data redis repositories,一方面没用到,一方面提高启动速度
2023-09-16 13:29:47 +08:00
YunaiV
808ff6abb9
默认禁用 lock4j 依赖,保证启动速度
2023-09-16 13:14:40 +08:00
YunaiV
f0f5b52150
默认禁用 quartz 依赖,保证启动速度
2023-09-16 12:50:36 +08:00
YunaiV
08d39d4593
默认禁用 resilience4j 依赖,保证启动速度
2023-09-16 12:01:49 +08:00
owen
a52e490c86
Merge remote-tracking branch 'origin/feature/mall_product' into brokerate
2023-09-16 08:41:06 +08:00
xiaqing
d4a891e6c4
新增两个APP端接口
...
1.获取用户个人签到信息
2.用户签到接接口
2023-09-15 23:21:11 +08:00
xiaqing
0907ca2081
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
2023-09-15 22:09:13 +08:00
jason
bbc16bb937
钱包充值 Mapper 类
2023-09-15 16:14:04 +08:00
owen
73e4976ae4
Merge remote-tracking branch 'origin/feature/mall_product' into brokerate
2023-09-15 16:11:01 +08:00
xiaqing
e893cfd757
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
...
# Conflicts:
# yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/signin/MemberSignInRecordConvert.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/signin/MemberSignInRecordMapper.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordService.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordServiceImpl.java
2023-09-15 15:27:59 +08:00
xiaqing
9d262e8e7f
新增两个APP端接口
...
1.获取用户个人签到信息
2.用户签到接接口
2023-09-15 15:20:39 +08:00
owen
2c821d2bbf
Merge remote-tracking branch 'origin/feature/mall_product' into brokerate
2023-09-15 14:13:48 +08:00
jason
ebd4ea548c
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
...
# Conflicts:
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/combination/CombinationApiImpl.java
2023-09-14 16:59:05 +08:00
jason
0e1b8126dd
新增钱包充值。启动报错修复
2023-09-14 16:55:31 +08:00
YunaiV
cfaffd3c88
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
2023-09-13 23:26:38 +08:00
YunaiV
1b9a3f9f63
code review:调整操作日志的封装
2023-09-13 23:25:52 +08:00
jason
bcb3b19418
钱包充值 表结构设计
2023-09-13 17:28:42 +08:00
puhui999
a10d77cdfe
mall+order: 完善部分 TODO 提到的问题
2023-09-13 12:04:13 +08:00
xingyu
437131cc7a
Merge remote-tracking branch 'origin/master' into feature/auth
...
# Conflicts:
# yudao-dependencies/pom.xml
2023-09-13 12:00:10 +08:00
YunaiV
9358639c41
code review:订单部分逻辑
2023-09-12 23:01:12 +08:00
YunaiV
e8bdd8349c
code review:订单部分逻辑
2023-09-12 13:54:52 +08:00
Shimada666
a2ba5518e0
fix: 使初始化数据脚本兼容 mysql5.7
...
官方文档中,推荐使用 mysql5.7
"项目使用 MySQL 存储数据,所以需要启动一个 MySQL 服务,建议使用 5.7 版本。"
但实际上,现在的初始化数据脚本中包含 mysql8.0 才引入的排序规则,与 5.7 不兼容。
故修改排序规则,将 utf8mb4_0900_ai_ci 均改为 utf8mb4_unicode_ci,以支持 mysql5.7
2023-09-12 13:06:20 +08:00
YunaiV
bdd81e4cbc
Merge branch 'feature/mall_product' of https://gitee.com/puhui999/ruoyi-vue-pro into feature/mall_product
...
Conflicts:
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
2023-09-12 12:22:55 +08:00
YunaiV
82c6354e1d
code review:分销逻辑
2023-09-12 09:20:42 +08:00
芋道源码
18c9f22560
!616 完善分销功能
...
Merge pull request !616 from 疯狂的世界/brokerate
2023-09-11 14:20:02 +00:00
owen
c67ecbf61d
Merge remote-tracking branch 'origin/feature/mall_product' into brokerate
2023-09-11 20:04:23 +08:00
puhui999
950ec10cff
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
2023-09-11 17:51:17 +08:00
puhui999
254d7828aa
mall+order: 订单活动特殊逻辑的抽离
2023-09-11 17:48:01 +08:00
YunaiV
1f327ef8ca
更新商城的演示地址
2023-09-11 16:55:56 +08:00
YunaiV
f2ee213caa
更新商城的演示地址
2023-09-11 16:42:38 +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
xingyu
4674caa01a
fix: vben codegen
2023-09-11 13:35:00 +08:00
xingyu
092e48b9d5
perf: vben codegen
2023-09-11 12:41:48 +08:00
xingyu
5e9e41c045
fix: required 过期
2023-09-11 12:30:33 +08:00
xingyu
1184b46c40
chore: up justauth 1.0.4
2023-09-11 12:21:46 +08:00
xingyu
97a91e5454
chore: up hutool 5.8.21
2023-09-11 11:29:14 +08:00
xingyu
c5b78a2af5
chore: up druid 1.2.19
2023-09-11 11:25:12 +08:00
xingyu
e1b92c3d64
chore: up springboot 2.7.15
2023-09-11 11:22:20 +08:00
YunaiV
314dee430e
bugfix:微信公众号登录报 access token 的问题
2023-09-11 11:06:42 +08:00
owen
77daa0085e
trade: 分销业务review代码修改
2023-09-11 00:54:12 +08:00
puhui999
7fb455096c
商城活动: 完善活动商品并发库存扣减逻辑
2023-09-11 00:13:45 +08:00
owen
cddeb37289
Merge remote-tracking branch 'origin/feature/mall_product' into brokerate
...
# Conflicts:
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/record/BrokerageRecordConvert.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/user/BrokerageUserConvert.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/record/BrokerageRecordServiceImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/user/BrokerageUserServiceImpl.java
2023-09-10 23:56:00 +08:00
owen
4eedf6ad36
Merge remote-tracking branch 'owen/brokerate' into brokerate
2023-09-10 23:36:46 +08:00
owen
290d1671a2
trade: 分销业务后台功能:推广订单列表
2023-09-10 23:36:38 +08:00
owen
0c9485a6bf
infra: 修正 查询实体列表方法,传入的ID集合为空时,会导致异常的问题
2023-09-10 23:36:23 +08:00
owen
dffdd471d5
member: 修正 查询用户列表方法,传入的ID集合为空时,会导致异常的问题
2023-09-10 23:32:40 +08:00
owen
6c193f723f
trade: 分销业务后台功能:推广订单列表
2023-09-10 23:30:43 +08:00
puhui999
3976011af0
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
2023-09-10 22:54:01 +08:00
owen
499a054eb9
trade: 分销业务后台功能:推广用户列表
2023-09-10 22:32:39 +08:00
YunaiV
40e1a879e3
登录:社交登录时,额外返回 openid
2023-09-10 18:01:53 +08:00
puhui999
57f0ea04f7
mall-order: 完善活动商品库存扣减逻辑(并发更新库存下一提交实现)
2023-09-10 11:06:39 +08:00
puhui999
c023209aa5
订单管理:完善订单调价分摊逻辑
2023-09-10 00:50:13 +08:00
puhui999
51dab96889
支付订单错误码枚举类变量添加 PAY_ 前缀和交易订单区分开避免冲突
2023-09-10 00:48:30 +08:00
puhui999
50354462fe
spu:分佣属性和分佣保持一致
2023-09-09 23:18:09 +08:00
puhui999
95d8be0455
订单管理:完善订单聚合搜索
2023-09-09 23:04:13 +08:00
YunaiV
2bbd86e25d
优化 README 说明
2023-09-09 22:53:26 +08:00
YunaiV
4265441e1d
分销:增加商品的分佣金额计算 api mock
2023-09-09 22:28:01 +08:00
YunaiV
a47d744f64
分销:绑定分销的 url 调整
2023-09-09 21:05:44 +08:00
owen
797680895b
trade: 分销业务后台功能:佣金格式化
2023-09-09 20:00:57 +08:00
YunaiV
cd51d57f12
分销:调整 app 的 price 到 brokeragePrice
2023-09-09 19:42:53 +08:00
YunaiV
426594ae00
分销:调整 app 的 price 到 brokeragePrice
2023-09-09 19:34:50 +08:00
owen
643602d038
trade: 分销业务后台功能:修改上级推广人
2023-09-09 19:20:12 +08:00
jason
5858f57fe9
钱包 review 修改
2023-09-09 18:32:53 +08:00
YunaiV
5a940b1d2c
修复 knife4j get 参数无法正确展示的问题
2023-09-09 15:04:22 +08:00
YunaiV
a5e33f6d3a
引入 mybatis plus join 作为基类
2023-09-09 14:56:30 +08:00
owen
ca55e61dd2
trade: 分销业务后台功能:清除推广员、修改推广资格
2023-09-09 14:38:47 +08:00
YunaiV
65d7b30011
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2023-09-09 10:35:14 +08:00
YunaiV
55f8585ea8
同步
2023-09-09 10:34:58 +08:00
芋道源码
fcf8ec98a0
!608 Date转localDateTime
...
Merge pull request !608 from GamePlayer-Joker/master
2023-09-09 02:22:13 +00:00
芋道源码
5719b7df06
!612 使用下划线分隔ErrorCodeConstants的ErrorCode
...
Merge pull request !612 from dhb52/master
2023-09-09 02:20:55 +00:00
芋道源码
5d4a750dfb
!609 ID列存在换行符造成SQL Server建库时列名异常,并造成后续相关命令执行失败
...
Merge pull request !609 from samisgod/master
2023-09-09 02:20:03 +00:00
YunaiV
7bf21fb02d
Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro
2023-09-09 10:14:11 +08:00
芋道源码
57d2b7e3be
Merge pull request #342 from Lemon-cc-hang/social
...
🌈 style: 描述错误, 社交类型的枚举为 SocialTypeEnum 而不是 SysUserSocialTypeEnum
2023-09-09 10:13:54 +08:00
YunaiV
557b09a157
code review:分销逻辑
2023-09-09 09:41:57 +08:00
芋道源码
3b5215db21
!611 分销用户管理、Review代码修改
...
Merge pull request !611 from 疯狂的世界/brokerate
2023-09-09 00:48:00 +00:00
owen
4e9be7a181
trade: 分销业务后台功能:修改推广资格
2023-09-09 01:58:46 +08:00
owen
259734964d
trade: 分销业务后台功能:清除推广员、修改推广员
2023-09-09 01:54:48 +08:00
owen
f97c7a0f6e
trade: 分销业务绑定推广员
2023-09-09 01:46:42 +08:00
dhb52
d7488e70b0
使用下划线分割ErrorCodeConstants的ErrorCode
2023-09-09 01:30:51 +08:00
YunaiV
87c55784c4
code review:营销活动+订单
2023-09-09 01:27:55 +08:00
芋道源码
5235aff8ad
!610 营销活动+订单:完善大部分 TODO 提到的问题
...
Merge pull request !610 from puhui999/feature/mall_product
2023-09-08 15:36:51 +00:00
owen
6ef36d5ca6
trade: 增加分销 API
2023-09-08 23:33:02 +08:00
owen
1ead368595
trade: 优化分销用户佣金字段名称
2023-09-08 23:10:04 +08:00
owen
4b43304c76
trade: 优化分销用户绑定用户编号、绑定时间字段名称
2023-09-08 22:51:05 +08:00
YunaiV
3e09da0128
code review:支付钱包
2023-09-08 22:47:00 +08:00
owen
f36a6c5d6c
trade: 优化修改推广员接口字段名称
2023-09-08 22:40:49 +08:00
owen
b85d660a5c
trade: 分销业务完善校验
2023-09-08 22:33:44 +08:00
lemoncc
2fd201c7fa
🌈 style: 描述错误, 社交类型的枚举为 SocialTypeEnum 而不是 SysUserSocialTypeEnum
2023-09-08 16:33:49 +08:00
owen
0a0c3c0ede
trade: 分销业务相关类型移除Trade前缀
2023-09-08 12:56:34 +08:00
owen
ddcebb1986
common: MoneyUtils 移到 common 模块
2023-09-08 12:46:43 +08:00
owen
1cc2dfc963
trade: 分销Review代码修改
2023-09-08 12:29:38 +08:00
owen
166b1b31c0
trade: 分销用户管理
2023-09-08 11:03:57 +08:00
puhui999
5d6bb84d25
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
2023-09-08 00:59:53 +08:00
puhui999
0e8755972c
营销活动+订单:完善大部分 TODO 提到的问题
2023-09-08 00:35:54 +08:00
YunaiV
5808f77ade
code review:订单分佣
2023-09-08 00:29:25 +08:00
samisgod
a4d6d5e6c3
fix db creation error
2023-09-07 16:18:24 +08:00
YunaiV
b3d3efc8c4
升级 springdoc、knife4j 版本
2023-09-07 12:59:36 +08:00
YunaiV
b8a4d8cab2
分销:避免报错
2023-09-07 12:29:50 +08:00
GamePlayer-Joker
1bf182c341
补充
...
Signed-off-by: GamePlayer-Joker <13317488+gameplayer-joker@user.noreply.gitee.com >
2023-09-07 02:18:41 +00:00
GamePlayer-Joker
76a8fb8a0a
AppCombinationRecordRespVO中的expireTime过期时间是LocalDateTime, 现在用的是new Date()
2023-09-07 01:41:46 +00:00
YunaiV
eb342d5abf
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
...
# Conflicts:
# yudao-module-member/yudao-module-member-biz/src/test/resources/sql/create_tables.sql
2023-09-06 23:50:55 +08:00
YunaiV
62a4e8242b
分销:增加提现接口
2023-09-06 23:50:23 +08:00
芋道源码
ea26691967
!607 member: 佣金解冻
...
Merge pull request !607 from 疯狂的世界/brokerate_unfreeze
2023-09-06 15:49:39 +00:00
YunaiV
bf92727b27
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
...
Conflicts:
yudao-module-member/yudao-module-member-biz/src/test/resources/sql/create_tables.sql
2023-09-06 21:40:53 +08:00
YunaiV
fcca69d243
修复 revision 在 Maven install、deploy 时,不替换为版本号的问题
2023-09-06 20:41:52 +08:00
zhijiantianya@gmail.com
beb385aab4
修复 revision 在 Maven install、deploy 时,不替换为版本号的问题
2023-09-06 20:04:29 +08:00
puhui999
2591ab5d36
订单中心+营销活动:完善部分 TODO 提到的问题
2023-09-06 11:29:51 +08:00
jason
9074312fe3
后台接入钱包支付
2023-09-06 10:34:24 +08:00
jason
4a0fa2a3a4
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
2023-09-06 08:50:33 +08:00
jason
3f51be6a2d
钱包。删除不需要的类
2023-09-06 08:50:22 +08:00
owen
fa53a3b15e
trade: MemberBrokerageRecord 重命名为 TradeBrokerageRecord
2023-09-06 00:35:40 +08:00
owen
9336a0a102
trade: 分销业务从 member 模块 转移到 trade模块
2023-09-06 00:16:47 +08:00
YunaiV
e4b153a866
分佣:增加获得分销排行分页 API mock
2023-09-05 23:49:35 +08:00
owen
a68691f2d9
trade: 增加分销用户表
2023-09-05 23:45:53 +08:00
owen
6474502738
trade: 增加交易中心配置表
2023-09-05 22:31:36 +08:00
YunaiV
0329f13fbf
分佣:增加获得分销排行分页 API mock
2023-09-05 21:32:34 +08:00
owen
9eb7837b67
member: 佣金失效
2023-09-05 19:43:07 +08:00
owen
a708521b9d
member: 佣金解冻
2023-09-05 19:05:01 +08:00
owen
2f6092005b
member: 佣金解冻
2023-09-05 18:59:24 +08:00
jason
f99e2aec2d
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
2023-09-05 12:44:43 +08:00
jason
f3ca0f066b
会员钱包 查询订单和查询退款单的实现
2023-09-05 12:44:34 +08:00
芋道源码
a58d7d63ed
!606 会员:分销佣金计算
...
Merge pull request !606 from 疯狂的世界/brokerage
2023-09-05 01:58:11 +00:00
owen
090058a2ba
member: 佣金不冻结时,直接就是结算状态
2023-09-05 09:27:12 +08:00
owen
c7ef8519c8
member: 分销增加佣金
2023-09-05 08:56:39 +08:00
YunaiV
eae8218f0d
分佣:增加获得分销排行分页 API mock
2023-09-05 00:11:41 +08:00
YunaiV
7389e4fb65
分佣:增加获得分销记录分页 API mock
2023-09-04 22:48:26 +08:00
YunaiV
fc56a15f76
分佣:增加用户分销记录、提现 API mock
2023-09-04 21:00:03 +08:00
jason
cc4c924717
钱包 review DO 类修改
2023-09-04 14:54:38 +08:00
jason
91b03e7c93
钱包 review 修改
2023-09-04 12:18:56 +08:00
YunaiV
6a819da0b6
分佣:增加用户分销统计 API mock
2023-09-03 21:21:33 +08:00
owen
991b53649b
member: 分销配置
2023-09-03 21:19:42 +08:00
YunaiV
36b3cfafd2
同步 v1.8.1 SQL 脚本
2023-09-03 19:15:18 +08:00
YunaiV
5308e309ea
同步 https://gitee.com/zhijiantianya/yudao-cloud/pulls/51/files
2023-09-03 18:44:03 +08:00
YunaiV
379c143dbb
修复:#320 支付手续费计算不正确,超过付款金额 #334
2023-09-03 18:39:51 +08:00
YunaiV
a532ba0579
Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro
2023-09-03 18:38:02 +08:00
芋道源码
05fc322919
Merge pull request #334 from freesme/fix-master-#320-calculation-error
...
修复:#320 支付手续费计算不正确,超过付款金额
2023-09-03 18:37:52 +08:00
芋道源码
0cb7d8a29a
Merge pull request #335 from freesme/master-fix-#330wx-mini-jump-failed
...
修复:微信公众号菜单添加跳转小程序失败
2023-09-03 18:34:33 +08:00
YunaiV
4db3de8d86
Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro
2023-09-03 18:30:46 +08:00
芋道源码
a1f6826e14
Merge pull request #337 from freesme/fix-master-#319-wx-pay-client-error
...
修复:#319 微信支付初始化 client 客户端错误,导致发起支付报错
2023-09-03 18:30:32 +08:00
YunaiV
4809e9b462
修复单元测试报错的问题
2023-09-03 18:28:29 +08:00
YunaiV
8f86f65884
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2023-09-03 18:07:05 +08:00
YunaiV
482a84a6f1
603 mall: 优惠券退还优化
2023-09-03 18:06:15 +08:00
芋道源码
670f2ef5da
!603 mall: 优惠券退还优化
...
Merge pull request !603 from 疯狂的世界/mall_order_cancel
2023-09-03 10:04:41 +00:00
芋道源码
8321d14b0b
!599 Crontab组件radio的label类型不一致
...
Merge pull request !599 from 高小牛/master
2023-09-03 10:02:32 +00:00
YunaiV
b69d4e0852
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
2023-09-03 17:59:50 +08:00
芋道源码
80a5889757
!565 vben代码生成模版
...
Merge pull request !565 from xingyu/feature/vben_codegen
2023-09-03 09:58:56 +00:00
芋道源码
7870283bfa
!594 兼容spring web 配置上下文根路径的情况
...
Merge pull request !594 from suyh/master
2023-09-03 09:55:39 +00:00
芋道源码
e67b62f2f6
!604 优惠券优化
...
Merge pull request !604 from 疯狂的世界/coupon
2023-09-03 09:48:21 +00:00
YunaiV
9148170926
调整 mapper 命名,避免可能的冲突
2023-09-02 19:23:09 +08:00
owen
71efa0ed6f
promotion: 订单使用品类券时,根据品类过滤可用商品
2023-09-02 10:05:56 +08:00
owen
8bbaaf1ce9
promotion: 优惠券模板 productSpuIds 改成 productScopeValues
2023-09-02 09:53:37 +08:00
owen
6a7be19d3a
common: 增加InEnumCollectionValidator,用于校验枚举值列表参数的取值范围是否有䇅
2023-09-02 08:44:02 +08:00
owen
11ad7ad5e4
mall: 优惠券退还优化
2023-09-02 07:44:16 +08:00
YunaiV
c25bf38f50
code review:交易订单的取消
2023-09-02 00:52:31 +08:00
YunaiV
9c0d0c809a
Merge branch 'mall_order_cancel' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product
...
Conflicts:
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponService.java
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponServiceImpl.java
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
2023-09-02 00:45:26 +08:00
YunaiV
68c1113ed1
code review:优惠劵发放
2023-09-02 00:32:16 +08:00
YunaiV
a6ec3fefcf
code review:优惠劵发放
2023-09-02 00:31:23 +08:00
芋道源码
c06d3c3d26
!602 mall: 发送优惠券功能优化
...
Merge pull request !602 from 疯狂的世界/mall_coupon_take
2023-09-01 16:19:40 +00:00
owen
3fbce643ee
mall: 发送优惠券功能优化
2023-09-01 23:45:50 +08:00
YunaiV
76f510f247
code review:优惠劵发放
2023-09-01 22:51:28 +08:00
owen
b3fcefa677
trade: 会员取消订单
2023-09-01 20:37:20 +08:00
芋道源码
af0771a175
!597 优惠券
...
Merge pull request !597 from 疯狂的世界/owen_dev
2023-09-01 12:12:02 +00:00
YunaiV
28adfff10e
code review:订单逻辑
2023-09-01 20:00:04 +08:00
芋道源码
8dd600a300
!600 订单中心:修改获取售后订单详情接口,修改订单管理后台物流获取接口
...
Merge pull request !600 from puhui999/feature/mall_product
2023-09-01 11:49:23 +00:00
zhijiantianya@gmail.com
dd6adb8ee6
code review order
2023-09-01 19:08:27 +08:00
puhui999
e26814be31
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
2023-09-01 12:13:11 +08:00
puhui999
1f9968d784
订单中心:修改获取售后订单详情接口,修改订单管理后台物流获取接口
2023-09-01 12:12:15 +08:00
gaoxiaoniu
1ca5dd7e93
Crontab组件radio的label类型不一致
2023-09-01 08:48:07 +08:00
YunaiV
891ed3d055
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2023-09-01 00:34:06 +08:00
YunaiV
361ad2e22a
同步最新商城演示图
2023-09-01 00:33:17 +08:00
YunaiV
e6f1e5d968
同步最新商城演示图
2023-09-01 00:28:39 +08:00
YunaiV
26129b52a8
同步最新 SQL 脚本
2023-08-31 20:47:30 +08:00
YunaiV
d982a95fdd
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2023-08-31 20:38:59 +08:00
YunaiV
ba444c9538
code review:支付钱包
2023-08-31 20:13:12 +08:00
YunaiV
bca6fb4698
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
2023-08-31 20:06:10 +08:00
YunaiV
f28b960319
调整最新图片 url
2023-08-31 20:06:02 +08:00
jason
457312d5aa
修改 PayClientFactory 创建 PayClient 方法
2023-08-31 14:30:12 +08:00
jason
7d4d3bea55
Revert "创建 PayClient 迁移到 PayChannelService"
...
This reverts commit 716727bfa7
.
2023-08-31 08:27:22 +08:00
YunaiV
60d4aa97fb
code review:售后详情接口
2023-08-30 20:18:40 +08:00
YunaiV
059202a588
购物车:调整购物车接口
2023-08-30 19:14:28 +08:00
chenchen
73f1636daa
售后日志添加售前售后状态
2023-08-30 10:58:37 +08:00
YunaiV
3e4b1c0552
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
2023-08-30 08:43:13 +08:00
YunaiV
5a788af084
购物车:简化 cart 表命名
2023-08-30 08:43:07 +08:00
jason
278f2af8f8
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
2023-08-29 15:29:02 +08:00
jason
716727bfa7
创建 PayClient 迁移到 PayChannelService
2023-08-29 15:28:24 +08:00
Krane
e8662e35e1
修复:微信支付初始化 client 客户端错误,导致发起支付报错
2023-08-29 11:45:04 +08:00
Krane
dac0d2d693
修复:微信公众号菜单添加跳转小程序失败
2023-08-29 11:03:55 +08:00
芋道源码
3e488d4308
!595 订单售后退款:添加获取售后订单详情接口
...
Merge pull request !595 from puhui999/feature/mall_product
2023-08-29 02:00:41 +00:00
puhui999
9507b6d800
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
2023-08-29 09:54:39 +08:00
puhui999
d5fe7708ce
订单售后退款:添加获取售后订单详情接口
2023-08-29 09:54:14 +08:00
YunaiV
cc71aabd3d
钱包:钱包流水 api
2023-08-29 00:31:54 +08:00
YunaiV
ddcb3e69f9
会员等级 app 接口
2023-08-28 21:01:46 +08:00
YunaiV
6132443d26
code review:钱包实现
2023-08-28 18:54:40 +08:00
puhui999
0411b3464a
订单售后退款:添加获取售后订单详情接口
2023-08-28 17:21:29 +08:00
jason
9077f14bae
钱包支付 Client 失败问题修改
2023-08-28 13:54:25 +08:00
耿林猛
3d894ca7f5
修复:#320 支付手续费计算不正确,超过付款金额
...
(cherry picked from commit 0df2d7191f
)
2023-08-28 11:20:19 +08:00
jason
7237bc07bb
钱包退款的实现
2023-08-28 10:25:50 +08:00
puhui999
498edfffb1
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
2023-08-28 09:24:04 +08:00
puhui999
655eefc340
订单管理:完善订单管理提到的一些问题
2023-08-28 09:23:30 +08:00
jason
c7f6f92159
钱包支付 Client 的实现
2023-08-28 07:39:03 +08:00
YunaiV
d82729e4c6
同步最新会员中心 SQL
2023-08-27 21:15:44 +08:00
YunaiV
8b98d13d8b
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2023-08-27 21:05:42 +08:00
YunaiV
1baa7f4aee
优化 AlipayPcPayClientTest 的方法命名,补全 assert 断言
2023-08-27 16:33:19 +08:00
YunaiV
35c1ba44d3
优化 AbstractAlipayClientTest、AlipayBarPayClientTest 的方法命名,补全 assert 断言
2023-08-27 16:15:41 +08:00
苏云弘
2acf5c878f
兼容spring boot web 提供的上下文根路径的匹配
...
spring.servlet.content-path
2023-08-27 11:59:38 +08:00
YunaiV
02bc9d28de
解决 MapStruct 的时区问题
2023-08-27 11:19:48 +08:00
YunaiV
3dd273a30d
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2023-08-27 11:10:57 +08:00
芋道源码
6696bb8943
!586 解决MapStruct进行LocalDateTime和Date转换时的时区问题,使用Mapper注解的uses参数
...
Merge pull request !586 from clockdotnet/master_pr
2023-08-27 03:10:48 +00:00
芋道源码
40560f9618
!569 fix: posgres sql
...
Merge pull request !569 from 天天写BUG/master
2023-08-27 03:07:44 +00: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
芋道源码
17f0297fb6
Merge pull request #332 from oah1021/expression
...
使用Parenthesis为原有表达式添加括号
2023-08-27 10:43:55 +08:00
owen
530ec7ab24
mall: 完善后台发送优惠券
2023-08-26 22:29:56 +08:00
YunaiV
f5c5d38303
code review:商品评论
2023-08-26 21:23:01 +08:00
芋道源码
806228be8b
!593 商品评论表增加冗余 SKU 的图片地址, 规格
...
Merge pull request !593 from 疯狂的世界/owen_dev
2023-08-26 13:00:07 +00:00
YunaiV
99dd33c408
code review:会员中心的详情返回 totalPoint 积分
2023-08-26 20:57:49 +08:00
芋道源码
bef7937835
!592 获得会员用户接口增加经验值字段
...
Merge pull request !592 from 风狗/feature/mall_product
2023-08-26 12:44:32 +00:00
owen
1e2c83d90f
mall: 商品评论表增加冗余 SKU 的图片地址, 规格
2023-08-26 14:40:16 +08:00
owen
02abe86253
member:
...
1.用户积分变动方法, 提取到单独的接口中
2.规范代码
2023-08-26 13:52:20 +08:00
绮梦
f10b638caf
feat: 获得会员用户接口增加经验值字段
2023-08-26 12:55:11 +08:00
YunaiV
f6f33a07d0
code review:订单评论、订单积分的变更
2023-08-26 11:19:43 +08:00
YunaiV
b75d777670
code review:订单评论、订单积分的变更
2023-08-26 10:54:45 +08:00
芋道源码
f8952f8e34
!591 商品:完善商品评论功能
...
Merge pull request !591 from 疯狂的世界/owen_dev
2023-08-26 02:16:34 +00:00
YunaiV
583d34a801
code review:移除收件地址多余的方法
2023-08-26 01:51:47 +08:00
YunaiV
1b192b5032
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
2023-08-26 01:10:58 +08:00
芋道源码
3badd5158c
!589 新增 管理后台 用户收件地址管理接口
...
Merge pull request !589 from 风狗/管理后台_用户收件地址管理接口
2023-08-25 17:10:45 +00:00
YunaiV
61d51e54dc
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
...
Conflicts:
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/user/MemberUserConvert.java
2023-08-26 01:07:56 +08:00
芋道源码
e490195cbc
!587 获取用户信息接口增加areaName 字段
...
Merge pull request !587 from 风狗/用户信息接口增加areaName字段
2023-08-25 17:04:13 +00:00
owen
fd126ba2f7
member: 根据积分配置的比例,换算积分
2023-08-25 23:14:27 +08:00
owen
d4acacec60
trade: 1.支付成功后,增加用户积分;2.退款成功后,扣减用户积分
2023-08-25 23:07:54 +08:00
owen
dad56fd096
trade: 1.支付成功后,增加用户经验;2.退款成功后,扣减用户经验
2023-08-25 22:21:14 +08:00
jason
f33b66558c
新增查询钱包余额明细接口
2023-08-25 22:08:40 +08:00
jason
1ffbd9399e
新增获得支付钱包接口
2023-08-25 22:08:40 +08:00
owen
9aee08ee0e
会员:修改Review的代码
2023-08-25 21:12:31 +08:00
owen
2895ae3ddb
Merge remote-tracking branch 'origin/feature/mall_product' into member_dev
2023-08-25 21:03:19 +08:00
owen
2132de9dd1
商品:完善后台商品评论功能
2023-08-25 21:02:49 +08:00
绮梦
65eddc63af
feat: 增加管理后台用户收件地址管理接口。
2023-08-24 17:04:08 +08:00
JUNHAO
5cc3e6510b
使用Parenthesis为原有表达式添加括号
2023-08-24 14:38:47 +08:00
YunaiV
9b6f5bd503
code review:会员等级
2023-08-24 00:53:09 +08:00
芋道源码
0619989586
!585 会员: 会员等级功能优化,修改Review的代码
...
Merge pull request !585 from 疯狂的世界/member_dev
2023-08-23 16:15:40 +00:00
绮梦
55cae6d2aa
feat: 获取用户信息接口增加areaName 字段。
2023-08-23 16:51:14 +08:00
jason
b119aadba5
支付宝 条码支付 Client 单元测试
2023-08-23 12:30:15 +08:00
shizhong
81c12b1852
解决MapStruct的时区问题
2023-08-23 12:21:49 +08:00
shizhong
eb4434ecbc
解决MapStruct的时区问题
2023-08-23 12:11:47 +08:00
xingyu
282c15c7c4
fix: vben codegen antdv 4.0
2023-08-23 11:37:09 +08:00
owen
da8b2eab6d
合并冲突
2023-08-23 10:24:01 +08:00
owen
4dd2d80887
Merge remote-tracking branch 'origin/feature/mall_product' into member_dev
...
# Conflicts:
# sql/mysql/member_level.sql
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberExperienceLogService.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelLogService.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelLogServiceImpl.java
2023-08-23 10:17:24 +08:00
owen
4132cf1437
会员: 会员等级取消分页功能
2023-08-23 10:12:21 +08:00
owen
dc382d80bb
会员: 重构会员等级逻辑
2023-08-23 10:02:00 +08:00
YunaiV
60875a0472
code review:获取用户积分记录 接口增加对userId 的支持,获取用户签到记录接口增加对userId的支持
2023-08-23 00:48:33 +08:00
YunaiV
175d244dee
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
2023-08-23 00:46:44 +08:00
YunaiV
5932e8e931
code review:订单列表、详情
2023-08-23 00:46:28 +08:00
芋道源码
287a17a9ff
!583 调整 获取用户积分记录 和 获取用户签到记录接口 配合前端用户详情页面
...
Merge pull request !583 from 风狗/会员详情
2023-08-22 16:45:40 +00:00
jason
c0ffaf8ea9
支付宝 PC 网站 Client 单元测试
2023-08-22 22:17:27 +08:00
jason
c7f0b5c73d
支付宝 H5 Client 单元测试
2023-08-22 22:17:27 +08:00
芋道源码
4c634245e9
!581 订单列表管理重构完善
...
Merge pull request !581 from puhui999/feature/mall_product
2023-08-22 14:10:05 +00:00
YunaiV
54bf24b966
code review:会员等级
2023-08-22 21:59:00 +08:00
owen
b7f54a3061
Merge remote-tracking branch 'origin/feature/mall_product' into member_dev
...
# Conflicts:
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImpl.java
2023-08-22 21:26:10 +08:00
owen
ca51056c00
会员: 统一用户等级记录、用户经验记录 命名
2023-08-22 20:49:25 +08:00
puhui999
002475f33a
订单管理:完善订单管理 补全相关接口
2023-08-22 18:55:00 +08:00
puhui999
d2c135eda9
订单管理:添加修改备注、订单调价、修改地址接口
2023-08-22 16:31:28 +08:00
绮梦
0753df68b8
feat: 获取用户积分记录 接口增加对userId 的支持,获取用户签到记录接口增加对userId的支持。
2023-08-22 15:31:36 +08:00
YunaiV
551a968449
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
...
# Conflicts:
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberExperienceLogService.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelLogService.java
2023-08-22 12:57:15 +08:00
芋道源码
883bdc65a1
!580 会员: 增加会员分组功能
...
Merge pull request !580 from 疯狂的世界/member_dev
2023-08-22 04:55:40 +00:00
YunaiV
292f23c4b2
code review:会员等级
2023-08-22 12:53:29 +08:00
puhui999
d29c5a556c
订单管理:添加修改备注、订单调价、修改地址接口
2023-08-22 12:19:25 +08:00
owen
bdb38c4157
会员: 修改会员等级,使用单独的表单、接口
2023-08-22 11:23:09 +08:00
jason
eff9fafde8
创建支付宝 Client 抽象类测试类, 测试公共方法
2023-08-22 08:40:41 +08:00
owen
5a2d9d14df
会员: 删除用户标签, 用户等级时, 校验是否关联了用户
2023-08-22 01:33:28 +08:00
owen
7fd497fcc9
会员: 修改重复的错误码
2023-08-22 01:22:01 +08:00
owen
7b2f639324
会员: 规范代码, 用户等级, 用户分组
2023-08-22 01:15:16 +08:00
puhui999
716f11e80b
fix: 合并差异
2023-08-22 00:57:36 +08:00
owen
9d9638b15b
Merge remote-tracking branch 'origin/feature/mall_product' into member_dev
...
# Conflicts:
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/user/MemberUserConvert.java
2023-08-22 00:47:45 +08:00
puhui999
8123354f09
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
...
# Conflicts:
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/TradeOrderController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/delivery/DeliveryExpressConvert.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryExpressService.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryExpressServiceImpl.java
2023-08-22 00:46:47 +08:00
owen
8ae3401452
会员: 增加会员分组功能
2023-08-22 00:43:36 +08:00
puhui999
c2b6c0d72a
fix: 订单列表重构 ①
2023-08-22 00:42:20 +08:00
YunaiV
800c44a46e
code review:会员等级
2023-08-21 23:18:04 +08:00
芋道源码
4cd5b5712b
!577 会员:修改会员标签名称唯一校验逻辑
...
Merge pull request !577 from 疯狂的世界/member_dev
2023-08-21 14:51:19 +00:00
YunaiV
0d1fc1138a
增加 app 的签到 mock 接口、积分记录分页、签到记录分页
2023-08-21 22:20:59 +08:00
owen
de83531285
会员:用户标签增加下拉框使用的 精简信息列表查询接口
2023-08-21 21:44:04 +08:00
owen
e711092440
会员:用户管理增加用户等级查询条件
2023-08-21 21:42:59 +08:00
owen
8ffbc15cec
会员:后台调整会员等级
2023-08-21 21:31:16 +08:00
owen
f884054d2c
会员:完善会员等级校验、单元测试
2023-08-21 00:23:45 +08:00
芋道源码
8f9404f99b
!579 同步商城实现:会员列表、会员积分、会员签到、会员标签
...
Merge pull request !579 from 芋道源码/feature/mall_product
2023-08-20 12:01:43 +00:00
YunaiV
c3e4e23459
同步最新 Member 菜单
2023-08-20 20:01:18 +08:00
芋道源码
3124948175
!578 同步商城实现:会员列表、会员积分、会员签到、会员标签
...
Merge pull request !578 from 芋道源码/feature/mall_product
2023-08-20 11:50:58 +00:00
YunaiV
281ba1e369
code review:调整错误码分段
2023-08-20 19:38:17 +08:00
YunaiV
a83c156bf1
code review:签到记录
2023-08-20 19:34:28 +08:00
YunaiV
c5e85f3bfb
code review:签到配置
2023-08-20 19:26:31 +08:00
YunaiV
4257cad46a
code review:会员积分
2023-08-20 19:06:23 +08:00
owen
e2032e7e97
会员:增加会员等级增删改查
2023-08-20 15:54:06 +08:00
owen
9eca965dd6
Merge remote-tracking branch 'origin/feature/mall_product' into member_dev
2023-08-20 10:55:42 +08:00
YunaiV
c7285da9a7
code review:会员签到配置
2023-08-20 10:14:28 +08:00
YunaiV
bfc72a9802
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
...
Conflicts:
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/point/vo/config/MemberPointConfigBaseVO.java
2023-08-20 09:45:34 +08:00
芋道源码
fe53e426a4
!573 fix: required = true ==> requiredMode = Schema.RequiredMode.REQUIRED
...
Merge pull request !573 from Carry/master
2023-08-20 01:44:35 +00:00
owen
fe68b42a8c
会员:修改会员标签名称唯一校验逻辑
2023-08-20 09:41:15 +08:00
芋道源码
29ae1bcbca
!575 会员积分和会员签到模块todo修改
...
Merge pull request !575 from QingX/feature/mall_product
2023-08-20 01:36:32 +00:00
YunaiV
2584911d88
code review:会员标签
2023-08-20 09:25:23 +08:00
YunaiV
8191d9e141
Merge branch 'member_dev' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product
...
Conflicts:
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/user/MemberUserDO.java
2023-08-20 09:02:16 +08:00
YunaiV
95254341a1
1. 会员用户的找回密码 API 的优化
2023-08-19 23:12:34 +08:00
owen
4f589cad53
会员:
...
1.会员设置标签
2023-08-19 20:19:56 +08:00
YunaiV
5d4a7ffa3b
1. 会员用户的修改密码 API 的优化
2023-08-19 20:16:41 +08:00
YunaiV
87e5b2bed1
1. 会员用户的修改手机 API 的优化
2023-08-19 19:23:54 +08:00
YunaiV
4153331535
1. 合并 member 修改昵称和头像接口,统一成修改基本信息 API
2023-08-19 17:47:34 +08:00
YunaiV
94a32d34b2
1. 会员用户,增加 point 积分字段
...
2. 增加获得优惠劵、收藏数量的 API 接口
2023-08-19 17:00:40 +08:00
owen
9b6e2114c7
会员:
...
1.增加会员标签功能
2023-08-19 16:06:12 +08:00
YunaiV
a4e2cacc46
会员中心:会员管理 60%
2023-08-19 14:43:53 +08:00
YunaiV
e8c1bdde3d
会员中心:会员管理 50%
2023-08-19 14:12:03 +08:00
xiaqing
db1f44305d
会员积分和会员签到模块todo修改
2023-08-19 14:09:47 +08:00
xiaqing
2e9dfac9ab
会员积分和会员签到模块todo修改
2023-08-19 14:09:22 +08:00
YunaiV
61fbb9909a
订单:
...
1、简化交易订单的逻辑
2023-08-18 19:59:30 +08:00
YunaiV
fe07e223e4
订单:
...
1、简化交易订单的逻辑
2023-08-18 19:28:36 +08:00
YunaiV
f217ba0807
售后:
...
1、完善整个流程的实现
2023-08-18 19:22:08 +08:00
wanglei
6446b753d3
fix: required = true ==> requiredMode = Schema.RequiredMode.REQUIRED
2023-08-18 10:56:08 +08:00
YunaiV
97fc4027de
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
...
# Conflicts:
# yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/decorate/DecorateComponentServiceImplTest.java
2023-08-17 22:32:48 +08:00
YunaiV
5dd6e5bee8
营销:
...
1. 售后订单,增加对 afterSaleId 的更新
2023-08-17 22:32:30 +08:00
jason
6fbf7b261b
扫码支付统一退款单元测试, 修复退款失败,渠道错误未赋值bug
2023-08-17 21:52:53 +08:00
YunaiV
d3c02f2a57
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
2023-08-16 22:11:27 +08:00
YunaiV
c3de25e760
营销:
...
1. 调整店铺装修接口
2023-08-16 22:11:18 +08:00
jason
1b03fdb08b
支付宝 扫码支付 统一下单 单元测试
2023-08-16 08:51:27 +08:00
YunaiV
a159a983a2
订单:
...
1. 拆分读写 OrderService,避免单 Service 逻辑过重。
2023-08-15 21:19:13 +08:00
YunaiV
159c74ce15
订单:
...
1. review 发货
2. review 拼团逻辑
2023-08-15 21:04:20 +08:00
芋道源码
60171ce7e4
!571 完善订单发货逻辑、重构砍价活动、完善拼团记录创建逻辑
...
Merge pull request !571 from puhui999/feature/mall_product
2023-08-15 12:29:51 +00:00
YunaiV
e4a2c738b2
订单:
...
1. 增加查询物流接口
2023-08-15 20:18:22 +08:00
lemoncc
5b9106fdb5
fix: 在调用 selectList() 的时候 如果 Collection 参数为空会报错 sql 异常
2023-08-15 17:54:55 +08:00
puhui999
5c2723c7bf
fix: 修复合并差异
2023-08-15 00:02:50 +08:00
puhui999
de828e3d04
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
...
# Conflicts:
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/BargainActivityController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/BargainActivityCreateReqVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/BargainActivityRespVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/BargainActivityUpdateReqVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/activity/BargainActivityCreateReqVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/activity/BargainActivityPageReqVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/product/BargainProductBaseVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/combination/vo/activity/CombinationActivityPageReqVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/bargain/BargainActivityConvert.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/combination/CombinationActivityConvert.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/seckill/seckillactivity/SeckillActivityConvert.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/bargain/BargainActivityDO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/bargain/BargainProductDO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationActivityMapper.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainActivityService.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainActivityServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityServiceImplTest.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
2023-08-14 21:42:11 +08:00
puhui999
e2a8f7b389
fix: 完善订单发货逻辑、重构砍价活动、完善拼团记录创建逻辑
2023-08-14 21:26:07 +08:00
puhui999
651725e3e8
fix: 完善订单发货逻辑、重构砍价活动、完善拼团记录创建逻辑
2023-08-14 21:20:03 +08:00
天天写BUG
a8223fc4f2
!1 fix: posgres sql
...
Merge pull request !1 from 天天写BUG/master
2023-08-13 17:35:01 +00:00
decan
e6f4d649aa
fix: postgres sql
2023-08-14 01:32:46 +08:00
YunaiV
36da5d69b0
1、增加 App 的文件上传接口
2023-08-13 22:02:29 +08:00
YunaiV
715c42574f
订单:
...
1、订单评价的接入
2023-08-13 21:44:48 +08:00
YunaiV
7dc398717a
订单:
...
1、实现确认收货接口
2023-08-13 20:27:19 +08:00
YunaiV
503c996acd
订单:
...
1、移除 deliverStatus 发货状态,暂时没作用
2、无需发货时,使用 logisticsId 进行实现
3、订单详情,增加 logisticsId 和 logisticsName 返回
2023-08-13 20:12:24 +08:00
YunaiV
e159b2e500
code review:砍价的代码
2023-08-13 00:49:35 +08:00
YunaiV
ba31d5f6fb
优化拼团活动的管理后台代码
2023-08-13 00:06:46 +08:00
xingyu
baa2e69cdf
fix: vben codegen
2023-08-12 18:31:16 +08:00
xingyu
1a999cbb75
chore: up mybatis-plus 3.5.3.2
2023-08-12 18:09:19 +08:00
xingyu
b55c1b942d
perf: vben 2.0 codegen
2023-08-12 17:31:33 +08:00
YunaiV
6fdd4da0b3
优化秒杀活动的管理后台代码
2023-08-12 16:05:47 +08:00
YunaiV
ebf4ac1d5a
优化 README.md,从 .image 读取图片
2023-08-12 00:43:12 +08:00
YunaiV
3bfaa3d5c3
优化 README.md,从 .image 读取图片
2023-08-12 00:27:04 +08:00
YunaiV
be2ee905df
code review:积分模块的实现
2023-08-11 23:49:20 +08:00
芋道源码
4177071758
!560 todo修改
...
Merge pull request !560 from QingX/feature/mall_product
2023-08-11 14:44:52 +00:00
YunaiV
5fcd0a21da
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
2023-08-11 22:44:20 +08:00
YunaiV
ee53d2ad51
修复租户套餐修改时,查询角色报错问题
2023-08-11 22:24:01 +08:00
YunaiV
9ff67b479f
!562 优化 redisCache
2023-08-11 21:46:53 +08:00
芋道源码
8960a82978
!562 优化 redisCache
...
Merge pull request !562 from wanwan/feature/redis_cache_optimize_20230810
2023-08-11 12:09:10 +00:00
YunaiV
b5515799dc
!557 修改创建菜单时permission为空,缓存KEY 为空的BUG
2023-08-11 19:32:26 +08:00
YunaiV
b53bfb0976
Merge branch 'feature/deps' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
2023-08-11 19:21:44 +08:00
芋道源码
aadf2778fe
!556 修复表格固定列不设置宽度时布局错误问题
...
Merge pull request !556 from BladeX/master
2023-08-11 11:19:31 +00:00
芋道源码
815755fa3a
!557 修改创建菜单时permission为空,缓存KEY 为空的BUG
...
Merge pull request !557 from 杜继强/master
2023-08-11 11:12:32 +00:00
芋道源码
a97e06b460
!558 支付模块微信App统一下单返回值解析错误
...
Merge pull request !558 from 马铃薯头/master
2023-08-11 11:08:09 +00:00
芋道源码
1130434b02
!559 update yudao-ui-admin/src/views/infra/fileConfig/index.vue.
...
Merge pull request !559 from 账号已删除/N/A
2023-08-11 11:05:44 +00:00
芋道源码
4d0873374f
!561 fix:修复新建租户时由于data_scope_dept_ids为空值,产生的错误导致插入不成功。
...
Merge pull request !561 from 天天写BUG/master
2023-08-11 11:04:32 +00:00
YunaiV
27b8202053
微调支付收银界面,缺少 success 参数
2023-08-11 09:22:22 +08:00
wanwan
134e5ca20f
feat: 将 redisCache 的扫描策略设置成 scan
2023-08-10 15:27:19 +08:00
wanwan
64c8dd6292
feat: 拓展 支持自定义过期时间的 RedisCacheManager 使支持自定义过期时间单位
2023-08-10 15:27:03 +08:00
wanwan
c4a7da9233
Revert "feat: 拓展 支持自定义过期时间的 RedisCacheManager 使支持自定义过期时间单位"
...
This reverts commit 47698bfc6c
.
2023-08-10 15:26:31 +08:00
wanwan
e1fe21f24c
Revert "feat: 将 redisCache 的扫描策略设置成 scan"
...
This reverts commit 72d2dcc68f
.
2023-08-10 15:26:25 +08:00
jlc@yoc.tech
47698bfc6c
feat: 拓展 支持自定义过期时间的 RedisCacheManager 使支持自定义过期时间单位
2023-08-10 11:50:18 +08:00
jlc@yoc.tech
72d2dcc68f
feat: 将 redisCache 的扫描策略设置成 scan
2023-08-10 11:26:44 +08:00
天天写BUG
f221f58973
update sql/postgresql/ruoyi-vue-pro.sql.
...
fix:修复创建新租户,由于data_scope_dept_ids设置的是 not null 但是是空值时候产生错误,插入失败
Signed-off-by: 天天写BUG <decan_zheng@foxmail.com >
2023-08-09 15:29:09 +00:00
xiaqing
93effe8fa7
新版表结构
2023-08-09 22:43:14 +08:00
xiaqing
d397758dd1
还原配置文件
2023-08-09 22:39:12 +08:00
xiaqing
8f43fba629
会员积分针对代码格式、功能优化
...
1.修改积分抵扣单位
2023-08-09 22:31:55 +08:00
xiaqing
bae94d06ac
会员积分针对代码格式、功能优化
...
1.优化todo建议
2.删除无用代码
2023-08-09 20:59:45 +08:00
xiaqing
33323c1483
会员签到针对代码格式、功能优化
...
1.优化todo建议
2.删除无用代码
2023-08-09 16:13:35 +08:00
账号已删除
bcf7dd0917
update yudao-ui-admin/src/views/infra/fileConfig/index.vue.
...
FTP传输模式文字错误
Signed-off-by: 账号已删除 <1100014+leniy@user.noreply.gitee.com >
2023-08-09 00:27:59 +00:00
xlsea
ead8741393
调用微信App v3支付渠道返回参数解析错误
2023-08-08 09:12:50 +08:00
杜继强
14c7465bc6
修改创建菜单时permission为空,缓存KEY 为空的BUG ,判断 reqVO.permission 为空时,不做 @CacheEvict 的操作
2023-08-08 00:13:23 +08:00
zhijiantianya@gmail.com
ba59ec85e0
code review 各种活动
2023-08-07 19:30:26 +08:00
芋道源码
0219e6d907
!555 完善拼团、秒杀、砍价活动管理
...
Merge pull request !555 from puhui999/feature/mall_product
2023-08-07 10:58:30 +00:00
Wyl
b052c8457a
修复表格固定列不设置宽度时布局错位
2023-08-07 13:37:37 +08:00
puhui999
384359c9d4
fix: 完善拼团、秒杀、砍价活动管理
2023-08-06 20:21:53 +08:00
puhui999
5f9184904a
fix: 完善拼团、秒杀、砍价活动管理
2023-08-06 17:46:16 +08:00
puhui999
afaef0dfbb
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
2023-08-06 01:05:47 +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
芋道源码
7a7ae3b8ec
!545 完善 review 拼团、秒杀活动的实现提到的问题
...
Merge pull request !545 from puhui999/feature/mall_product
2023-08-05 11:54:13 +00:00
YunaiV
105f1a2707
fix: banner 日志打印
2023-08-05 16:35:11 +08:00
YunaiV
1f3794db77
fix: 修复MailAccountService 更新/删除缓存未清空
2023-08-05 14:49:04 +08:00
YunaiV
c4755c49b1
fix: 修复MailAccountService 更新/删除缓存未清空
2023-08-05 14:48:14 +08:00
芋道源码
c434c960a1
!552 修复MailAccount 更新/删除缓存未清空
...
Merge pull request !552 from ZJY/fix_redisCache
2023-08-05 06:47:16 +00:00
芋道源码
8edc4f68a2
!553 typo: apiclient_key.perm => apiclient_key.pem
...
Merge pull request !553 from dhb52/N/A
2023-08-05 06:46:18 +00:00
dhb52
3b715a1380
typo: apiclient_key.perm => apiclient_key.pem
...
Signed-off-by: dhb52 <dhb52@126.com >
2023-08-03 15:34:36 +00:00
zhangjiayu
508ad76cb8
fix: 修复MailAccountService 更新/删除缓存未清空
2023-08-03 18:08:38 +08:00
puhui999
a82898ca13
Merge remote-tracking branch 'yudao/master' into feature/mall_product
2023-08-02 21:14:41 +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
f5079b1c57
feat: 添加砍价活动相关 DO
2023-07-31 18:36:21 +08:00
puhui999
d156d43d63
fix:完善 review 拼团、秒杀活动的实现提到的问题
2023-07-31 18:34:56 +08:00
YunaiV
68049b85b9
基于 Redis 实现的 pubsub、stream 消息队列,支持开启或关闭。默认为关闭状态,项目启动更快
2023-07-29 12:04:50 +08:00
芋道源码
bc30c1d9d2
!550 支付中心:增加模拟支付,方便开发调试
...
Merge pull request !550 from 芋道源码/feature/mall_product
2023-07-29 03:33:34 +00:00
YunaiV
ae98315616
增加模拟支付的订单号、退款号返回
2023-07-29 11:32:48 +08:00
xingyu
59e6006572
chore: up deps version
2023-07-29 11:26:06 +08:00
xingyu
402a3809a3
chore: up springboot 2.7.14
2023-07-29 11:23:13 +08:00
YunaiV
bf3e848c17
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
2023-07-29 11:06:59 +08:00
芋道源码
7a49e45b4b
!548 Redis 缓存替代本地缓存,降低学习成本
...
Merge pull request !548 from 芋道源码/master-redis
2023-07-29 01:34:24 +00:00
YunaiV
24a406e47d
文件配置的本地缓存,使用 Job 轮询,替代 MQ 广播
2023-07-29 09:20:15 +08:00
YunaiV
d67f4a7f46
文件配置的本地缓存,使用 Job 轮询,替代 MQ 广播
2023-07-29 09:10:52 +08:00
YunaiV
dfa09c787a
短信渠道的本地缓存,使用 Job 轮询,替代 MQ 广播
2023-07-29 08:59:07 +08:00
YunaiV
27e70e73a3
敏感词的本地缓存,使用 Job 轮询,替代 MQ 广播
2023-07-29 07:31:53 +08:00
YunaiV
5e7e3d816c
彻底移除 RedisKeyDefine
2023-07-29 07:16:10 +08:00
YunaiV
95edd1d451
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-redis
...
Conflicts:
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/auth/AuthConvert.java
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java
2023-07-28 22:31:18 +08:00
YunaiV
418ae829da
修复 mp_account 错误拼成 pay_account 的问题
2023-07-28 19:39:40 +08:00
芋道源码
48f5d3f0e2
!547 有几个会报错的地方
...
Merge pull request !547 from wcz/master
2023-07-28 11:37:13 +00:00
芋道源码
09a2cfaaa7
!546 优化docker-compose功能,首次运行加载sql/mysql/ruoyi-vue-pro.sql
...
Merge pull request !546 from dhb52/master
2023-07-28 11:34:54 +00:00
wcz
a6ffb5d650
BaseMapperX.java少了几个方法,TradeCartMapper.java方法调整,BpmProcessInstanceServiceImpl.java多了
2023-07-28 19:33:23 +08:00
dhb52
0fb3c4bfcc
docker compose首次启动加载sql脚本
2023-07-28 17:08:29 +08:00
puhui999
446951bd11
fix:封装函数 convertCDUMap 作用:数据划分为需要新增的、还是删除的、还是更新的。
2023-07-28 16:30:38 +08:00
YunaiV
7f657ee931
优化 mp-java 库的依赖管理
2023-07-27 23:15:49 +08:00
YunaiV
c33186569d
优化 mp 账号的刷新机制,使用 Job 轮询,替换 MQ 广播
2023-07-27 20:25:15 +08:00
YunaiV
5d6308e4bb
对齐 boot 与 cloud 的代码
2023-07-27 13:59:29 +08:00
YunaiV
859cf74a6c
对齐 boot 与 cloud 的代码
2023-07-27 13:00:52 +08:00
jason
6a38738760
新增模拟支付渠道,通知查询为空bug 修改
2023-07-27 08:19:24 +08:00
YunaiV
21b3744544
1.8.0 版本发布
2023-07-27 07:45:04 +08:00
YunaiV
0c51e7fdba
Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro
2023-07-27 07:34:38 +08:00
芋道源码
b287fdb9f2
!544 同步最新商城代码
...
Merge pull request !544 from 芋道源码/feature/mall_product
2023-07-26 23:33:45 +00:00
YunaiV
6c174d9c83
对齐 boot 与 cloud 的代码
2023-07-26 23:56:02 +08:00
YunaiV
14d7db0c60
对齐 boot 与 cloud 的代码
2023-07-26 23:27:06 +08:00
YunaiV
114f1e4833
对齐 boot 与 cloud 的代码
2023-07-26 22:36:34 +08:00
YunaiV
461c789492
清理 bpm 用不到的实体、与 convert 方法
2023-07-26 20:53:10 +08:00
YunaiV
a0417f182e
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
2023-07-26 19:36:11 +08:00
YunaiV
b84f7825c5
review 拼团、秒杀活动的实现
2023-07-26 19:09:47 +08:00
lwf
414c1be128
feature(使用redis缓存): 功能合并
...
1、缓存改为Redis缓存,不在启动时缓存,使用时候根据数据源缓存
2、前端登录接口调整
2023-07-26 17:20:54 +08:00
芋道源码
e2ed0b7afb
!530 完成拼团活动和秒杀活动 CRUD
...
Merge pull request !530 from puhui999/feature/mall_product
2023-07-26 05:01:00 +00:00
芋道源码
c42ff645d1
Merge pull request #252 from zqd123/master
...
fix: yudao-ui-admin前端-Cron表达式-周选择第4项,#号两边的值颠倒了
2023-07-26 12:36:22 +08:00
芋道源码
91769f0b75
!543 适配postgres数据库sql脚本
...
Merge pull request !543 from 御码滴汉子/dev-fix-sql4pg
2023-07-25 23:54:08 +00:00
congqing
1dee258c18
适配postgres数据库sql脚本
...
infra_codegen_table表增加front_type字段
member_user表部分字段增加默认值
system_menu表permission增加默认值
2023-07-26 01:22:42 +08:00
YunaiV
d9522808eb
优化 LambdaQueryWrapperX 的 inIfPresent 判空逻辑
2023-07-25 20:58:44 +08:00
YunaiV
8e51de5349
修复“删除流程模型方法 有注释写错”
2023-07-25 20:33:41 +08:00
YunaiV
91aacefc3d
Merge branch 'master-cq' of https://gitee.com/congqinggit/ruoyi-vue-pro
...
Conflicts:
sql/postgresql/ruoyi-vue-pro.sql
2023-07-25 20:13:17 +08:00
芋道源码
eb0a1eb293
!533 vue3代码生成器表单Editor属性修正为v-model
...
Merge pull request !533 from 赤鷹/master
2023-07-25 12:06:23 +00:00
芋道源码
d1796e51ff
!536 update yudao-ui-admin/src/components/VideoUpload/index.vue.
...
Merge pull request !536 from zbk/N/A
2023-07-25 12:05:11 +00:00
芋道源码
bd1153fbe2
!541 api记录日志耗时单位修改为毫秒
...
Merge pull request !541 from kinlon92/master
2023-07-25 11:56:11 +00:00
芋道源码
870873e480
!540 修复部分问题,升级依赖
...
Merge pull request !540 from xingyu/feature/captcha
2023-07-25 11:20:04 +00:00
芋道源码
999dfd7c4a
!542 同步支付中心、商城最新实现
...
Merge pull request !542 from 芋道源码/feature/mall_product
2023-07-25 11:09:10 +00:00
YunaiV
7f0901e0bb
优化项目启动速度,
2023-07-25 08:39:28 +08:00
YunaiV
7c165fb1f6
1. 完善 PayNotifyServiceImpl 的单元测试
2023-07-24 23:04:38 +08:00
zjl
9d10c85be8
接口日志持续时间修改为毫秒单位
2023-07-24 23:00:24 +08:00
YunaiV
3a1694dea3
1. 微信 App 支付 WxAppPayClient 实现
...
2. 优化微信支付的下单逻辑,增加 build request 公用方法
2023-07-24 22:07:54 +08:00
YunaiV
0fcc0072c2
1. AlipayBarPayClient 增加小额支付的成功返回
2023-07-24 21:44:09 +08:00
YunaiV
5ae43a238d
1. 修复支付宝 App 发起报错的问题
...
2. 移除微信 H5 支付,基本没人使用,减少复杂性
2023-07-24 20:54:04 +08:00
zhijiantianya@gmail.com
73e1158836
by gateway:
...
1. notify 部分单元测试
2023-07-24 20:11:21 +08:00
puhui999
c9c176ea05
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
2023-07-24 17:30:54 +08:00
puhui999
7957cfa50d
fix:优化拼团与订单集成逻辑
2023-07-24 17:29:51 +08:00
puhui999
8d13ecc9c8
fix:优化订单发货逻辑使其支持一单分发
2023-07-24 15:14:16 +08:00
YunaiV
00e1c30f57
1. 修复创建支付应用,界面会报错的问题
...
2. 同步最新 SQL 文件
2023-07-24 12:51:14 +08:00
YunaiV
3f988a890d
完善“支付系统”的说明
2023-07-24 08:46:12 +08:00
YunaiV
3a24d05bdc
mall + pay:
...
1. 修复单元测试的报错
2023-07-24 07:04:11 +08:00
YunaiV
6aea461e8d
mall + pay:
...
1. 完善 PayRefundServiceTest 的单元测试
2023-07-23 23:20:52 +08:00
YunaiV
ebeb14be2f
mall + pay:
...
1. 完善 PayRefundServiceTest 的单元测试
2023-07-23 22:29:33 +08:00
YunaiV
9812881094
mall + pay:
...
1. 增加退款同步的 Job
2023-07-23 21:16:03 +08:00
YunaiV
0e5e6c7ce0
mall + pay:
...
1. 增加微信退款的查询接口
2023-07-23 20:39:52 +08:00
YunaiV
5b066ea693
mall + pay:
...
1. 增加支付宝退款查询接口
2023-07-22 20:46:38 +08:00
YunaiV
ac5646b84d
mall + pay:
...
1. 支付订单的过期关闭 Job[单测]
2023-07-22 19:53:48 +08:00
YunaiV
cc853a2b92
mall + pay:
...
1. 支付订单的状态同步 Job[单测]
2023-07-22 17:47:58 +08:00
YunaiV
15cca8f3de
mall + pay:
...
1. 支付订单的状态同步 Job
2. 支付订单的过期关闭 Job
2023-07-22 15:48:45 +08:00
YunaiV
348d073718
mall + pay:
...
1. 发起支付时,增加实际已支付的二次校验,避免重复支付
2023-07-22 13:19:22 +08:00
YunaiV
717caf527a
mall + pay:
...
1. 增加微信支付 Client 的查询订单接口
2023-07-22 12:07:18 +08:00
YunaiV
f46a037164
mall + pay:
...
1. 增加支付宝 Client 的查询订单接口
2023-07-22 11:19:42 +08:00
zhijiantianya@gmail.com
b426c63eeb
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
2023-07-21 22:02:50 +08:00
zhijiantianya@gmail.com
e27ec2fd50
by gateway:
...
1. 完善部分 refund 单元测试
2023-07-21 22:02:39 +08:00
YunaiV
f92a5899f3
mall + pay:
...
1. 简化微信支付的配置界面
2023-07-21 21:50:05 +08:00
xingyu
d556877b13
chore: use xingyuv jushauth
2023-07-21 17:55:47 +08:00
xingyu
c95a1d0a7d
chore: up springboot 2.10.13
2023-07-21 17:53:40 +08:00
xingyu
6c5ea2bc11
Merge remote-tracking branch 'origin/master' into feature/captcha
2023-07-21 17:43:05 +08:00
xingyu
91b4280625
fix: vben form bug
2023-07-21 17:40:27 +08:00
puhui999
f23e1b857a
fix:合并差异修正
2023-07-21 16:54:58 +08:00
puhui999
a73e078593
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
...
# Conflicts:
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderServiceImpl.java
2023-07-21 16:53:36 +08:00
puhui999
259807600a
feat:拼团订单集成
2023-07-21 16:47:04 +08:00
YunaiV
29d61beb11
mall + pay:
...
1. 简化支付宝支付的配置界面
2023-07-21 13:49:42 +08:00
YunaiV
da529851bd
mall + pay:
...
1. 简化支付宝支付的配置界面
2023-07-21 09:19:59 +08:00
YunaiV
654b70c514
mall + pay:
...
1. 增加通知管理
2023-07-20 22:48:06 +08:00
zhijiantianya@gmail.com
b54f7e9256
by gateway:
...
1. 完善部分 order 单元测试
2. 增加支付订单的 no 生成逻辑
2023-07-20 20:07:44 +08:00
YunaiV
721adfbf60
mall + pay:
...
1. 优化退款管理的导出实现
2023-07-19 23:05:45 +08:00
YunaiV
3caa5f14bd
mall + pay:
...
1. 优化退款管理的接口实现
2023-07-19 22:33:19 +08:00
YunaiV
b84da30234
mall + pay:
...
1. 优化订单管理的接口实现
2. 支付状态增加 refund 类型,将 refund status 合并进去
2023-07-19 21:09:02 +08:00
YunaiV
5dcb3db5d7
mall + pay:
...
1. 优化订单管理的接口实现
2023-07-19 09:50:24 +08:00
YunaiV
888c488206
mall + pay:
...
1. 优化 PayClient 退款逻辑,返回业务失败 errorCode + errorMsg 错误码
2023-07-18 22:36:03 +08:00
zhijiantianya@gmail.com
3f410c2735
by gateway:
...
1. 补全 channel 单元测试
2. 完善部分 order 单元测试
2023-07-18 20:21:25 +08:00
YunaiV
1c282bd3cb
mall + pay:
...
1. 优化 PayClient 退款逻辑,返回业务失败 errorCode + errorMsg 错误码
2023-07-18 13:00:22 +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
6f475f8c85
mall + pay:
...
1. 优化 PayClient 支付逻辑,返回业务失败 errorCode + errorMsg 错误码
2023-07-18 07:37:03 +08:00
YunaiV
7cf4c5415e
mall + pay:
...
1. 将 payNotifyUrl 统一改成 orderNotifyUrl
2023-07-17 16:38:31 +08:00
YunaiV
d0a7f41875
mall + pay:
...
1. 完善微信支付的 V3 支付回调、退款回调
2023-07-17 16:27:51 +08:00
YunaiV
68a4ef98ca
mall + pay:
...
1. 拆分支付回调、退款回调的 URL
2. 修复微信支付回调的时间解析错误
2023-07-17 11:47:45 +08:00
YunaiV
66ed61c641
mall + pay:
...
1. 微信支付配置,补全 apiclient_cert.p12 证书
2023-07-17 07:56:33 +08:00
YunaiV
7caf8e900f
mall + pay:
...
1. 增加微信 bar 和 native 的集成测试,方便调试配置
2023-07-16 19:24:29 +08:00
YunaiV
ecdc39612f
mall + pay:
...
1. 后台的收银台,接入微信扫码支付
2023-07-15 23:14:42 +08:00
YunaiV
a6437b7cc5
mall + pay:
...
1. 后台的收银台,接入微信扫码支付
2023-07-15 21:18:36 +08:00
YunaiV
c44ace6011
mall + pay:
...
1. 完成支付宝的退款重构
2. 完成 demo 模块的退款接入
2023-07-15 20:36:04 +08:00
YunaiV
518e89dc4b
mall + pay:
...
1. 重构支付回调的逻辑,将回调解析改成 PayOrderRespDTO,为后续轮询做铺垫
2. 调整退款单的表结构
3. 调整退款调用的实现
2023-07-15 10:35:41 +08:00
zbk
1c3521c5fa
update yudao-ui-admin/src/components/VideoUpload/index.vue.
...
修复修改后再新增时的表单无法清除还原到未选择视频文件状态的问题
Signed-off-by: zbk <540064991@qq.com >
2023-07-14 09:56:15 +00:00
puhui999
147cd271b8
fix:完善拼团活动列表展示
2023-07-14 17:34:37 +08:00
puhui999
7cdb321fe4
fix:完善拼团活动CRUD
2023-07-14 17:08:37 +08:00
puhui999
927f71c7e2
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
2023-07-14 14:28:26 +08:00
YunaiV
fbb63ee262
mall + pay:
...
1. 修复 PayNotifyTask 首次通知时,可能会失败的情况;原因:MySQL 时间的精度问题;
2023-07-12 22:40:39 +08:00
zhijiantianya@gmail.com
47ba5b7b44
by gateway: 支付渠道的代码优化
2023-07-12 20:34:43 +08:00
zhijiantianya@gmail.com
35ceef371c
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
2023-07-12 12:52:58 +08:00
zhijiantianya@gmail.com
052e4689ee
by gateway: 支付应用的代码优化
2023-07-12 12:52:48 +08:00
YunaiV
0ac599a3d9
mall + pay:
...
1. 修复支付宝沙箱地址的调整
2. 收银台的前端 URL 支付走整个网页跳转
3. 收银台的支付成功后,增加 returnUrl 回跳
4. 修复 PayNotifyTask 首次通知时,可能会失败的情况;原因:租户未传递;
2023-07-12 00:04:19 +08:00
zhijiantianya@gmail.com
f1c4c7964a
gateway commit test
2023-07-11 21:18:24 +08:00
YunaiV
cad508def6
mall + pay:
...
1. bar 扫码支付成功后,额外返回 notify
2. notify 在支付回调时,增加幂等处理
2023-07-10 23:06:00 +08:00
YunaiV
ca4afc2909
mall + pay:
...
1. 调整 cashier 的 channels 的读取实现方式
2023-07-10 18:28:43 +08:00
YunaiV
2485a5ebc9
mall + pay:
...
1. 将 amount 统一都修改成 price
2. 将 payed 统一改成 payStatus
2023-07-10 17:35:26 +08:00
puhui999
e7d8643665
fix:修复 mall review @puhui999
2023-07-10 16:35:49 +08:00
赤鷹
0134375401
update yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm.
...
Signed-off-by: 赤鷹 <121013343@qq.com >
2023-07-10 08:23:58 +00:00
赤鷹
0fa3ed9421
update yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm.
...
Signed-off-by: 赤鷹 <121013343@qq.com >
2023-07-10 08:09:40 +00:00
puhui999
9cbd0fec1c
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
2023-07-10 09:21:26 +08:00
YunaiV
5d2d52020e
mall + pay:简化 pay 的复杂度
...
1. 移除 merchant 表设计
2. 移除 app 和 channel 的导出
2023-07-09 12:40:26 +08:00
YunaiV
4682650e11
mall + pay:
...
1. 先添加 WxAppPayClient、WxH5PayClient 的类,暂未实现
2023-07-09 00:47:31 +08:00
YunaiV
b06a21f9af
mall + pay:
...
1. 实现 WxNativePayClient 的支付功能
2023-07-09 00:36:40 +08:00
YunaiV
e31b40eefa
mall + pay:
...
1. 实现 WxBarPayClient 的支付功能
2023-07-08 23:37:25 +08:00
YunaiV
4014137a4c
mall + pay:调整异常的处理
...
1. 在 PayOrderUnifiedRespDTO 增加 status 字段,用于后续微信付款码支付时,直接支付成功的场景。
2023-07-08 22:40:27 +08:00
YunaiV
efb221b1fe
mall + pay:调整异常的处理
...
1. 如果是业务异常,则统一转换成 ServiceException
2. 如果是系统异常,则使用 PayException 包装成无需 check 的异常
2023-07-08 19:26:42 +08:00
YunaiV
e615be971e
mall + pay:
...
1、测试通过微信小程序支付
2023-07-08 12:44:50 +08:00
YunaiV
d76bc7aa82
mall + pay:
...
1、初步完成微信扫码支付,暂时缺少状态的处理
2023-07-08 00:08:05 +08:00
chenchen
284506b356
mall 下单日志
2023-07-07 14:06:56 +08:00
chenchen
f492797fba
update 售后日志
2023-07-07 14:06:56 +08:00
chenchen
eaeb435459
交易日志sql
2023-07-07 14:06:56 +08:00
chenchen
2865c28a9f
售后日志优化,map->抽方法
2023-07-07 14:06:56 +08:00
chenchen
75afab1f86
售后日志优化
2023-07-07 14:06:56 +08:00
YunaiV
3f33ca2d6b
mall + pay:
...
1、增加获得支付渠道接口
2023-07-06 23:16:53 +08:00
YunaiV
d224b6b9be
mall + pay:
...
1、调整微信 Lite 小程序支付的实现
2023-07-06 20:55:23 +08:00
YunaiV
cbc61184bd
mall + pay:
...
1、优化微信公众号 MP 支付的实现
2023-07-06 19:11:32 +08:00
YunaiV
67d60e32f8
mall + pay:
...
1、调整微信支付,修复 v2 传递的时间不正确
2、调整 mp js ticket 接口到 system 模块
2023-07-06 00:19:05 +08:00
puhui999
b697ee3298
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
...
# Conflicts:
# yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderServiceTest.java
2023-07-05 22:08:12 +08:00
puhui999
b78f814552
fix:mall promotion SeckillActivity
2023-07-05 22:05:05 +08:00
puhui999
78b3d2a20f
fix:mall promotion Combination
2023-07-05 11:31:16 +08:00
YunaiV
20eb0a2a88
mall + pay:
...
1、调整 returnUrl 的实现
2023-07-04 23:43:16 +08:00
puhui999
41d996f7f3
feat:mall promotion CombinationProduct
2023-07-04 11:21:03 +08:00
puhui999
c563051841
feat:mall product 新增通过 spuIds 获取相关 spu 详情列表的接口
2023-07-03 14:44:27 +08:00
puhui999
409ec555e8
feat:mall CombinationActivity
2023-07-03 08:07:05 +08:00
YunaiV
23e3c4d0d9
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
2023-07-02 23:45:48 +08:00
芋道源码
08e9772f66
!529 回退 'Pull Request !518 : 添加华为云 maven 升级依赖'
...
Merge pull request !529 from 芋道源码/revert-merge-518-master
2023-07-02 15:41:47 +00:00
芋道源码
11c4c950b7
回退 'Pull Request !518 : 添加华为云 maven 升级依赖'
2023-07-02 15:41:26 +00:00
芋道源码
6b42efd786
!518 添加华为云 maven 升级依赖
...
Merge pull request !518 from xingyu/feature/captcha
2023-07-02 15:32:13 +00:00
YunaiV
040a66965c
mall + member:
...
1、review 积分
2023-07-02 23:19:13 +08:00
芋道源码
2f42964a96
!524 会员中心合并至member 模块
...
Merge pull request !524 from QingX/feature/mall_product
2023-07-02 13:51:00 +00:00
YunaiV
9b90320985
mall + trade:
...
1、增加配送信息
2023-07-02 12:55:15 +08:00
congqing
1b558a02b0
修复member_user pg脚本中没有默认值导致创建用户失败的bug
2023-07-02 01:33:59 +08:00
YunaiV
6fc724545b
mall + trade:
...
1、取消订单 mock 接口
2、删除订单 mock 接口
2023-07-02 00:15:28 +08:00
YunaiV
6206dd94e2
mall + trade:
...
1、获取订单结算信息,增加门店自提编号
2023-07-01 00:26:09 +08:00
YunaiV
0a20f7fe9e
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
2023-06-30 22:45:09 +08:00
YunaiV
3750dc76c7
mall + trade:
...
1、获取订单结算信息,增加积分的 mock 返回
2023-06-30 22:45:03 +08:00
jason
3a1e5c1b5f
pay : 会员电子钱包表结构
2023-06-30 10:24:36 +08:00
YunaiV
ef656cf762
mall + promotion:
...
1、增加获得符合条件的优惠劵
2023-06-29 20:20:00 +08:00
YunaiV
b3c1be108c
mall + trade:
...
1、增加门店自提的 mock 接口
2023-06-29 00:24:45 +08:00
congqing
a918b54b28
Merge remote-tracking branch 'origin/dev-fix-sql4pg' into master-cq
2023-06-29 00:01:58 +08:00
congqing
c1e020a286
将master数据库中pg数据库的引用数据库名称变量改为master
2023-06-28 23:28:19 +08:00
xiaqing
0200fa6e53
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
...
# Conflicts:
# yudao-module-member/yudao-module-member-biz/pom.xml
2023-06-28 22:55:53 +08:00
xiaqing
c7ced55a6c
会员中心代码、sql脚本提交
...
1.合并积分模块只member module
2.初始化sql放入mysql/member_point.sql
3.添加会员中/会员积分、会员签到/xxx层级目录
4.删除无用的接口代码
2023-06-28 22:49:19 +08:00
YunaiV
5ffea93731
mall + product:
...
1、完善商品评论列表的 mock
2023-06-28 00:25:44 +08:00
YunaiV
846405d8b1
mall + promotion:
...
1、增加 article mock 接口
2023-06-27 22:44:38 +08:00
xingyu
3e9768374b
chore: up justauth 1.0.1 captcha-plus 1.0.5
2023-06-26 22:19:20 +08:00
xingyu
7ad3b6ad2b
chore: use com.xingyuv.justauth
2023-06-26 21:08:56 +08:00
YunaiV
7036a6652c
mall + member:
...
1、调整收获地址的返回
2023-06-26 20:07:46 +08:00
xingyu
8ea46b8fc2
fix: getNewPhoneNoInfo 已过期
2023-06-26 16:53:08 +08:00
xingyu
9826bd614b
docs: up Lombok 1.18.28
2023-06-26 16:50:41 +08:00
xingyu
c1782c432f
chore: up deps version
2023-06-26 16:50:20 +08:00
xingyu
d44c29296d
chore: up hutool 5.8.20 Lombok 1.18.28
2023-06-26 16:49:33 +08:00
xingyu
4393c5da1c
docs: up Druid 1.2.18
2023-06-26 16:30:00 +08:00
xingyu
02fe0329e4
chore: up druid 1.2.18
2023-06-26 16:29:26 +08:00
xingyu
0899f5fd29
docs: up springboot 2.10.12
2023-06-26 16:27:06 +08:00
xingyu
bdb18b4ced
chore: up springboot 2.7.13
2023-06-26 16:26:38 +08:00
YunaiV
5c9a99c83e
mall + promotion:
...
1、mock 优惠劵模版分页
2、mock 批量删除收藏
2023-06-25 17:40:04 +08:00
xiaqing
e5c556f106
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
2023-06-25 15:49:30 +08:00
YunaiV
bb0bb2a4fa
mall + promotion:商品列表
2023-06-25 11:25:13 +08:00
YunaiV
4a3703e302
mall + promotion:review 页面装修
2023-06-25 11:24:55 +08:00
jason
050f0bb6a2
页面装修 review 修改
2023-06-24 21:09:49 +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
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
YunaiV
bc54e2fb35
mall + order:订单详情
2023-06-23 21:34:30 +08:00
芋道源码
b92ed60136
!519 订单详情后端修改
...
Merge pull request !519 from 矿泉水/feature/mall_product
2023-06-23 13:30:53 +00:00
YunaiV
2efdbf93cb
mall + promotion:review 秒杀、评论代码
2023-06-23 21:14:36 +08:00
芋道源码
b16632ea41
!522 mall seckill
...
Merge pull request !522 from puhui999/feature/mall_product
2023-06-23 06:04:47 +00:00
jason
6b1d996b66
页面装修数据结构定义
2023-06-23 10:53:29 +08:00
puhui999
26f563df57
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
2023-06-23 00:57:49 +08:00
puhui999
ab30ff6480
fix:完善 mall seckill 相关 ②
2023-06-23 00:57:27 +08:00
YunaiV
b0fcd96dfe
mall + promotion:增加砍价记录的 mock
2023-06-23 00:26:04 +08:00
YunaiV
f5b2bb4d7d
mall + promotion:增加砍价记录的 mock
2023-06-22 23:06:16 +08:00
YunaiV
c33bd38b5d
mall + promotion:增加砍价记录的 mock
2023-06-21 23:45:59 +08:00
puhui999
b44ad3a0f7
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
2023-06-21 08:42:36 +08:00
puhui999
666925da6e
fix:mall vo @Schema required = true => requiredMode = Schema.RequiredMode.REQUIRED
2023-06-21 08:41:45 +08:00
YunaiV
772a982b5f
mall + promotion:增加拼团记录的 mock
2023-06-21 00:29:50 +08:00
puhui999
700d95a43d
fix:完善商品评论 review 提到的问题
2023-06-20 18:12:39 +08:00
puhui999
8dfb298376
fix:完善 mall seckill 相关 ①
2023-06-20 09:08:15 +08:00
puhui999
9517ffdfb8
fix:修复 mall product promotion 测试 sql
2023-06-20 09:06:32 +08:00
YunaiV
bf7f68a04b
mall + promotion:增加拼团的 mock 返回
2023-06-19 23:35:28 +08:00
YunaiV
8a7f7fd641
mall + promotion:增加拼团的 mock 返回
2023-06-19 20:35:43 +08:00
chenchen
2f0aaee823
售后日志优化
2023-06-19 17:04:07 +08:00
xiaobai
d6bd4be8b0
''
2023-06-19 13:10:50 +08:00
xiaobai
32b348a2d3
Merge branch 'feature/mall_product' of https://gitee.com/joly_xiaobai/ruoyi-vue-pro into mall_product
...
# Conflicts:
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderBaseVO.java
2023-06-19 13:06:00 +08:00
xiaobai
6b3af71735
订单详情修改20230619
2023-06-19 12:50:28 +08:00
chenchen
b7c0fef63f
Merge branch 'feature/mall_product' into mall_product_aftersalelog
...
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-biz-trade/pom.xml
# yudao-module-mall/yudao-module-trade-biz/pom.xml
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/aftersale/TradeAfterSaleServiceImpl.java
# yudao-server/pom.xml
2023-06-19 10:22:05 +08:00
chenchen
2672b3e2fa
fix 依赖启动问题
2023-06-19 10:19:47 +08:00
chenchen
a93b9a616f
售后日志优化
2023-06-19 10:19:29 +08:00
xingyu
7fc1016e90
chore: up captcha-plus 1.0.4
2023-06-19 09:47:18 +08:00
xingyu
850d028ec7
chore: 添加华为云maven aliyun同步速度慢
2023-06-19 09:47:01 +08:00
puhui999
331be53b8b
fix:完善时段配置管理
2023-06-19 08:58:11 +08:00
puhui999
49d726019a
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
2023-06-19 08:33:48 +08:00
YunaiV
fc570b6062
mall + promotion:完善秒杀活动的 mock 返回
2023-06-18 21:23:50 +08:00
YunaiV
d795dbc7ac
mall + promotion:优化限购、库存的返回结果
2023-06-18 20:15:34 +08:00
puhui999
cd4940d710
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
2023-06-18 13:17:36 +08:00
YunaiV
a93acd2a74
mall + promotion:mock 秒杀列表
2023-06-18 02:05:10 +08:00
YunaiV
6573849f56
mall + promotion:mock 拼团列表
2023-06-18 00:35:22 +08:00
chenchen
7d0e9ea762
fix 依赖启动问题
2023-06-17 23:47:38 +08:00
YunaiV
60b24e36d5
code review:售后日志逻辑
2023-06-17 22:15:03 +08:00
puhui999
1871a01944
fix:seckill:调整相关类属性和表字段对齐
2023-06-17 22:14:23 +08:00
陈賝
59e16795be
!514 mall交易日志封装
...
* 交易日志封装
* 交易日志封装
* 交易日志模块
2023-06-17 14:00:10 +00:00
YunaiV
35df912be7
code review:商品评价哈
2023-06-17 21:57:52 +08:00
芋道源码
08535d6019
!509 完善商品评论
...
Merge pull request !509 from puhui999/feature/mall_product
2023-06-17 13:39:35 +00:00
puhui999
16f2a5b91a
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
2023-06-17 21:19:02 +08:00
puhui999
32cca12cd2
fix:seckillTime => seckillConfig
2023-06-17 21:17:02 +08:00
YunaiV
fd072b7d6e
code review:会员积分配置
2023-06-17 18:33:17 +08:00
芋道源码
798e322f08
!506 积分模块
...
Merge pull request !506 from QingX/feature/mall_product
2023-06-17 09:41:41 +00:00
xiaqing
8e3a65d84c
本地连接修改
2023-06-17 16:39:28 +08:00
YunaiV
8d58b1e862
Bump guava from 31.1-jre to 32.0.0-jre in /yudao-dependencies #96
2023-06-17 14:19:26 +08:00
YunaiV
a4c11b890c
fix(sec): upgrade commons-net:commons-net to #98
2023-06-17 14:17:24 +08:00
YunaiV
079fa42ba3
Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro
2023-06-17 14:12:44 +08:00
芋道源码
74aebfca3e
Merge pull request #292 from aboutZZ/fix
...
修复PG数据库部分字典数据缺失;修复PG数据库因字段无默认值无法直接运行生成的SQL
2023-06-17 14:03:27 +08:00
YunaiV
c7e3a8c126
修复 Vue 2生产环境打包压缩等配置未生效问题
2023-06-17 13:58:55 +08:00
YunaiV
1f4f8c0747
Merge branch 'dev-fix-sql4pg' of https://gitee.com/congqinggit/ruoyi-vue-pro
...
Conflicts:
sql/postgresql/ruoyi-vue-pro.sql
2023-06-17 12:45:31 +08:00
YunaiV
ecfe0b864b
优化 RedisPendingMessageResendJob 代码排版,以及注释
2023-06-17 12:41:56 +08:00
芋道源码
a978c99617
!480 解决RedisPendingMessageResendJob 任务可能会导致消息重复的问题
...
Merge pull request !480 from 天气真好/redis-stream-mq
2023-06-17 04:36:51 +00:00
YunaiV
16dd86a8db
498 解决解决 Set access token expire time to 0 报错问题和邮件发送用户编号为空问题
2023-06-17 12:36:13 +08:00
芋道源码
933bb188bd
!498 解决解决 Set access token expire time to 0 报错问题和邮件发送用户编号为空问题
...
Merge pull request !498 from clockdotnet/master_pr
2023-06-17 04:33:16 +00:00
芋道源码
281590c48e
!505 修复使用PG数据库时,站内信表、菜单权限表字段类型不一致问题
...
Merge pull request !505 from 呵呵大/N/A
2023-06-17 04:31:22 +00:00
芋道源码
03d7d2eead
!508 使用docker compose -T来执行数据导入
...
Merge pull request !508 from dhb52/N/A
2023-06-17 04:26:51 +00:00
芋道源码
09776a73b5
!511 fix:修改第1点描述错误, 【用户看到 】改为 【用户看不到】
...
Merge pull request !511 from Syriana_Zh/N/A
2023-06-17 04:26:36 +00:00
芋道源码
e791a06e2e
!512 修复-公众号标签修改提示报错
...
Merge pull request !512 from 再难也要坚持/master
2023-06-17 04:22:39 +00:00
YunaiV
749fe9d515
回退验证码到 1.0.2
2023-06-17 12:19:46 +08:00
芋道源码
7e6a3d2e36
!513 优化代码生成
...
Merge pull request !513 from xingyu/fix/codegen
2023-06-17 04:03:02 +00:00
YunaiV
0d47d6cead
mall + trade:code review 快递客户端的实现,没啥问题咧,搞下单测就 ok 拉
2023-06-17 11:59:38 +08:00
YunaiV
59d5fef592
mall + trade:优化运费模版的代码
2023-06-17 11:35:31 +08:00
YunaiV
07fe52939d
mall + promotion:mock banner mock 接口
2023-06-17 00:47:47 +08:00
YunaiV
5b324f90a4
mall + promotion:mock 拼团活动列表
2023-06-16 23:27:27 +08:00
YunaiV
8ec3733882
mall + trade:mock 拼团记录列表的接口
2023-06-16 20:32:03 +08:00
YunaiV
af9334c9b2
mall + trade:mock 拼团记录详情的接口
2023-06-16 00:12:49 +08:00
jason
1662d17fc9
快递客户端 review 修改
2023-06-15 14:59:31 +08:00
jason
e69e6d880b
快递价格计算 review 修改
2023-06-15 10:49:24 +08:00
puhui999
217a31a123
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
2023-06-15 09:11:07 +08:00
YunaiV
af0eeb6e3b
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
2023-06-14 23:08:28 +08:00
YunaiV
b74991e242
mall + trade:mock 拼团活动详情的接口
2023-06-14 23:08:22 +08:00
xingyu
b892a6d2bd
feat: captcha-plus 1.0.4
2023-06-14 18:00:14 +08:00
xingyu
25df1e2ecd
revert: config
2023-06-14 17:58:51 +08:00
sunyuqiang
296256a55a
修复-公众号标签修改提示报错“[微信公众号 yudao-module-mp - 已禁用][参考 https://doc.iocoder.cn/mp/build/ 开启]”
2023-06-14 17:30:15 +08:00
sunyuqiang
66f09ed54b
修复-公众号标签修改提示报错“[微信公众号 yudao-module-mp - 已禁用][参考 https://doc.iocoder.cn/mp/build/ 开启]”
2023-06-14 17:19:50 +08:00
xingyu
cd33f68e2b
chore: up springboot 2.10.12
2023-06-14 16:50:46 +08:00
xingyu
4953d5ec62
fix: vben codegen radio type
2023-06-14 16:24:10 +08:00
Zhe
ae8397422a
修复PG数据库部分字典数据缺失;修复因字段无默认值无法直接运行生成SQL问题
2023-06-14 16:16:56 +08:00
xingyu
e23fb5024a
fix: required = true 已过期
2023-06-14 15:21:41 +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
Syriana钟亨
df6d63068d
fix:修改第1点描述错误, 【用户看到 】改为 【用户看不到】
...
Signed-off-by: Syriana钟亨 <4916681+sairupe@user.noreply.gitee.com >
2023-06-13 08:36:20 +00:00
puhui999
60172274ec
fix:合并代码后修改差异完善商品评论相关
2023-06-12 17:02:46 +08:00
dhb52
70b48ca232
使用docker compose -T来执行数据导入
...
Signed-off-by: dhb52 <dhb52@126.com >
2023-06-12 08:32:26 +00:00
puhui999
5cfcaa1a6e
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
...
# Conflicts:
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/comment/AppCommentController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/comment/vo/AppProductCommentBaseVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/comment/vo/AppProductCommentRespVO.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/test/java/cn/iocoder/yudao/module/product/service/comment/ProductCommentServiceImplTest.java
2023-06-12 12:18:27 +08:00
puhui999
9ff873fe53
fix:完善商品评论测试 sql
2023-06-12 12:09:16 +08:00
puhui999
20100aa78b
fix:完善商品评论
2023-06-12 12:08:55 +08:00
YunaiV
dcb1660880
mall + trade:code review 快递计算逻辑
2023-06-12 00:20:20 +08:00
YunaiV
e1a8e45ac7
mall + trade:快递价格计算
2023-06-11 23:40:38 +08:00
YunaiV
0c283ded5d
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
2023-06-11 23:19:09 +08:00
YunaiV
b6c7a940be
mall + promotion:增加秒杀活动的 mock 接口
2023-06-11 23:19:04 +08:00
jason
644d976a78
快递100 快递查询实现
2023-06-11 18:15:33 +08:00
jason
45e5578cb4
快递查询、 通过快递鸟查询实现
2023-06-11 10:22:33 +08:00
YunaiV
5ffc1ac9f3
mall + promotion:增加秒杀活动的 mock 接口
2023-06-11 00:22:45 +08:00
xiaqing
5f64fe052b
初始化sql
2023-06-10 20:45:31 +08:00
xiaqing
73d0e9d08a
初始化积分模块
...
1.积分设置管理
2.积分签到规则管理
3.用户积分记录管理
4.用户签到积分管理
2023-06-10 20:44:31 +08:00
YunaiV
4f5ac0edbb
mall + promotion:增加营销活动的 mock 接口
2023-06-10 17:51:15 +08:00
呵呵大
143bff909a
修复使用PG数据库时,站内信表、菜单权限表字段类型不一致问题
...
在`NotifyMessageDO`实体类中`read_status`是布尔类型,因此数据库中也要定义为 `bool` 类型,否则查询报错。菜单权限表`system_menu`表同理。
2023-06-10 03:57:47 +00:00
YunaiV
9e894e0430
mall + promotion:增加优惠劵的 mock 接口
2023-06-10 09:57:37 +08:00
YunaiV
66210e5ee2
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
2023-06-10 00:19:08 +08:00
YunaiV
bb8e44a268
mall + product:增加评论 mock 逻辑
2023-06-10 00:17:22 +08:00
jason
dde89d51d5
物流运费计算 review 修改 + 单元测试
2023-06-10 00:15:57 +08:00
YunaiV
1e1a22c256
mall + product:评论的 review
2023-06-09 22:41:16 +08:00
YunaiV
84b365a707
mall + product:简化收藏逻辑,去掉 type 字段
2023-06-09 20:44:00 +08:00
YunaiV
25bea4920c
mall + trade:review 物流计算
2023-06-09 19:17:25 +08:00
YunaiV
f2d803c111
mall + product:review 评论接口
2023-06-09 13:59:04 +08:00
YunaiV
4126e37d91
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
...
# Conflicts:
# yudao-module-mall/yudao-module-product-biz/pom.xml
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/AppProductSpuController.java
2023-06-09 08:55:45 +08:00
YunaiV
f75f4e8846
mall + product:完善商品详情接口
2023-06-09 08:54:33 +08:00
芋道源码
0e817b190f
!499 完善商品管理 review 提到的问题
...
Merge pull request !499 from puhui999/feature/mall_product
2023-06-09 00:53:44 +00:00
puhui999
91e357e59d
fix:移动 app 商品评论分页相关常量到 AppCommentPageReqVO 中
2023-06-08 17:15:37 +08:00
puhui999
8f7efbe4e2
fix:测试 app 商品评论页获取评论分页接口和相关评论分类数量接口,修复测试时发现的问题
2023-06-08 16:14:23 +08:00
puhui999
151e58daa1
fix:完善 app 商品评论页获取评论分页接口和相关评论分类数量接口
2023-06-08 11:37:49 +08:00
puhui999
5bfca56efa
fix:完善 TODO 提到的问题
2023-06-07 18:08:49 +08:00
puhui999
db7e47faa2
fix:完善 TODO 提到的问题
2023-06-07 14:15:25 +08:00
shizhong
6ca09af97e
解决邮件发送用户编号为空问题
2023-06-05 14:09:49 +08:00
shizhong
3e350151bc
解决 Set access token expire time to 0 报错问题
2023-06-05 14:03:06 +08:00
御码滴汉子
87d4f9b71a
将菜单表中的短信预置路径更改为最新路径
...
Signed-off-by: 御码滴汉子 <1024@cong.zone >
2023-06-04 15:57:02 +00:00
御码滴汉子
9af0aa5f7d
pg数据库脚本system_menu表always_show字段类型错误导致菜单编辑保存失败
...
Signed-off-by: 御码滴汉子 <1024@cong.zone >
2023-06-04 15:51:19 +00:00
御码滴汉子
87670265b2
update sql/postgresql/ruoyi-vue-pro.sql.
...
read_status 类型修改为bool
Signed-off-by: 御码滴汉子 <1024@cong.zone >
2023-06-04 15:15:19 +00:00
jason
36c45bd44e
review 价格运算修改.
2023-06-04 17:45:40 +08:00
YunaiV
dd93215139
mall + trade:review 商品管理
2023-06-03 22:59:34 +08:00
芋道源码
e72f741d02
!493 完善善品管理
...
Merge pull request !493 from puhui999/feature/mall_product
2023-06-03 14:35:23 +00:00
puhui999
f3a982da31
fix:修复合并差异
2023-06-03 21:12:12 +08:00
芋道源码
f59119bf6e
!492 富文本编辑器自动聚焦问题 update yudao-ui-admin/src/components/Editor/index.vue.
...
Merge pull request !492 from zbk/N/A
2023-06-03 12:56:05 +00:00
puhui999
ba380ea615
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
...
# Conflicts:
# yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/price/PriceServiceTest.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateRespBO.java
# yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/aftersale/TradeAfterSaleServiceTest.java
2023-06-03 20:55:45 +08:00
YunaiV
910d374cee
mall + trade:review 运费价格计算
2023-06-03 19:56:23 +08:00
YunaiV
36ce968893
mall + trade:review 运费价格计算
2023-06-03 18:08:59 +08:00
jason
f1fa8eadd2
mall - trade - 新增 TradeDeliveryPriceCalculator
2023-06-03 17:16:18 +08:00
YunaiV
73a781cbbe
mall + trade:增加 TradeRewardActivityPriceCalculatorTest 的单元测试
2023-06-03 13:36:07 +08:00
YunaiV
0d08c814ec
mall + trade:增加 TradeDiscountActivityPriceCalculator 的单元测试
2023-06-03 13:14:47 +08:00
YunaiV
1452f6b231
mall + trade:增肌爱 TradeCouponPriceCalculator 的单元测试
2023-06-03 11:53:40 +08:00
YunaiV
636b14ccce
mall + trade:创建订单逻辑,接入新的价格接口
2023-06-03 09:14:51 +08:00
YunaiV
2a9a869e01
mall + trade:获得订单结算信息,接入支付接口
2023-06-03 00:46:56 +08:00
zbk
51cf5b7c67
富文本编辑器自动聚焦问题 update yudao-ui-admin/src/components/Editor/index.vue.
...
修复富文本编辑器自动聚焦问题;
思路:初始化时初始化只读模式的编辑器,因为只读模式的编辑器不会因为聚焦问题带跑滚动条,然后根据传递的是否只读参数设置编辑器是否启用。
Signed-off-by: zbk <540064991@qq.com >
2023-06-01 03:57:13 +00:00
puhui999
e41935ea1d
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
...
# Conflicts:
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/price/PriceApiImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/expresstemplate/DeliveryExpressTemplateSimpleRespVO.java
2023-06-01 11:44:16 +08:00
puhui999
8d2bcc57aa
fix: 完善商品管理
2023-06-01 11:41:26 +08:00
YunaiV
5de8fa2e42
mall + trade:解决报错问题
2023-05-31 21:17:35 +08:00
puhui999
e86214015d
fix: 完善商品管理
2023-05-31 16:39:43 +08:00
YunaiV
e34eddc386
mall + trade:review 自提代码
2023-05-31 09:18:24 +08:00
jason
894b19b8ec
新增自提门店管理
2023-05-30 21:18:30 +08:00
jason
f8db53896f
review 修改
2023-05-30 21:17:51 +08:00
puhui999
35daee84e7
fix: 解决合并代码后项目运行失败的问题,相关问题已标注 TODO
2023-05-30 10:26:42 +08:00
puhui999
fcaa92d406
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
2023-05-30 09:46:31 +08:00
YunaiV
382c3a4699
v1.7.3 版本发布啦~~~
2023-05-29 23:13:45 +08:00
芋道源码
151f659c99
!490 MailLogServiceImpl编译报错
...
Merge pull request !490 from PeterChina/master
2023-05-29 13:23:52 +00:00
JiangQi
8004a11036
master代码错误
2023-05-29 09:17:11 +08:00
YunaiV
406f69e21d
Merge remote-tracking branch 'origin/master'
2023-05-29 00:05:14 +08:00
YunaiV
cc049566d1
修复邮件日志 sendTime 类型不一致(应该为 LocalDateTime)
2023-05-29 00:05:06 +08:00
芋道源码
5ffed46288
!489 bugfix:解决公众号粉丝同步api配置错误
...
Merge pull request !489 from VT1996/master
2023-05-28 15:53:48 +00:00
YunaiV
6bdc31a315
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
2023-05-28 23:16:18 +08:00
YunaiV
0631c51d93
mall + trade:review 配置管理列表
2023-05-28 23:16:11 +08:00
YunaiV
6a9146ff8d
mall + trade:调整价格计算的逻辑
2023-05-28 20:09:51 +08:00
VT1996
22c70df111
bugfix:解决公众号粉丝同步api配置错误
2023-05-28 14:56:41 +08:00
jason
55dbff7570
运费模板 review 修改. 运费模块可以选择多个区域
2023-05-27 11:20:43 +08:00
YunaiV
02fa6fc5c6
mall + trade:调整价格字段,更易懂
2023-05-26 23:58:26 +08:00
YunaiV
0083d12404
mall:review + mall:快递费用
2023-05-25 22:51:38 +08:00
puhui999
b065a2a741
fix:修复商品 review 提到的问题
2023-05-25 09:23:38 +08:00
YunaiV
53e9be733f
mall:review + mall:快递公司管理
2023-05-24 23:40:55 +08:00
YunaiV
c62da6a056
mall:review 商品接口
2023-05-23 23:27:15 +08:00
芋道源码
fb7915c917
!487 完善商品管理, 完善 mall.sql, 完善 product 测试相关sql, 完善 ProductSpuServiceImplTest 测试
...
Merge pull request !487 from puhui999/feature/mall_product
2023-05-23 12:32:05 +00:00
puhui999
a70c7ca855
fix:完善 mall.sql
2023-05-23 11:59:48 +08:00
puhui999
d08b9530a2
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
...
# Conflicts:
# sql/mysql/optional/mall.sql
2023-05-23 11:08:32 +08:00
puhui999
cac5545762
fix:完善商品管理, 完善 mall.sql, 完善 product 测试相关sql, 完善 ProductSpuServiceImplTest 测试
2023-05-23 11:01:40 +08:00
jason
16956a6501
运费模板,区域选择使用懒加载优化性能
2023-05-22 23:08:21 +08:00
YunaiV
3672c217f8
mall:售后分页接口的 mock
2023-05-22 00:03:11 +08:00
芋道源码
7bfb426a9d
!484 bugfix: 解决不同模块错误码区间冲突、部分错误码重复错误
...
Merge pull request !484 from Rundeepin/feature/mall_product
2023-05-21 15:38:48 +00:00
芋道源码
3b92042d4b
!485 发送邮件逻辑优化,邮件标题支持模版参数
...
Merge pull request !485 from 傲世孤尘/feature/20230519
2023-05-21 15:35:37 +00:00
jason
01a67289a9
mall: 订单中心新增运费模板功能
2023-05-21 23:35:07 +08:00
芋道源码
02e22c664d
Merge pull request #274 from alexli0707/fix/easyexcel-bug
...
fix: 修复easyexecl3.3.0 bug引起导出表格异常(java.lang.NoClassDefFoundError: com…
2023-05-21 23:23:05 +08:00
YunaiV
e942b52a67
mall:订单详情:调整售后字段
2023-05-21 12:18:52 +08:00
YunaiV
e745bb6675
mall:订单列表:增加订单类型的接入
2023-05-20 11:22:43 +08:00
YunaiV
be7c664e07
mall:订单统计接口
2023-05-20 10:11:38 +08:00
YunaiV
83aa656bda
mall:增加订单评论字段
2023-05-19 23:55:02 +08:00
杨文
e25099a49e
发送邮件逻辑优化,邮件标题支持模版参数
2023-05-19 11:08:56 +08:00
崔家辉
fbeaa06100
bugfix: 解决不同模块错误码区间冲突、部分错误码重复错误
2023-05-19 10:47:23 +08:00
jason
3da2eb89b2
新增快递公司功能
2023-05-18 23:37:56 +08:00
walker_lee
39e52cb145
fix: 修复easyexecl3.3.0 bug引起导出表格异常(java.lang.NoClassDefFoundError: com/alibaba/excel/support/util/CollectionUtils),详见 https://github.com/alibaba/easyexcel/issues/3174
2023-05-18 17:30:54 +08:00
YunaiV
f129eab36f
REVIEW 物流配送管理表
2023-05-16 21:41:40 +08:00
YunaiV
db73ddc942
REVIEW 物流配送管理表
2023-05-16 19:17:25 +08:00
YunaiV
8ed52701fd
调整商品收藏的命名
2023-05-16 19:14:00 +08:00
wfm
4faf61a475
增加日志
2023-05-16 10:22:46 +08:00
wfm
86be0bdf80
fix PR
2023-05-16 09:58:58 +08:00
jason
4b643a7b34
物流配送管理表结构修改
2023-05-15 23:05:39 +08:00
芋道源码
12d6c14b1c
!469 修复 vue3 代码生成 api 模版错误 && 修复过期属性
...
Merge pull request !469 from xingyu/fix/vue3_codegen
2023-05-15 14:36:53 +00:00
芋道源码
dbdf1d9fb0
!468 feat: Docker最简支持
...
Merge pull request !468 from dhb52/master
2023-05-15 14:34:05 +00:00
YunaiV
c74ab7450d
!470 fix: 代码生成:解决Java代码DO和VO中的警告
2023-05-15 21:56:02 +08:00
芋道源码
5fb77df903
!470 fix: 代码生成:解决Java代码DO和VO中的警告
...
Merge pull request !470 from baayso/master
2023-05-15 13:55:14 +00:00
芋道源码
61220cf44e
!471 修复两处错误
...
Merge pull request !471 from Rundeepin/master
2023-05-15 13:53:03 +00:00
芋道源码
5dab4ae2e2
!479 StrUtils.maxLength会强制给后面加三个点,哪怕长度没有超过,优化长度不超过不加...
...
Merge pull request !479 from 重楼/jjjjjjjj/dev
2023-05-15 13:37:09 +00:00
芋道源码
bb949d991a
!481 解决tika库报错
...
Merge pull request !481 from 灬霍霍/master
2023-05-15 13:27:40 +00:00
YunaiV
cf61b6056a
!474 增加达梦数据库的驱动和SQL文件
2023-05-15 21:18:48 +08:00
芋道源码
3bcbc6656f
!474 增加达梦数据库的驱动和SQL文件
...
Merge pull request !474 from changelzj/dm8
2023-05-15 13:10:11 +00:00
灬霍霍
21499a4d40
update yudao-dependencies/pom.xml.
...
解决tika报错,升级common-io到2.11.0
Signed-off-by: 灬霍霍 <416970882@qq.com >
2023-05-15 01:42:48 +00:00
jason
7a792a7d48
商品收藏相关修改
2023-05-14 23:39:05 +08:00
YunaiV
7fef594390
订单接口的梳理
2023-05-14 17:35:34 +08:00
YunaiV
c21e88860f
REVIEW 物流管理相关的表
2023-05-14 17:35:17 +08:00
xingyu
85047bca7b
feat: vben dict
2023-05-14 16:48:35 +08:00
YunaiV
467811a42e
REVIEW 商品收藏的逻辑 v2
2023-05-14 09:07:45 +08:00
jason
0ffa7ff4c8
发货配送模块表结构
2023-05-12 19:39:48 +08:00
wfm
494928ed88
feat:重放消息判断过期时间
2023-05-12 17:23:21 +08:00
jian.li
e4a5a5672f
StrUtils.maxLength会强制给后面加三个点,哪怕长度没有超过,优化长度不超过不加...
2023-05-12 16:36:55 +08:00
xingyu
69ebfbe105
feat: 适配vue3.3 defineOptions
2023-05-12 11:19:57 +08:00
dhb52
7c1a4db5a9
fix: 添加redis卷, 修改host绑定端口
2023-05-12 11:03:13 +08:00
xingyu
9d68c62177
refactor: vben dict
2023-05-11 17:36:58 +08:00
dhb52
4891f18538
perf: 添加docker-compose/name字段,ui/Dockerfile --frozen-lockfile
2023-05-10 23:39:31 +08:00
dhb52
d794c2c198
fix: bpm/task路由错误
2023-05-10 23:12:12 +08:00
xingyu
912e18857a
feat: vben 文件上传
2023-05-10 17:28:41 +08:00
dhb52
c3d9439030
perf: admin/Dockerfile 挂载包管理器缓存目录
2023-05-09 23:38:39 +08:00
LiuZijian
8ec0be01a8
新增:达梦数据库驱动,KeyGenerator
2023-05-09 14:03:45 +08:00
LiuZijian
6ac96facf6
新增:达梦数据库dm8 sql文件
2023-05-09 10:10:13 +08:00
xingyu
0b3640a522
fix: required = true ==> requiredMode = Schema.RequiredMode.REQUIRED
2023-05-08 10:06:17 +08:00
xingyu
d25062ec81
chore: up springboot 2.7.11
2023-05-08 10:04:57 +08:00
xingyu
da2810dece
chore: up easyexcel 3.3.0
2023-05-06 16:36:42 +08:00
xingyu
6a4616b6ea
chore: up springdoc 1.7.0
2023-05-06 16:32:28 +08:00
xingyu
235882791f
chore: up druid 1.2.17
2023-05-06 16:30:05 +08:00
xingyu
5b13c07e01
chore: up springboot 2.7.11
2023-05-06 16:28:53 +08:00
xingyu
be01cd4894
chore: up mapstruct 1.5.5.Final
2023-05-06 16:26:31 +08:00
xingyu
023322cb25
chore: up hutool 5.8.18
2023-05-06 16:24:29 +08:00
jason
14d02bdfb3
商品收藏修改
2023-05-06 11:58:27 +08:00
YunaiV
96e2bf020f
REVIEW 商品收藏的逻辑
2023-05-05 23:38:31 +08:00
YunaiV
cd86620b74
REVIEW 商品管理的逻辑
2023-05-05 23:01:23 +08:00
jason
7345d80b53
新增商品收藏功能
2023-05-04 15:52:42 +08:00
芋道源码
19ceea2c6c
!472 完善商品管理(第一版)
...
Merge pull request !472 from puhui999/dev
2023-05-04 00:36:18 +00:00
puhui999
810c7ed040
完善商品管理
2023-05-04 01:32:25 +08:00
puhui999
c233ce1a20
合并分支修复差异
2023-05-03 22:18:27 +08:00
YunaiV
6b05835cb3
购物车:增加获得商品数量 Map 接口
2023-05-03 09:20:17 +08:00
puhui999
e163ae8b70
完成商品保存和编辑数据回显
2023-05-03 02:31:50 +08:00
YunaiV
9980b12551
调整购物车接口,支持 add 商品时,适配前端可能要删除的情况
2023-05-03 00:30:02 +08:00
dhb52
97502c8b51
fix: docker-compose添加自启动
2023-05-02 10:31:24 +08:00
puhui999
70816371e5
初步完成商品CRUD
2023-05-02 02:33:14 +08:00
YunaiV
f7fe9ad7b0
1. 商城:调整购物车的失效逻辑实现,基于 SPU 是否下架
...
2. 商城:增加购物车失效的重选逻辑
2023-05-01 16:00:37 +08:00
puhui999
6428f0fcaf
添加商品枚举
2023-05-01 14:47:00 +08:00
YunaiV
da162853ec
商城:完善购物车的逻辑
2023-04-30 20:32:01 +08:00
puhui999
15ced47b17
添加多租户
2023-04-30 17:35:38 +08:00
puhui999
c10ea9d9de
移除ProductSku相关的status属性,修改Property
2023-04-30 17:35:05 +08:00
puhui999
24a56bb45f
移除ProductSku相关的status属性,修改Property
2023-04-30 17:34:56 +08:00
puhui999
f56d394830
修改ProductSpuBaseVO第一版
2023-04-29 21:28:09 +08:00
puhui999
668d493b7f
Product相关Do添加TenantBaseDO
2023-04-29 21:22:52 +08:00
崔家辉
3905060bbf
修复Mapper中的DO缺失包名错误
2023-04-28 14:48:15 +08:00
崔家辉
1e3380d0a3
修复包名路径错误
2023-04-28 14:47:24 +08:00
YunaiV
2113e825d7
完善 App 商品详情逻辑的 10%
2023-04-27 22:43:37 +08:00
xingyu
3851149338
feat: vue3 vben 支持富文本生成
2023-04-27 13:22:42 +08:00
xingyu
7549ab2611
feat: vue3 vben 支持富文本生成
2023-04-27 13:22:22 +08:00
xingyu
c88794f212
feat: vue3 vben 代码生成支持创建和更新两种表单
2023-04-27 13:17:03 +08:00
xingyu
1df0fd1bf8
fix: vue3 vben 代码生成支持创建和更新两种表单
2023-04-27 13:10:32 +08:00
xingyu
28f4456bbe
fix: vue3 vben codegen
2023-04-27 11:43:48 +08:00
YunaiV
3ced6a3240
完善 App 商品搜索的逻辑
2023-04-26 20:13:12 +08:00
xingyu
3219611a32
fix: vue3 vben codegen dict
2023-04-26 18:42:03 +08:00
puhui999
4068548c45
移除ProductSpuSpecTypeEnum及相关引用
2023-04-26 17:38:42 +08:00
dhb52
dbb75e1d9e
doc: 添加docker/docker-compose文档
2023-04-25 22:55:25 +08:00
dhb52
8e64e93d9e
feat: docker-compose docker.env
2023-04-25 22:54:56 +08:00
dhb52
c139be1966
perf: yudao-server/Dockerfile添加$ARGS参数
2023-04-25 22:54:11 +08:00
dhb52
9bdd71dbf1
feat: Docker支持-yudao-ui-admin
2023-04-25 22:52:42 +08:00
YunaiV
a5f018104e
调整商品分类的实现
2023-04-25 21:33:59 +08:00
baayso
7c47fd47c1
fix: 代码生成:解决Java代码DO和VO中的警告。
2023-04-25 21:28:38 +08:00
xingyu
f8e54dda30
feat: vben codegen
2023-04-25 18:26:27 +08:00
xingyu
81b8f4171f
fix: vue3 codegen PageReqVO
2023-04-25 14:50:49 +08:00
YunaiV
711a2763ed
修复 ProjectReactor 一键改包的报错
2023-04-24 20:14:00 +08:00
芋道源码
160606356e
!467 修正相关问题让服务正常启动,改动位置都已加上TODO记录
...
Merge pull request !467 from puhui999/feature/mall_product
2023-04-24 10:58:42 +00:00
puhui999
992a30486e
补充mall.sql
2023-04-24 11:09:57 +08:00
puhui999
c3e36ba9da
修正相关问题让服务正常启动,改动位置都已加上TODO记录
2023-04-24 10:50:40 +08:00
puhui999
6786aa352b
修正DO对齐数据库表字段,VO对齐前端
2023-04-24 10:29:02 +08:00
YunaiV
640a60231c
增加 vben 演示环境
2023-04-24 01:11:42 +08:00
YunaiV
91f63ff813
尝试修复项目第一次打包失败报Failed to execute goal org.apache.maven.plugins:maven-jar-plugin:3.3.0:jar
2023-04-22 19:44:03 +08:00
YunaiV
8ce8f4e3a8
尝试修复项目第一次打包失败报Failed to execute goal org.apache.maven.plugins:maven-jar-plugin:3.3.0:jar
2023-04-22 19:41:30 +08:00
YunaiV
4b2855232a
!458 【Fix Bug】”占位“文件影响改包工具运行
2023-04-22 19:25:59 +08:00
芋道源码
9822a5ce47
!458 【Fix Bug】”占位“文件影响改包工具运行
...
Merge pull request !458 from anzhen-tech/master
2023-04-22 11:23:27 +00:00
芋道源码
dd46e9b107
!461 缺少ServletUtils引用
...
Merge pull request !461 from inypeacock/N/A
2023-04-22 11:19:03 +00:00
芋道源码
a2ca746f0a
!459 新建商品时商品分类状态判断错误
...
Merge pull request !459 from LiZhongShi/master
2023-04-22 11:16:27 +00:00
YunaiV
8c65afc56a
!462 fix: 代码生成:Vue3标准模板问题修复。
2023-04-22 19:01:11 +08:00
芋道源码
38462fbcf8
!462 fix: 代码生成:Vue3标准模板问题修复。
...
Merge pull request !462 from baayso/master
2023-04-22 06:54:14 +00:00
baayso
552e9969cc
fix: 代码生成:Vue3标准模板问题修复。
2023-04-21 18:07:28 +08:00
inypeacock
d3cd87767b
缺少ServletUtils引用
...
Signed-off-by: inypeacock <1300856@qq.com >
2023-04-21 05:13:54 +00:00
YunaiV
535413804b
1.7.2 版本发布
2023-04-19 20:44:19 +08:00
YunaiV
502fa11f1d
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
2023-04-19 18:10:59 +08:00
YunaiV
32da5aae84
商城:product:完善 ProductSpuDO 表
2023-04-19 18:07:22 +08:00
YunaiV
63542b4ccb
商城:product:完善 ProductSkuDO 表
2023-04-19 16:30:57 +08:00
YunaiV
b30fc28021
商城:product:完善 ProductSpuDO 表
2023-04-19 10:55:43 +08:00
lizs
d5a48e63a3
fix: 新建商品时商品分类状态判断错误
2023-04-16 21:53:24 +08:00
安贞
a30ca26af8
删除多余"占位"文件
2023-04-15 15:44:55 +08:00
zhangqd
70de47c156
fix: yudao-ui-admin前端-Cron表达式-周选择第4项,#号两边的值颠倒了
2023-04-10 17:15:12 +08:00
wangzhs
38d7d75f7f
[新增][商品评价]管理后台/APP端
...
1. 增加头像返回字段
2. 调整商户自评userId
3. 控制评论图片数量判断
2023-03-23 14:06:14 +08:00
wangzhs
6fe5f4bc0d
[新增][商品评价]管理后台/APP端
2023-03-21 11:09:10 +08:00
wangzhs
cbf5ef5953
[新增][商品评价]管理后台
...
1. 显示 / 隐藏评论
2. 商家回复
2023-03-19 22:07:07 +08:00
wangzhs
da53a041da
[新增][商品评价]管理后台分页查询
2023-03-19 18:59:51 +08:00
wangzhs
f69d8503a2
[新增][商品评价]
...
1. 实体类
2. h2.sql
2023-03-19 15:47:49 +08:00
wangzhs
c1935fba2d
Merge remote-tracking branch 'origin/master' into feature/mall_product
2023-03-19 11:36:00 +08:00
wangzhs
b0c73b786a
[测试][商品分类]测试创建商品分类
2023-03-15 14:23:42 +08:00
wangzhs
5674bfafc8
[修改][商品分类]分类只能存在2级
2023-03-15 14:03:00 +08:00
wangzhs
b89d7ff384
[修改][商品分类]
...
1. 删除 description 分类描述字段
2. 新增big_pic_url PC端分类图字段
2023-03-15 13:44:13 +08:00
wangzhs
4a01348e0b
[新增][商品分类] 列表查询筛选增加 status、parentId 字段
2023-03-15 11:36:45 +08:00
wangzhs
1811b96eb5
Merge remote-tracking branch 'origin/master' into feature/mall_product
2023-03-14 23:05:19 +08:00