Compare commits

...

2458 Commits

Author SHA1 Message Date
e091b077a8 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-03-01 20:01:38 +08:00
dda0909843 🎉 2.0.1 版本发布! 2024-03-01 20:01:16 +08:00
d3f3584132 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-03-01 19:40:52 +08:00
835bbe7e42 🎉 2.0.1 版本发布! 2024-03-01 19:40:37 +08:00
7ef7228f65 MALL:增加返回 vipPrice 减免金额 2024-03-01 19:21:03 +08:00
6b06bf8a3d bugfix MALL:已过期的优惠劵,还显示可以使用 2024-03-01 13:55:37 +08:00
f1ff656282 bugfix:运行失败的单测
bugfix:PayOrderExtensionMapper 的 selectListByStatusAndCreateTimeGe 查询时间范围不对的问题
2024-03-01 12:35:00 +08:00
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
da6e01f6b5 bugfix:运行失败的单测
bugfix:PayOrderExtensionMapper 的 selectListByStatusAndCreateTimeGe 查询时间范围不对的问题
2024-03-01 12:26:05 +08:00
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
d8bfed5c87 fix: 获取redis命令统计指令有误 2024-03-01 09:39:27 +08:00
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
814acb83ae fix:跟进记录分页不显示商机 2024-03-01 09:28:06 +08:00
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
d5aa827b86 !895 新增支持微信H5网页支付 2024-03-01 09:25:47 +08:00
10cc9fa77f Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-03-01 09:01:05 +08:00
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
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
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
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
c3717b68c8 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-02-28 21:42:48 +08:00
1f4889c68e 全局:将 dict 组件,融合到 excel 组件里,减少 starter 2024-02-28 21:42:32 +08:00
91b3c16a90 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-02-28 21:04:19 +08:00
6dcb1277b3 全局:迁移 pay 组件到 pay 模块,迁移 flowable 组件到 bpm 模块 2024-02-28 21:03:40 +08:00
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
0317e4279d 全局:简化 captcha 组件,融合到 system 模块 2024-02-28 20:31:55 +08:00
2dc7376ec6 全局:简化 file 组件,融合到 infra 模块 2024-02-28 19:17:18 +08:00
0480cdf03f 全局:简化 file 组件,融合到 infra 模块 2024-02-28 19:17:00 +08:00
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
77d634038c 全局:简化 file 组件,融合到 infra 模块 2024-02-28 18:59:33 +08:00
b94cd08772 修复:CRM 新增商机产品不显示 CrmProductStatusEnum.ENABLE(1, "上架") CommonStatusEnum.DISABLE(1, "关闭"); 2024-02-28 00:07:51 +08:00
89aca4572d 修复:CRM 合同配置不提醒,待办事项中即将到期的合同查询报错 2024-02-28 00:00:23 +08:00
8222c3a831 修复:CRM 更新回款报错 校验可回款金额超过上限 需要用到 不允许修改的字段的getContractId 2024-02-27 23:51:26 +08:00
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
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
d134bfc4a6 进一步同步 boot 和 cloud 代码,移除多余无用的类 2024-02-27 17:15:55 +08:00
e4f1564ade fix: 获取redis命令统计指令有误
Signed-off-by: dhb52 <dhb52@126.com>
2024-02-27 08:22:19 +00:00
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
a6e13da602 fix: 兼容有些21jdk getFirst 会找不到符合的错误
兼容有些21jdk getFirst 会找不到符合的错误
2024-02-26 15:00:50 +00:00
02466aca2e 2.0.1 版本发布准备 2024-02-26 13:14:39 +08:00
0c600a7358 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-02-26 13:09:59 +08:00
31e8777a7b CRM:更新最新代码,支持线索、客户、联系人、商机、合同等功能 2024-02-26 13:09:51 +08:00
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
a390fb4519 CRM:更新最新代码,支持线索、客户、联系人、商机、合同等功能 2024-02-26 12:55:58 +08:00
088fbb2096 Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21 2024-02-26 12:25:55 +08:00
cb8d4e0976 CRM:增加回款的待办事项逻辑 2024-02-26 12:24:40 +08:00
a531ba2902 CRM:增加回款超过合同的退款金额校验 2024-02-26 09:27:13 +08:00
5fbb423621 CRM:完善合同的待回款金额 2024-02-25 20:50:37 +08:00
33b056e6c4 CRM:完善回款的审批 2024-02-25 20:01:08 +08:00
2890de8103 CRM:完善回款的新增/修改 2024-02-25 18:44:26 +08:00
332eb30b6c CRM:完善回款列表 2024-02-25 16:52:13 +08:00
91c179029f CRM:完善回款 plan 新增/修改 2024-02-25 16:09:16 +08:00
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
e5c3e69f5c CRM: 完善回款 2024-02-25 02:11:19 +08:00
b9ffb7833c Merge remote-tracking branch 'yudao/develop' into develop 2024-02-25 00:39:47 +08:00
88cb683752 CRM: 完善回款 2024-02-25 00:36:08 +08:00
c726cd3aff CRM:将 bi 调整成 statistics 2024-02-24 22:26:24 +08:00
cd87f2e4aa CRM:code review 客户导出的实现 2024-02-24 19:57:26 +08:00
e7bd2a568d CRM:增加商机关联联系人 2024-02-24 19:35:32 +08:00
53ebd39c73 CRM:待办事项(接入合同) 2024-02-24 17:55:40 +08:00
0b0830f445 CRM:增加合同配置表 2024-02-24 16:51:16 +08:00
616ae8eaeb Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop 2024-02-24 16:08:37 +08:00
b6098cff83 CRM:商机接入合同列表 2024-02-24 16:08:07 +08:00
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
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
5dc1dbb3b2 完善 Excel 导入模版下拉选择生成实现 2024-02-24 11:40:58 +08:00
3f8fa6b1bc CRM:简化 CRM 数据权限的实现 2024-02-24 11:14:30 +08:00
a8f6a3d324 CRM:完善 CRM 相关实现 2024-02-24 08:18:10 +08:00
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
be2431b73b CRM: 完善回款审批逻辑 2024-02-23 14:37:03 +08:00
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
4066ad3e1a CRM:完善合同的审批逻辑 2024-02-23 12:59:16 +08:00
5892c8897f CRM: 流程状态转换封装 2024-02-23 12:20:08 +08:00
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
c6b133d919 CRM: 完善回款 2024-02-23 12:14:56 +08:00
b3cfad9396 CRM: 完善回款计划 2024-02-23 10:42:36 +08:00
d604e76d16 CRM:完善合同的跟进记录实现 2024-02-23 09:31:41 +08:00
b0def8b586 CRM:完善合同的新增、修改实现 2024-02-23 00:04:57 +08:00
ef26b5e8dc CRM:完善合同的列表实现 2024-02-22 21:54:06 +08:00
872fe53585 Merge remote-tracking branch 'yudao/develop' into develop 2024-02-22 21:26:28 +08:00
c97c9f882e CRM:完成商机状态的变更 2024-02-22 20:41:28 +08:00
a345328a0c 修复:错误的queryWrapper构建 2024-02-22 18:12:59 +08:00
a8ee4a85ce 修正注释错误 2024-02-22 12:53:59 +08:00
0f2d974e9c Merge remote-tracking branch 'yudao/develop' into develop 2024-02-22 11:08:11 +08:00
41b8575b8d CRM:完善客户导入 2024-02-22 11:07:34 +08:00
740e9297fa CRM:完善商机和联系人之间的关联 2024-02-22 09:35:57 +08:00
b26eb6266f CRM:新增客户导入模版所属行业、客户等级、客户来源、客户地区单元格下拉选择 2024-02-22 00:58:50 +08:00
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
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
77f98c4d12 CRM:完善商机的新增、修改逻辑 2024-02-21 21:49:49 +08:00
f76a7cd941 CRM:重构商机状态的代码实现,不调整表结构 2024-02-21 20:10:13 +08:00
e01dda9baf CRM:完善商机的列表 2024-02-21 18:45:10 +08:00
02b63de808 CRM:完善 review 提到的问题 2024-02-21 14:27:25 +08:00
7dd35f3295 CRM:完善联系人的编辑、详情 2024-02-20 23:32:26 +08:00
66a34a6d90 CRM:完善联系人的列表 2024-02-20 21:18:45 +08:00
4b41c3c692 CRM:优化客户的 backlog 逻辑 2024-02-20 20:19:59 +08:00
b444312ea8 CRM:优化客户的过期到公海的逻辑 2024-02-20 19:07:48 +08:00
3e6524932b CRM:优化客户的详情、更新成交状态 2024-02-20 12:55:44 +08:00
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
38e410cae0 📖 CRM:线索的转化逻辑 2024-02-19 20:41:10 +08:00
fe330482b3 📖 CRM:线索 clue 新增/修改的完善 2024-02-19 19:02:12 +08:00
49bc70ed82 📖 CRM:线索 clue 列表的完善 2024-02-19 13:02:41 +08:00
dca262c64b fix: 根据code-review修改 2024-02-18 22:58:23 +08:00
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
4bf4432f93 CRM:单测暂时不写 2024-02-18 21:11:43 +08:00
9ea7bde751 📖 ERP:增加 ERP 首页的统计 2024-02-18 19:05:40 +08:00
1ba2b7b600 fix: Customer,Clue增加followUpStatus自动查询 2024-02-18 00:21:10 +08:00
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
d23dfd4276 feat: CRM/backlog 提醒数量 2024-02-18 00:03:11 +08:00
123a009394 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-02-17 23:51:11 +08:00
21452af780 2.0.1 版本发布准备 2024-02-17 23:44:23 +08:00
3b2200ad80 2.0.1 版本发布准备 2024-02-17 23:26:50 +08:00
08c259424a Merge remote-tracking branch 'origin/master' 2024-02-17 21:41:08 +08:00
fb66b2768e 2.0.1 版本发布准备 2024-02-17 21:41:02 +08:00
169c1e4907 2.0.1 版本发布准备 2024-02-17 21:40:50 +08:00
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
20f8cb1606 2.0.1 版本发布准备 2024-02-17 21:01:59 +08:00
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
0fba56cda8 📖 CRM:code review 合同逻辑 2024-02-17 19:14:48 +08:00
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
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
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
c777237d93 增加 ERP 系统的介绍 2024-02-17 10:11:04 +08:00
94153cb59e 增加 ERP 系统的介绍 2024-02-17 10:10:09 +08:00
a5d33692c1 refactor: TodayCustomer利用CrmCustomerController#getCustomerPage 2024-02-16 22:45:37 +08:00
72113bbbc6 Merge remote-tracking branch 'upstream/develop' into develop 2024-02-16 22:16:44 +08:00
eefd787de6 ERP:初始化 receipt 收款单的逻辑 100% 2024-02-16 08:13:21 +08:00
f93bad282f ERP:初始化 receipt 收款单的逻辑 30% 2024-02-15 19:28:54 +08:00
33f654b73b ERP:销售订单的 receiptPrice 调整,为接入财务的收款单做准备 2024-02-15 09:16:11 +08:00
7936e27ea4 Merge remote-tracking branch 'upstream/develop' into develop 2024-02-14 19:43:04 +08:00
9e3858aea7 ERP:完成 payment 付款单的逻辑 100% 2024-02-14 17:13:48 +08:00
0d551a4408 ERP:初始化 payment 付款单的逻辑 30% 2024-02-14 08:09:15 +08:00
2d43c1f9be ERP:采购订单的 paymentPrice 调整,为接入财务的付款单做准备 2024-02-13 14:33:02 +08:00
2d02430768 ERP:采购出库 50% 2024-02-12 20:42:37 +08:00
62ef4b16af ERP:采购入库 100% 2024-02-12 16:51:56 +08:00
0599f5392c ERP:采购入库 50% 2024-02-12 10:42:23 +08:00
5d092361ed ERP:基本完成采购订单 100% 2024-02-12 10:00:02 +08:00
c5d9ad59e0 ERP:初始化采购订单 50% 2024-02-12 08:39:43 +08:00
798b72778e ERP:初始化销售退货逻辑 100% 2024-02-12 06:52:20 +08:00
926286fe08 ERP:初始化销售退货逻辑 50% 2024-02-12 06:08:09 +08:00
dbc367ad95 ERP:基本完成销售入库模块 2024-02-11 22:12:56 +08:00
0694bc8684 ERP:完善 ERP 销售出库单的保存 2024-02-11 21:19:16 +08:00
09e4763c79 ERP:增加 ERP 可出库订单列表 2024-02-11 10:33:37 +08:00
6f57987208 ERP:增加 ERP 销售出库的实现 30%(列表) 2024-02-10 22:47:30 +08:00
3c6ab397f9 ERP:初始化销售出库 30% 2024-02-10 18:20:59 +08:00
d06a22dab3 ERP:增加结算账户 100% 2024-02-10 08:32:27 +08:00
5fd23cacc7 ERP:增加 ERP 销售订单的实现 50%(详情)
新年快乐~
2024-02-10 00:07:08 +08:00
30de2176a4 ERP:增加 ERP 销售订单的实现 50% 2024-02-09 20:03:02 +08:00
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
9caaa96e5b CRM-合同: 新增更新合同商品如果有关联商机的话则更新商机商品 2024-02-08 11:53:23 +08:00
94247addc6 ERP:增加 ERP 盘点单的实现 100% 2024-02-08 06:59:19 +08:00
3b612b2e6d feat: 待回款提醒,即将到期的合同,待审核回款 2024-02-07 23:53:48 +08:00
573a79cad6 ERP:增加 ERP 调拨单的实现 100% 2024-02-07 20:47:26 +08:00
f93963028f ERP:增加 ERP 调拨单的实现 50% 2024-02-07 17:01:33 +08:00
7495bb05d1 ERP:增加 ERP 客户的实现 2024-02-07 15:41:00 +08:00
256d243507 ERP:初始化其它出库的实现 2024-02-07 15:00:40 +08:00
dbc6134f80 ERP:增加库存变更记录 2024-02-07 12:24:56 +08:00
3479ef8123 ERP:增加金额计算的四舍五入 2024-02-07 10:34:23 +08:00
f6d3290426 ERP:增加入库单号的自动生成 2024-02-07 00:37:42 +08:00
593e1fd59c ERP:增加入库单的审批功能 2024-02-06 23:28:57 +08:00
6fc8c4809f feat: 合同[审批状态]条件筛选 2024-02-06 22:58:01 +08:00
bfe3dc95fe ERP:增加供应商的实现 2024-02-06 17:59:44 +08:00
46d26659bf ERP:初始化其它入库的表单 50% 2024-02-06 15:58:29 +08:00
db79926c31 ERP:完成 stock 产品库存、库存明细的实现 2024-02-05 19:24:33 +08:00
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
b7654eafea ERP:完成 stock 仓库信息的实现 2024-02-05 01:36:34 +08:00
a36ae0c469 ERP:完成 product 信息、分类、单位的实现 2024-02-05 00:15:51 +08:00
84f3b230d2 CRM-合同: 新增合同关联商品 2024-02-05 00:14:50 +08:00
3213cad317 新增:CRM 商业智能,其他排名接口 2024-02-04 23:54:58 +08:00
787b0140e7 Merge remote-tracking branch 'origin/develop' into develop 2024-02-04 20:58:38 +08:00
5804957149 基础设施:前端直连上传,优先使用自定义域名 2024-02-04 20:57:06 +08:00
e66ded2860 ERP:初始化 product 信息、分类、单位的实现 2024-02-04 19:57:47 +08:00
478db1bd39 基础设施:增加前端直连上传文件到S3服务的功能 2024-02-04 19:44:25 +08:00
bf8ec22144 📖 CRM:code review 合同的代码实现 2024-02-04 12:57:26 +08:00
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
ba6218b835 CRM-合同: transfer 2024-02-03 22:13:02 +08:00
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
53badfc367 CRM-CONTRACT: 完善合同编辑回显 2024-02-03 20:49:13 +08:00
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
66615f9e14 chore: 整理代码 2024-02-03 15:41:57 +08:00
b2370564a4 feat: 添加查找用户的处理器,用于在bpmn中辅助查找用户 2024-02-03 15:41:53 +08:00
6a63f2f078 CRM-CONTRACT: 完善合同编辑回显 2024-02-03 14:08:06 +08:00
59e6f23788 CRM-CONTRACT: 完善 TODO 2024-02-03 12:29:28 +08:00
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
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
f5f827b59f 📖 CRM:code review 合同流程 2024-02-01 09:46:32 +08:00
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
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
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
bfed37af6f 修改:CRM 商业智能,回款金额排行榜时间字段 bug 2024-01-28 21:47:52 +08:00
4418a7bebc CRM-合同:完善新增合同插入关联的商品 2024-01-28 20:15:11 +08:00
fdd5d55fc8 Merge remote-tracking branch 'origin/develop' into develop 2024-01-28 20:11:00 +08:00
8d3ef13602 Merge remote-tracking branch 'origin/develop' into develop 2024-01-28 20:07:04 +08:00
65d7f8c4ab 新增:CRM 商业智能,合同金额排行榜和回款金额排行榜 2024-01-28 20:06:56 +08:00
ab43e89a48 修改:CRM 商业智能,合同金额排行榜和回款金额排行榜 2024-01-28 20:00:51 +08:00
ea6752f15e BPM: 新增通过流程标识获取流程图 2024-01-28 16:34:39 +08:00
1cab3c009c CRM-合同:新增发起合同审批 2024-01-28 01:50:27 +08:00
5d8ca19b17 feat: CRM-backlog-待进入公海的客户 2024-01-28 00:22:58 +08:00
6e005f46d9 ERP:【销售订单】初始化 2024-01-27 23:25:52 +08:00
ebd9222764 ERP:初始化模块,立个 2024 年的 flag 2024-01-27 17:25:07 +08:00
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
a877bb4731 CRM-客户: 完善客户导入 2024-01-27 15:15:30 +08:00
4605e93105 CRM-客户: 完善客户导入 2024-01-27 14:30:30 +08:00
d8b2da8eed CRM-客户: 完善 TODO 2024-01-27 13:34:59 +08:00
3367b4b6d4 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-01-27 13:09:40 +08:00
35205edff9 全局:将 sms 融合到 system 模块里,减少 starter 2024-01-27 13:09:25 +08:00
b56db8aebe Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-01-27 13:06:37 +08:00
524ee8c467 全局:将 sms 融合到 system 模块里,减少 starter 2024-01-27 13:06:15 +08:00
ac0b18a808 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-01-27 11:27:04 +08:00
5acdd1554e 全局:将 sms 融合到 system 模块里,减少 starter 2024-01-27 11:25:43 +08:00
1b264365d3 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-01-27 10:26:22 +08:00
5b69df074c 全局:将 banner、error-code、desensitize 融合到 web 组件里,减少 starter 2024-01-27 10:25:25 +08:00
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
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
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
0dff03b8b1 🔥 2.0.0 版本发布准备~ 2024-01-26 20:37:38 +08:00
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
ed92bf45ce CRM: 客户自动掉入公海 2024-01-23 23:30:13 +08:00
6850c7c71d CRM: 完善跟进日志 TODO 2024-01-23 22:31:51 +08:00
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
a86bce6f8b 📖 CRM:code review 商机模块 2024-01-23 09:35:45 +08:00
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
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
86a177226d FIX: 修复启动报错 2024-01-22 23:23:00 +08:00
ca9f3c522d CRM-线索:完善操作日志 2024-01-22 22:46:52 +08:00
8675d13548 CRM-线索:完善线索转客户 2024-01-22 22:23:23 +08:00
6898c17adf Merge remote-tracking branch 'origin/master' 2024-01-22 21:09:45 +08:00
a039ab3a64 bugfix:redisson 版本过高,导致 Tuple NoClassDefFoundError 2024-01-22 21:09:39 +08:00
f7d41186e4 CRM: 获取模块操作日志接口抽离 2024-01-22 20:30:12 +08:00
5fb0c51fad refactor: 清理方法 2024-01-22 17:23:53 +08:00
fb54c5fc89 商机模块代码优化 2024-01-22 16:48:59 +08:00
b4150cafa7 refactor: 调整代码分装层次 2024-01-22 13:59:37 +08:00
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
97d6aab41c fix: 修正运行时的流程抄送相关异常 2024-01-22 12:01:06 +08:00
5622ba8acf review: 第一次修正合并 2024-01-22 11:21:17 +08:00
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
227a4f126a CRM: 完善跟进 TODO 2024-01-20 23:07:15 +08:00
f366d440d8 Merge remote-tracking branch 'yudao/develop' into develop 2024-01-20 22:50:35 +08:00
d293fdd474 fix: 修复 CRM 的一些 bug 2024-01-20 22:49:47 +08:00
231fd68435 Merge remote-tracking branch 'upstream/develop' into crm-msg 2024-01-20 22:03:32 +08:00
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
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
16fd1a9639 🐛 oracle limit 查询不正确 2024-01-20 18:46:51 +08:00
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
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
34bdf00d66 增加 jakartaPackage 标识,统一 Spring Boot 2.X 和 3.X 代码生成的模版 2024-01-20 00:45:34 +08:00
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
5e8988b73b 增加 jakartaPackage 标识,统一 Spring Boot 2.X 和 3.X 代码生成的模版 2024-01-20 00:42:46 +08:00
499134cfa2 降低 podam 到 7.2.11,解决 Spring Boot 2.X 单测报错问题 2024-01-20 00:20:51 +08:00
2cdf61a56b 升级最新依赖 2024-01-19 22:47:30 +08:00
fcef0f7f50 升级最新依赖 2024-01-19 22:40:59 +08:00
6a6e95fcb6 对齐 BOOT 与 CLOUD 的代码 2024-01-19 22:13:55 +08:00
7f1ebb35cb 统一 JDK8 和 JDK21 相关代码 2024-01-19 12:43:14 +08:00
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
292d35eed0 Merge remote-tracking branch 'origin/master' 2024-01-19 12:39:32 +08:00
a9891405aa 统一 JDK8 和 JDK21 相关代码 2024-01-19 12:39:10 +08:00
023a7b14d8 统一 JDK8 和 JDK21 相关代码 2024-01-19 12:38:57 +08:00
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
f4a55d3e26 🙂 同步 develop 最新开发代码 2024-01-19 09:10:26 +08:00
ba3fe15ec5 Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21 2024-01-19 09:08:42 +08:00
fea84deca0 Pay:code review 支付转账的部分逻辑 2024-01-18 23:58:44 +08:00
ee1870802f BPM:抄送任务的 code review 2024-01-18 19:07:01 +08:00
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
0abc618a1b Merge remote-tracking branch 'origin/develop' into develop 2024-01-18 12:17:17 +08:00
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
ca55282516 CRM:商机 code review 2024-01-18 12:06:14 +08:00
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
4c200eda92 MALL:清理多余的 MemberStatisticsDO 类 2024-01-18 00:00:42 +08:00
75f2b207a4 Merge remote-tracking branch 'origin/develop' into develop 2024-01-17 19:46:03 +08:00
dd0a2b73e8 MALL:清理多余的 decorate 类 2024-01-17 19:45:57 +08:00
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
7b36eb888e CRM-合同:RespVO 添加导出注解 2024-01-17 12:11:39 +08:00
ff9cef6a92 CRM: 完善跟进,新增跟进信息处理器 handler 接口✔ 2024-01-17 12:00:51 +08:00
3720a648d7 refactor: 添加相关缺少字段 2024-01-17 09:29:14 +08:00
6dbc942cdd MALL:修复售后确认退款时,缺少退款描述信息 2024-01-16 22:41:37 +08:00
fc2a8f1311 fix: 修正测试依赖路径 2024-01-16 11:50:12 +08:00
9df6cc76e7 feat: 修正依赖路径 2024-01-16 11:22:24 +08:00
8f171ba3d0 feat: 添加抄送人相关功能以及接口 2024-01-16 11:13:36 +08:00
1bc472b528 feat: 添加创建人以及创建事件 2024-01-16 11:13:33 +08:00
555bac151d feat: 基本完成流程抄送 2024-01-16 11:13:31 +08:00
e21c262bd7 refactor: 重构查找候选人的逻辑 2024-01-16 11:13:26 +08:00
5ae1d0ab3e fix: 修复3处问题
1. AreaConvert缺少两个方法导致编译报缺少转换函数
2. 修复SocialUserBindReqVO.java在因为lombok和mapstruct的问题,导致报未知属性的问题
3. 修复Bpm报缺少AsyncTaskExecutor的问题
2024-01-16 11:09:02 +08:00
5105c6d16f wip: LocalDate.now().atTime 2024-01-16 11:06:01 +08:00
08e23a7dc4 wip: style-fix 2024-01-15 22:47:46 +08:00
9819e05d4e Merge branch 'develop' of https://gitee.com/aberizofur/ruoyi-vue-pro into develop 2024-01-15 21:34:47 +08:00
a886ad9785 📖 CRM:跟进记录的 code review 2024-01-15 21:30:32 +08:00
510b4fd3de 商机模块合并代码 2024-01-15 17:50:46 +08:00
4bd97c4baf wip: 根据code review优化代码 2024-01-15 17:41:21 +08:00
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
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
64e1d68923 📖 CRM:待办事项的 code review 2024-01-15 12:15:52 +08:00
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
0c30f59e02 Merge remote-tracking branch 'yudao/develop' into develop 2024-01-14 22:49:51 +08:00
5efa0f327f crm: 完善一些 TODO 2024-01-14 22:49:01 +08:00
4558ecd836 wip: 待办事项 2024-01-14 22:45:16 +08:00
b249c4e852 Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop 2024-01-14 15:16:39 +08:00
50f7be9976 MALL:简化商评论的 VO 转化,去除无用的接口 2024-01-14 13:21:13 +08:00
f361d05940 商机模块 2024-01-14 09:52:35 +08:00
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
ed34b18d82 MALL:简化商品分类的 VO 转化 2024-01-13 22:58:24 +08:00
eaa8e4be96 操作日志字段解析方法调整 2024-01-13 22:29:05 +08:00
d58da7b2b0 同步 https://gitee.com/zhijiantianya/yudao-cloud/pulls/90/files pr 2024-01-13 21:08:52 +08:00
8b3bfcbd6b 📖 MALL:code review 商品浏览记录 2024-01-13 20:23:58 +08:00
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
df29f0682f 📖 CRM:线索模块的 review 2024-01-13 11:07:28 +08:00
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
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
e79c750b46 📖 CRM:code review 跟进记录的实现 2024-01-13 09:56:53 +08:00
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
bf966cd610 MALL:简化 SPU 属性 的 VO 转化 2024-01-12 23:18:00 +08:00
f6c8159dac MALL:简化 SPU 的 VO 转化 2024-01-12 22:48:58 +08:00
fe5c5e4223 MALL:调整商品 SPU 字段,简化部分接口 2024-01-12 21:01:44 +08:00
f8e85575e0 【轻量级 PR】:优化 【代码生成】排序,从使用上来说,新导入的表是需要操作生成的,按照导入时间逆序符合简便使用习惯。 2024-01-12 14:03:34 +08:00
008f88d185 新增:CRM 产品,新增获得产品操作日志 2024-01-11 17:45:09 +08:00
803816b162 修改:CRM 产品分类和产品,优化了操作日志 2024-01-11 16:02:05 +08:00
31a28cb40d Review代码修改 2024-01-11 12:38:17 +08:00
d6b59743a3 营销:接入 APP 装修页面 2024-01-11 11:55:25 +08:00
680718c78f 营销:统一装修预览图片字段名称 2024-01-11 11:21:24 +08:00
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
2ab2b510cc 营销:修正拼团接口名称 2024-01-11 00:26:22 +08:00
df609df2cf 商品:修正浏览记录 2024-01-11 00:25:55 +08:00
6b426fcd01 CRM: 修复一下差异 2024-01-10 22:06:02 +08:00
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
19fa65b0c3 CRM: 新增跟进记录 2024-01-10 21:09:08 +08:00
ba103d6e86 CRM: 完善一些 TODO 提到的问题 2024-01-10 16:25:55 +08:00
1a5fe6fa9a CRM: 完善客户、联系人、合同、回款计划、回款的操作日志 2024-01-10 15:28:53 +08:00
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
722b33513c 📖 CRM:code review 线索模块 2024-01-09 21:58:50 +08:00
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
63db275af1 MALL:默认异步记录商品访问日志、访问次数 2024-01-08 19:14:09 +08:00
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
4afff6185e 新增:CRM 产品分类和产品,接入操作日志,数据权限控制 2024-01-08 15:15:42 +08:00
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
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
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
bbba83ef61 📖 MALL:code review 商品统计的代码 2024-01-07 16:23:02 +08:00
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
44d828023c crm联系人新增操作日志 2024-01-06 21:06:38 +08:00
a259e032e1 MALL:增加商品列表的分类编号数组、商品编号的筛选 2024-01-06 20:42:32 +08:00
68f5edaa88 CRM-客户: 完善一些 TODO 2024-01-06 15:28:10 +08:00
3170e7fd97 CRM-客户: 简化客户公海配置 VO,完善相关操作日志 2024-01-06 13:48:22 +08:00
9ce50ec369 CRM-客户限制配置:VO 简化 2024-01-06 13:04:30 +08:00
269816446a CRM-客户:日志表达式调整 2024-01-06 12:27:30 +08:00
f73cb540cf MALL:去除分销提现的银行配置 2024-01-05 22:46:35 +08:00
a1c17b9b00 CRM-客户:日志表达式调整 2024-01-05 17:40:21 +08:00
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
d8bb55fc0b CRM-客户:完善操作日志 2024-01-05 14:43:48 +08:00
3091a0882f Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-01-05 01:29:57 +08:00
ee250c74d6 MALL:更新 uni-app + Vue3 实现 2024-01-05 01:28:39 +08:00
ea4b4b8956 CRM-客户:精简 VO 2024-01-05 00:15:26 +08:00
e6f4c1f0d5 Merge remote-tracking branch 'yudao/develop' into develop 2024-01-04 09:59:50 +08:00
a974d055b6 📖 CRM:【还款】code review 还款的代码,补全对应的 todo list 2024-01-04 09:41:58 +08:00
c6a9751511 📖 CRM:【合同】code review 合同的代码,补全对应的 todo list 2024-01-04 09:18:44 +08:00
2668e0cfeb 📖 CRM:【产品】code review 产品的代码,补全对应的 todo list 2024-01-04 08:01:04 +08:00
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
02324f9e60 CRM:【联系人】统一字段 2024-01-03 23:30:25 +08:00
cff6e520ee 📖 CRM:【联系人】code review 联系人的代码,补全对应的 todo list 2024-01-03 22:07:20 +08:00
f8f5e525be CRM:新增跟进记录表 2024-01-03 20:56:28 +08:00
2e7c3e09a9 📖 CRM:code review 所有代码,补充对应 todo 2024-01-03 19:38:13 +08:00
d0df0e8e16 📖 CRM:【客户】优化锁定客户的逻辑实现 2024-01-03 13:06:49 +08:00
e18ac461ea fix: 修复公众号模块,当粉丝第一次关注的时候会出现错误(公众号粉丝不存在) 2024-01-03 11:11:20 +08:00
90bdc1fd83 fix: 修复公众号统计接口字符串日期转 localDateTime 报错的问题 2024-01-03 10:09:41 +08:00
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
1da8006af3 📖 CRM:【客户】完善列表、新增、修改接口的 todo 2024-01-02 21:45:02 +08:00
9e3055ee1e 📖 CRM:code review 商机模块 2024-01-02 18:49:14 +08:00
39d26cc84d 会员当前有等级的时候下订单会把当前等级清空得bug修复 2024-01-02 15:33:13 +08:00
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
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
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
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
8a947990f4 🐛 升级 easyexcel 依赖,解决 JDK21 导出报错 2023-12-30 19:22:58 +08:00
a98d00a7fe Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-12-30 12:01:25 +08:00
2fb36563ec 🐛 修复 CacheUtils 异步缓存的 ThreadLocal 变量传递 2023-12-30 12:01:12 +08:00
81c726542b Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-12-30 11:24:15 +08:00
51968c4c19 🐛 腾讯云上传 bug 2023-12-30 11:23:59 +08:00
e35b8c45a0 🐛 REPORT:支持 SaaS 租户模式 2023-12-30 10:38:53 +08:00
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
078ead536b 🐛 REPORT:支持 SaaS 租户模式 2023-12-30 10:30:47 +08:00
be0e0f5d71 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-12-30 09:38:13 +08:00
9a03f1a796 🐛 BPM:多租户的工作流隔离 2023-12-30 09:38:01 +08:00
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
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
c38790655f Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-12-29 22:33:40 +08:00
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
b0857aedbc 🐛 修复 ExcelUtils 报错 2023-12-29 22:23:07 +08:00
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
8de2eea1f7 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-12-29 22:21:11 +08:00
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
6d5fe962b7 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-12-29 21:53:03 +08:00
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
ff162e9c6c Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-12-29 21:45:55 +08:00
475e932aec 🐛 导出 Excel:Long 类型 ID 会丢失精度 2023-12-29 21:45:43 +08:00
wy
039a2b1278 支付订单的同步 Job,查询指定创建时间前的待支付订单 2023-12-29 16:47:28 +08:00
29405b9e41 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-12-29 12:59:31 +08:00
0861372755 🐛 修复修改短信渠道缓存没有更新 2023-12-29 12:59:20 +08:00
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
829965e50a 🐛 fix(websocket): 修复 websocket 失效的问题 2023-12-29 12:54:52 +08:00
46e60d6b0a Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-12-29 12:49:13 +08:00
08ff391f78 🐛 Websocket 断开时,未删除会话缓存 bug 2023-12-29 12:48:36 +08:00
33c3686bef MALL:合并订单和售后订单的数量接口 2023-12-28 23:15:25 +08:00
1f3f3d789b MALL:营销文章增加 title 查询,简易解决常见问题、用户协议的编辑 2023-12-27 22:07:54 +08:00
c019136f07 Member:增加积分记录的时间筛选 2023-12-27 20:39:14 +08:00
a1ee0991f1 fix:文件路径url中文解码 2023-12-27 12:52:49 +08:00
e5377074d5 数据权限:完善 code review 提到的问题 2023-12-26 00:21:04 +08:00
6950368991 操作日志:完善 code review 提到的问题 2023-12-26 00:04:20 +08:00
2f5afdb5c9 Member:增加使用微信小程序 code 绑定手机号 2023-12-25 23:33:50 +08:00
5de6a8bd23 📖 code review:操作日志的实现 2023-12-25 21:40:16 +08:00
82a25474f6 Merge remote-tracking branch 'origin/develop' into develop 2023-12-25 08:43:38 +08:00
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
7286f33a7f Merge remote-tracking branch 'yudao/develop' into develop 2023-12-24 00:32:47 +08:00
60e684c455 营销活动:获取商品近期参与的每个活动新增满减送和限时折扣活动 2023-12-24 00:32:17 +08:00
bd5c7d57dc Member:社交(三方)绑定接口,增加 openid 返回 2023-12-23 22:54:20 +08:00
7b482f5729 Member:增加获取单个社交用户的接口 2023-12-23 21:48:33 +08:00
e8ade5f1fe crm:完善一些遗留的 TODO 2023-12-23 20:10:40 +08:00
59752d43b7 Member:修复社交登录时,自动创建 user 后,未进行绑定的问题 2023-12-23 17:54:13 +08:00
d65c28d7f7 Member:社交登录逻辑调整,如果登录时无用户,则自动创建用户,保持和各 App 统一逻辑 2023-12-23 09:59:58 +08:00
106c1ecf4c 📖 code review:店铺装修逻辑 2023-12-19 23:11:09 +08:00
0944584029 商品:用户未登录时,不记录商品浏览记录 2023-12-19 21:44:04 +08:00
a05d3bc1d1 Merge remote-tracking branch 'yudao/develop' into develop 2023-12-19 18:44:34 +08:00
f56d8a2751 重构操作日志记录实现 2023-12-19 18:34:51 +08:00
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
cd45fc35ea Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop 2023-12-19 12:27:11 +08:00
55a215da44 CRM-数据权限:完善数据权限补全管理员和公海相关情况处理逻辑 2023-12-19 10:43:45 +08:00
3e91ac73c4 CRM:完善数据分页查询条件构造 CrmQueryWrapperUtils 2023-12-19 10:29:41 +08:00
9c341be4ae Merge remote-tracking branch 'origin/develop' into develop 2023-12-19 09:53:35 +08:00
3bab9748db 系统操作日志:使用自定义 starter 的方式重新集成 mzt-biz-log 2023-12-19 09:20:47 +08:00
09724adb8d PAY:增加充值日志分页 2023-12-18 23:04:42 +08:00
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
b4612262b3 MEMBER:修改密码时,发送验证码无需传递 mobile,通过 user 查询 2023-12-17 23:46:48 +08:00
e59f43408c Pay:增加钱包流水统计接口 2023-12-17 23:45:55 +08:00
805190300f Merge remote-tracking branch 'origin/develop' into develop 2023-12-17 19:34:44 +08:00
0b7d42482f 统计:增加商品统计定时任务 2023-12-17 19:30:50 +08:00
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
8434a8cd68 crm联系人商机功能修改 2023-12-17 17:33:52 +08:00
f374e778bb 商品:增加商品浏览记录 2023-12-17 17:20:08 +08:00
86a9c4bbf4 基础设施:优化vue3标准版API生成(导出xxAPI,方便IDE识别接口) 2023-12-17 11:16:29 +08:00
de8f2800e5 基础设施:代码生成器javax替换为jakarta 2023-12-17 11:14:33 +08:00
ddb6fe7ec8 📖 CRM:code review 客户管理的数据权限、操作权限 2023-12-17 10:57:49 +08:00
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
b0b6544887 MALL:会员的个人信息,支持 sex 修改和返回 2023-12-17 09:51:24 +08:00
4a007f0c98 统计:增加商品统计 2023-12-16 23:48:10 +08:00
e1bb546460 MALL:1)优惠劵增加返回使用范围;2)商品分类增加 id 批量查询 2023-12-16 18:32:54 +08:00
8298896efd 修改了退款单号匹配错误问题
修改了退款单号匹配错误问题

Signed-off-by: lynfgn <707557870@qq.com>
2023-12-15 01:50:44 +00:00
35f796875d fix 审批流-自定义规则脚本无法获取到流程变量(Process Variables) 2023-12-15 09:40:29 +08:00
07e610b3f7 🔥 MALL:移除商品收藏的批量操作接口,由前端自身 for 处理 2023-12-15 00:02:40 +08:00
8913572e51 🐛 修复创建订单评论的 scores、replyStatus 默认值未填写的问题 2023-12-14 22:00:04 +08:00
c1429dd3a0 增加售后日志列表 API 2023-12-14 20:07:35 +08:00
daf4651a4f 系统操作日志:集成 mzt-biz-log 5,增加日志保存和查询接口 2023-12-14 18:45:13 +08:00
289f0409d0 Merge remote-tracking branch 'yudao/develop' into develop 2023-12-13 17:52:32 +08:00
3c74b22933 系统操作日志:集成 mzt-biz-log 4 2023-12-13 17:45:43 +08:00
6de17c38fd Merge remote-tracking branch 'origin/develop' into develop 2023-12-13 16:24:57 +08:00
c74881c8f0 系统操作日志:集成 mzt-biz-log 3 2023-12-13 15:18:19 +08:00
13d6c42a48 系统操作日志:集成 mzt-biz-log 2 2023-12-12 22:42:50 +08:00
c5cc818a49 系统操作日志:集成 mzt-biz-log 2023-12-12 22:29:40 +08:00
72cebfca14 CombinationRecordApiImpl 重命名一下 recordService 改为 combinationRecordService 解决和 mzt-biz-log 组件的 bean 冲突 2023-12-12 16:23:48 +08:00
1e5b0a1c0d Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-12-12 12:21:55 +08:00
a7189e7425 考虑到大家的接受度,master 还是保持 jdk8 版本(稳定),master-jdk21 使用 jdk21 版本(创新) 2023-12-12 12:21:38 +08:00
ff00748d11 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-12-12 12:20:32 +08:00
d2c071bbb6 考虑到大家的接受度,master 还是保持 jdk8 版本(稳定),master-jdk21 使用 jdk21 版本(创新) 2023-12-12 12:17:50 +08:00
e71867683e 📖 MALL:调整接口文档的说明 2023-12-12 12:11:28 +08:00
8fa8f2890b CRM: 线索、联系人、回款、回款计划新增数据权限转移 2023-12-11 17:36:09 +08:00
c234f5b5f8 CRM: 完善数据权限 2023-12-11 16:48:21 +08:00
63431082e5 member: 完善连续签到 review 提到的问题 2023-12-11 16:37:14 +08:00
1ac68aca97 CRM-回款计划:添加数据权限 2023-12-11 15:56:12 +08:00
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
6a8baff080 fix: 修复vm文件中,import依赖路径的错误 2023-12-11 09:28:43 +08:00
1316f92081 Merge remote-tracking branch 'origin/develop' into develop 2023-12-09 21:38:45 +08:00
9bac10c6f7 完善客户锁定/解锁接口,校验锁定上限 2023-12-09 17:25:47 +08:00
a8c14614ab 增加《迁移功能到精简版》的说明地址 2023-12-09 15:39:29 +08:00
5c60202c14 🐛 移除多余的 yudao-spring-boot-starter-security 依赖 2023-12-09 15:39:29 +08:00
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
517f3bc187 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk8 2023-12-09 01:10:09 +08:00
8c67d1d0ba 增加《迁移功能到精简版》的说明地址 2023-12-09 01:05:25 +08:00
7c54affb16 CRM-合同:完善数据权限,新增权限关联、场景分页查询,新增权限关联批量查询 2023-12-08 22:43:45 +08:00
57b8411f03 Merge remote-tracking branch 'origin/master-jdk8' into master-jdk8 2023-12-08 22:19:01 +08:00
72865b5ebb ⬇️ 保持 JDK8 + Spring Boot 2.7.18 持续维护 2023-12-08 22:17:52 +08:00
802ac89b73 ⬇️ 保持 JDK8 + Spring Boot 2.7.18 持续维护 2023-12-08 22:17:52 +08:00
10d245afc3 🐛 移除多余的 yudao-spring-boot-starter-security 依赖 2023-12-08 22:17:13 +08:00
f69a18fd23 CRM-联系人:完善数据权限,新增权限关联、场景分页查询,新增权限关联批量查询 2023-12-08 18:08:41 +08:00
490418a1fc CRM-线索:完善数据权限,新增权限关联、场景分页查询,新增权限关联批量查询 2023-12-08 17:52:02 +08:00
9ea0607339 CRM-商机:完善数据权限,新增权限关联、场景分页查询,新增权限关联批量查询 2023-12-08 17:16:34 +08:00
5c395fc1c4 CRM: 完善 code review 数据权限提到的问题,重新封装 CrmQueryWrapperUtils 2023-12-08 15:27:58 +08:00
f8604e17a1 营销:修正文章字段名、接口方法名 2023-12-08 10:20:16 +08:00
8b80c9f415 Merge remote-tracking branch 'origin/master-jdk8' into master-jdk8 2023-12-07 23:23:03 +08:00
a0d72ffb00 ⬇️ 保持 JDK8 + Spring Boot 2.7.18 持续维护 2023-12-07 23:22:46 +08:00
7e806c65dc ⬇️ 保持 JDK8 + Spring Boot 2.7.18 持续维护 2023-12-07 23:21:23 +08:00
db62d70f3f ⬆️ JDK21 + Spring Boot 3.2.0 晋升 master 分支,开启 2.0.0 版本 2023-12-07 23:21:05 +08:00
9574b23d9a Merge remote-tracking branch 'origin/master-jdk8' into master-jdk8 2023-12-07 23:19:01 +08:00
8f2a156f30 ⬇️ 保持 JDK8 + Spring Boot 2.7.18 持续维护 2023-12-07 23:18:21 +08:00
0be3947199 ⬆️ JDK21 + Spring Boot 3.2.0 晋升 master 分支,开启 2.0.0 版本 2023-12-07 23:17:02 +08:00
a321805ff0 ⬇️ 保持 JDK8 + Spring Boot 2.7.18 持续维护 2023-12-07 23:16:45 +08:00
59ff4be03d ⬇️ 保持 JDK8 + Spring Boot 2.7.18 持续维护 2023-12-07 23:11:20 +08:00
3cd27c83d2 ⬆️ JDK21 + Spring Boot 3.2.0 晋升 master 分支,开启 2.0.0 版本 2023-12-07 20:58:32 +08:00
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
2ad27a487f Merge remote-tracking branch 'origin/master' 2023-12-07 07:37:39 +08:00
a9ae7b0865 完善 UReport2 的集成 2023-12-07 07:37:32 +08:00
30bf72f50e 🚚 将运维相关的统一到 script 目录下,简化根目录 2023-12-07 07:36:33 +08:00
77e8600040 🚚 将运维相关的统一到 script 目录下,简化根目录 2023-12-07 07:36:33 +08:00
39b4cac33f 🔥 gitattributes 文件 2023-12-07 07:36:33 +08:00
b8f8cab699 🐛 修复 Spring Cache Redis 单冒号,而不是双 :: 冒号,避免 Redis Desktop Manager 多余空格 2023-12-07 07:36:33 +08:00
7cbdd1670b 🐛 禁用 CodegenEngineVue3Test 暂时,避免单测报错 2023-12-07 07:36:33 +08:00
6b1f94f122 代码生成测试:生成测试文件 2023-12-07 07:36:33 +08:00
ae98d17473 代码生成测试:系统不一样生成的文件也有差异,那就各自生成各自。新增根据操作系统动态获取测试文件资源路径 2023-12-07 07:36:33 +08:00
090b1bcd45 🚚 将运维相关的统一到 script 目录下,简化根目录 2023-12-06 22:15:08 +08:00
f9fede3ea7 🚚 将运维相关的统一到 script 目录下,简化根目录 2023-12-06 22:11:12 +08:00
ea59975d54 🔥 gitattributes 文件 2023-12-06 22:03:54 +08:00
85994b6920 🐛 修复 Spring Cache Redis 单冒号,而不是双 :: 冒号,避免 Redis Desktop Manager 多余空格 2023-12-06 21:30:11 +08:00
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
6a4449e03f Merge remote-tracking branch 'origin/feature/ureport2' into feature/ureport2
# Conflicts:
#	yudao-dependencies/pom.xml
2023-12-06 21:03:08 +08:00
076bf13687 📈 REPORT:code review ureport2 实现 2023-12-06 21:02:26 +08:00
0d3efe4f80 【优化】ureport2菜单,初始化数据,按照规范重新进行命名处理 2023-12-06 21:02:26 +08:00
5e9cbb9cad report:code review ureport 的集成 2023-12-06 21:02:26 +08:00
9350523b35 【新增】ureport2菜单,初始化数据 2023-12-06 21:02:26 +08:00
5894d2be01 【修改】ureport2 集成的SQL语句,并适配数据库存储方式 2023-12-06 21:02:26 +08:00
7c43c3a2b1 【新增】ureport2 集成的SQL语句 2023-12-06 21:02:26 +08:00
8507fa9172 【新增】ureport2 集成 2023-12-06 21:02:25 +08:00
9d10c74599 📈 REPORT:code review ureport2 实现 2023-12-06 21:00:31 +08:00
5bf7cd396f Merge remote-tracking branch 'origin/master' 2023-12-06 20:28:59 +08:00
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
3707662187 📈 CRM:code review 数据权限 2023-12-06 20:04:15 +08:00
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
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
3678752a61 🔨 CRM:优化产品分类代码的实现 2023-12-06 12:56:44 +08:00
c94f71a3df 🔨 CRM:优化产品分类代码的实现 2023-12-06 12:56:35 +08:00
a9b2656971 代码生成测试:生成测试文件 2023-12-06 00:30:52 +08:00
e0bdc4f4c1 代码生成测试:系统不一样生成的文件也有差异,那就各自生成各自。新增根据操作系统动态获取测试文件资源路径 2023-12-06 00:30:18 +08:00
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
a11d5dc5f1 🔨 CRM:优化产品代码的实现 2023-12-05 22:41:58 +08:00
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
c69fbe540a 增加 codegen 模块的单测覆盖率 2023-12-05 20:00:29 +08:00
455a4ebc7b CRM-客户:实现数据权限、场景检索和公海数据分页查询 2023-12-05 15:04:53 +08:00
78165f2161 CRM: 新增 CRM 分页查询工具类,实现通用构造 crm 数据类型数据分页查询条件 2023-12-05 15:03:22 +08:00
b2621c8891 CRM-客户: 新增关注和取消关注客户接口 2023-12-05 11:04:40 +08:00
9c1687dc25 CRM: 新增关注数据模块 2023-12-05 11:00:34 +08:00
a62399fbca 增加 infra logger 模块的单测覆盖率 2023-12-04 20:43:23 +08:00
da829f7cf5 增加 sms/tenant/senstiveword 模块的单测覆盖率 2023-12-04 13:14:18 +08:00
c2e9ecf7be 增加 social 模块的单测覆盖率 2023-12-04 09:54:47 +08:00
6f237a10b5 商城-商品库存为零可以展示商品列表 2023-12-03 23:08:50 +08:00
f656888965 增加 permission 模块的单测覆盖率 2023-12-03 21:55:17 +08:00
d2e965fb02 【CRM:优化产品以及产品分类】 2023-12-03 21:33:01 +08:00
4dab6d0217 增加 dept 模块的单测覆盖率 2023-12-03 21:26:43 +08:00
dab751dc74 增加 dict 模块的单测覆盖率 2023-12-03 21:15:06 +08:00
910bc09e19 crm联系人商机功能 2023-12-03 20:01:00 +08:00
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
30fef09eee 🔧 简化 errorLog 和 accessLog 模块的 VO 2023-12-03 18:32:47 +08:00
e541fe6324 🔧 简化 job 模块的 VO 2023-12-03 18:11:45 +08:00
c7386d9e04 【优化】ureport2菜单,初始化数据,按照规范重新进行命名处理 2023-12-03 17:25:32 +08:00
35d171b1d9 🔧 简化 file 模块的 VO 2023-12-03 10:33:43 +08:00
fc3bb430c3 🔧 简化 dataSourceConfig 模块的 VO 2023-12-03 10:06:56 +08:00
645e6f3cc8 🔧 简化 config 模块的 VO 2023-12-03 09:57:34 +08:00
42dc4b6194 🔧 简化 user 模块的 VO 2023-12-03 01:02:59 +08:00
d4cf945af7 🔧 简化 tenant 模块的 VO 2023-12-02 23:42:57 +08:00
5bb8fdca7e 🔧 简化 social 模块的 VO 2023-12-02 23:01:15 +08:00
e61ecb63dd 🔧 简化 sms 模块的 VO 2023-12-02 22:39:23 +08:00
8b67111733 🔧 简化 sensitiveWord 模块的 VO 2023-12-02 21:59:08 +08:00
2dd835893a 🔧 简化 permission 模块的 VO 2023-12-02 21:47:03 +08:00
73d53dbaad 🔧 简化 oauth2 模块的 VO 2023-12-02 20:48:51 +08:00
9aed06af5d 🔧 简化 notify 模块的 VO 2023-12-02 20:25:10 +08:00
5eb5472dec 🔧 简化 notice 模块的 VO 2023-12-02 20:07:54 +08:00
b77b6322e1 🔧 简化 mail 模块的 VO 2023-12-02 19:54:58 +08:00
4225db217d 🔧 简化 loginLog 和 operateLog 模块的 VO 2023-12-02 19:25:25 +08:00
8eb04d6805 🔧 简化 errorCode 模块的 VO 2023-12-02 18:40:31 +08:00
c493397653 🔧 简化 dictType 和 dictData 模块的 VO 2023-12-02 18:21:40 +08:00
a9c8f6c8e9 🔧 简化 post 和 dept 模块的 VO 2023-12-02 10:18:27 +08:00
72969e921e crm: 增加基于客户查询回款计划分页 2023-12-01 22:46:13 +08:00
f02b9464bd crm: 增加基于客户查询回款分页 2023-12-01 19:37:44 +08:00
a5c59c6079 1.9.0 版本发布 2023-12-01 07:37:38 +08:00
8ecc8cddba 1.9.0 版本发布 2023-11-30 21:22:59 +08:00
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
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
db03b10d24 crm: 增加基于客户查询商机分页 2023-11-30 20:21:39 +08:00
2d9f5cc4d0 crm: 1)调整合同的 CRM 前缀;2)增加基于客户查询合同分页 2023-11-30 19:12:37 +08:00
fe4b51b9ad crm: 完善数据权限的逻辑 2023-11-30 13:42:36 +08:00
53b8e37f36 crm: 增加联系人,基于客户的读取接口 2023-11-29 22:33:47 +08:00
103e38b82c Merge remote-tracking branch 'yudao/feature/sub-table' into feature/sub-table 2023-11-29 18:57:31 +08:00
25595a13f4 fix:修复 vue2 代码生成后 api 导入路径不正确的问题 2023-11-29 18:57:09 +08:00
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
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
7b587a79ca 返回使用过优惠券逻辑---->状态字段取错了
Signed-off-by: Ai3_刘小龙 <wisty0317@163.com>
2023-11-28 09:16:58 +00:00
79600774ec crm-客户:分页查询 mapper 还是得拆成两个,怎么查逻辑交给 service 去做处理 2023-11-28 14:27:36 +08:00
1580789334 crm联系人review修改 2023-11-27 23:42:04 +08:00
6c536caad4 crm:完善 code review 数据权限提到的问题 2023-11-27 21:47:56 +08:00
c437201236 代码生成:CodegenEngineVue2Test 所需测试文件 2023-11-27 21:15:32 +08:00
b4d16b368d Merge remote-tracking branch 'yudao/feature/sub-table' into feature/sub-table 2023-11-27 21:07:45 +08:00
5ebebf1579 代码生成:vue2 代码模拟格式调整 2023-11-27 21:05:41 +08:00
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
492adfe8e5 crm:code review 数据权限 2023-11-27 20:51:51 +08:00
455f8e49fb crm:code review 联系人 2023-11-27 20:42:35 +08:00
16084d468d crm联系人删除多余文件 2023-11-27 20:42:35 +08:00
3f3899f5d3 crm联系人review修改,新增地区字段 2023-11-27 20:42:34 +08:00
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
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
6d228828f4 application-local.yaml 恢复 2023-11-27 16:34:55 +08:00
4f42e7ca68 代码生成:Vue2 界面:修正 $refs 2023-11-27 16:31:06 +08:00
86160f40de 代码生成:重构 vue2 代码生成模版,使用 async await 优化代码层次 2023-11-27 16:30:30 +08:00
4a51b20155 crm-客户:修复合并差异 2023-11-27 12:14:32 +08:00
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
8f06d02293 crm-客户:完善 code review 提到的问题 2023-11-27 12:00:53 +08:00
7f569f3299 crm-数据权限:完善数据权限 2023-11-27 10:55:32 +08:00
930b5a8dd5 crm联系人删除多余文件 2023-11-26 22:03:06 +08:00
d2c6c285f7 crm联系人review修改,新增地区字段 2023-11-26 22:00:14 +08:00
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
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
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
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
0bf24c6d16 使用 spring-boot-starter-justauth 替代原本 social starter 2023-11-26 11:39:29 +08:00
fbf864b6b4 fix: 修复客户公海配置设置为不启用时保存字段没有清空的 bug 2023-11-26 02:00:23 +08:00
033f13c6ad feat: 客户配置 review 修改 2023-11-26 00:27:09 +08:00
ab3748d102 feat: 客户配置 review 修改 2023-11-25 23:54:08 +08:00
f2ff30e465 优化 error-code 加载逻辑,失败不影响启动 2023-11-25 23:00:31 +08:00
6d7491fb02 !69fix(system): 修复更新账号时岗位为空时发生的空指针异常 2023-11-25 22:34:08 +08:00
6b3a54c8df !69fix(system): 修复更新账号时岗位为空时发生的空指针异常 2023-11-25 22:28:05 +08:00
bb06c11405 更新 README.md,增加主子表、WebSocket 的说明 2023-11-25 22:26:23 +08:00
c7ab595460 简化 yudao-ui 目录 2023-11-25 22:05:57 +08:00
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
63f9bcb0a3 crm:code review 商机类型、状态 2023-11-25 12:02:03 +08:00
3e9eb59de3 crm:code review 数据权限的实现 2023-11-25 10:55:47 +08:00
899e40deb9 crm:code review 数据权限的实现 2023-11-25 10:02:55 +08:00
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
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
13e5d70be7 crm:解决冲突 2023-11-24 23:54:23 +08:00
ec67e63c67 crm:code review 客户的公海领取和分配 2023-11-24 23:53:28 +08:00
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
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
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
a597eb17d4 websocket:修复 RedisWebSocketMessageConsumer 注册失效的问题 2023-11-24 18:56:19 +08:00
4e1d9d6292 商机、商机状态类型和商机状态 2023-11-24 14:24:04 +08:00
0233b092b8 websocket:重新封装 websocket 组件,支持 sender 广播 2023-11-24 00:32:52 +08:00
be20178f12 Merge remote-tracking branch 'upstream/master' 2023-11-23 22:44:03 +08:00
0d821d705d crm-客户管理:完善客户、公海客户分页查询 2023-11-23 10:12:50 +08:00
1941a7b3e6 websocket:重新封装 websocket 组件,支持 token 认证,并增加 WebSocketMessageListener 方便处理消息 2023-11-22 23:17:50 +08:00
6a61db8508 security: query string 支持传递 token 参数,解决 ws token 认证 2023-11-22 23:02:59 +08:00
6b86793b9d Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-11-22 22:31:17 +08:00
05369a36a3 【新增】ureport2菜单,初始化数据 2023-11-22 22:15:08 +08:00
770086ac5b 【修改】ureport2 集成的SQL语句,并适配数据库存储方式 2023-11-22 22:13:05 +08:00
b41d469d46 crm-客户管理:新增客户放入公海和领取公海客户 2023-11-22 18:44:49 +08:00
77d7bcc73f crm-数据权限:完善数据权限 code review 提到的问题 2023-11-22 17:56:13 +08:00
780526f484 crm-数据权限:完善数据权限相关操作接口 2023-11-22 17:27:00 +08:00
49accc946d 营销:适配商城装修组件【优惠券】 2023-11-22 16:58:01 +08:00
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
edea17e781 Merge remote-tracking branch 'upstream/master' 2023-11-21 23:19:49 +08:00
7506a1b012 sms:移除 sendCode、sendMsg 字段 2023-11-21 22:53:57 +08:00
6f135303d8 sms:移除 SmsCodeMapping + SmsCommonResult,简化短信的封装 2023-11-21 22:14:07 +08:00
3d2022e31f 代码生成:完善 vue2 代码生成单元测试 2023-11-21 16:22:16 +08:00
c50d27f5cb 代码生成:完善 vue2 模版,适配树表和主子表 2023-11-21 11:58:04 +08:00
80db28ee5b 代码生成:重构 vue2 模版,适配树表和主子表 2023-11-21 10:49:43 +08:00
b5a667cb9c 【新增】ureport2 集成的SQL语句 2023-11-20 23:31:21 +08:00
822e441765 使用 justauth 替代现有 yudao-spring-boot-starter-biz-social 依赖,减少 starter 2023-11-20 23:27:41 +08:00
a0e3cb11ab 【新增】ureport2 集成 2023-11-20 23:14:52 +08:00
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
87778f7fd9 客户的公海领取和分配,按照要修调整代码格式 2023-11-19 23:23:52 +08:00
827897807f 提升启动速度 2023-11-19 18:46:16 +08:00
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
7f75f0abfc bpm:code review 指定审批人 2023-11-19 18:28:00 +08:00
6fd8d0095c Merge branch 'feature/bpm-earlyAssignee' of https://gitee.com/ykhcool/ruoyi-vue-pro 2023-11-19 18:17:28 +08:00
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
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
f589881de5 code review:客户的分配和领取 2023-11-19 00:05:06 +08:00
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
86050d411b code review:权限模块 2023-11-18 23:45:24 +08:00
58ede7d69c 【修改】最新的SQL字符编码不一致导致创建表失败,修改utf8mb4_0900_ai_ci=》utf8mb4_unicode_ci 2023-11-18 23:30:24 +08:00
716b081464 crm:合并最新的数据权限 2023-11-18 22:31:05 +08:00
677a6d348f Merge remote-tracking branch 'upstream/master' 2023-11-18 22:28:24 +08:00
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
8c9c91f0ca crm:code review 配置管理 2023-11-18 22:12:12 +08:00
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
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
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
7ac74b44d8 同步最新 SQL 脚本 2023-11-18 17:49:01 +08:00
ac80aa97b3 代码生成:优化前端模版的 package 路径 2023-11-18 17:41:37 +08:00
067d53ac48 代码生成器:增加单元测试,🛫 2023-11-17 19:39:32 +08:00
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
a88c93fc60 代码生成:重构 vue2 模版,适配树表和主子表(90%) 2023-11-17 18:18:27 +08:00
df69fecbb4 代码生成:重构 vue2 模版,适配树表和主子表(80%) 2023-11-17 17:03:35 +08:00
ee918a6d3f 代码生成:增加主子表 erp 模式的示例 2023-11-17 13:21:07 +08:00
330380c2d0 营销:适配商城装修组件【商品卡片】 2023-11-17 09:56:52 +08:00
d2aee55ed2 代码生成:增加主子表 inner 模式的示例 2023-11-16 23:48:12 +08:00
2aecdbf09e 代码生成:增加主子表 normal 模式的示例 2023-11-16 23:23:46 +08:00
5b9879ca8d 代码生成:增加 tree 示例 2023-11-16 20:40:13 +08:00
01a55b93c2 代码生成:增加更全的 tree 场景下的新增/修改校验 2023-11-16 20:01:44 +08:00
f5ea270be3 部门:优化父部门的校验逻辑,为代码生成做个铺垫?! 2023-11-16 12:55:43 +08:00
a2f7067494 代码生成:支持树形表结构的配置 2023-11-16 00:11:31 +08:00
0d49691aa0 代码生成:增加 crud 单表示例 2023-11-15 23:48:30 +08:00
d83e0413b8 清理一波 demo 示例代码,准备重新生成 2023-11-15 21:46:10 +08:00
413640f593 代码生成器:简化 vo 和 convert 的生成逻辑 2023-11-15 21:05:00 +08:00
91d7938ddf 代码生成器:简化 vo 和 convert 的生成逻辑 2023-11-15 21:03:16 +08:00
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
5e6e02e4f4 vo 简化:使用 BeanUtils 替代 mapstruct 转换 2023-11-15 09:19:51 +08:00
ddb5bce0a2 vo 简化:post 重构 2023-11-14 22:37:46 +08:00
b47c4fbd8d 代码生成器:增加树形结构的 vm 模版 2023-11-14 19:37:35 +08:00
06649624e5 代码生成:支持设置主子表的信息 2023-11-14 12:57:55 +08:00
794649ea8a CRM-数据权限:完善团队成员相关操作 2023-11-14 11:23:52 +08:00
a75bb825d7 代码生成:支持设置主子表的信息 2023-11-14 09:51:10 +08:00
a51e9645ef 代码生成:进一步完成 erp 模版 2023-11-13 21:46:54 +08:00
7c48aaba8a 代码生成器:进一步完善 erp 生成模版 2023-11-13 20:37:15 +08:00
01bdb33696 代码生成器:进一步完善 erp 生成模版 2023-11-13 20:35:03 +08:00
90842542a9 代码生成:主子表(inner)部分模版 2023-11-13 13:57:31 +08:00
a4b1395e92 代码生成:主子表(inner)部分模版 2023-11-13 09:52:48 +08:00
256c560d43 代码生成:增加主子表的示例 2023-11-12 22:33:18 +08:00
e67a6a2fe9 代码生成:1)增加 one 情况下的示例代码;2)修复 vue3 模版现有的 bug 2023-11-12 19:50:20 +08:00
322411304c feat: CRM 客户限制 2023-11-12 14:34:49 +08:00
07e71e2ab0 代码生成:主子表 normal 模式,1 对 1 的 form 生成 2023-11-12 00:15:44 +08:00
7af80ba248 crm联系人表结构 2023-11-11 23:32:42 +08:00
7598ed05cf crm联系人第二版新增字段 2023-11-11 23:31:09 +08:00
0a8257a565 代码生成:主子表 normal 模式,1 对多的 form 生成 2023-11-11 22:06:38 +08:00
5b295d56b6 feat: CRM 客户限制 2023-11-11 20:49:52 +08:00
055eb350aa 代码生成:简化现有 crud 模版的各种 pretty 相关的判断,交给 Java 代码后置统一处理。 2023-11-11 12:56:58 +08:00
ebb8f04fb5 Merge remote-tracking branch 'origin/feature/sub-table' into feature/sub-table 2023-11-09 22:47:43 +08:00
7c09a1fc86 代码生成器:主子表,支持普通、内嵌、ERP 三种模式 2023-11-09 20:49:52 +08:00
2915b46fa5 feat: CRM 客户公海配置 2023-11-09 00:01:43 +08:00
9abff2c7ad feat: CRM 客户公海配置 2023-11-08 23:16:55 +08:00
01b62a9b0c Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/sub-table 2023-11-08 22:29:31 +08:00
2f6456e2b0 代码生成器:主子表,支持多个从字段 50% 2023-11-08 21:00:34 +08:00
5a5a42463b refactor: 会员商品收藏 2023-11-08 17:22:00 +08:00
92be763c6f refactor: 会员商品收藏 2023-11-08 17:18:28 +08:00
670c0962a7 refactor: 会员商品收藏 2023-11-08 17:03:37 +08:00
f4c92089e5 CRM-客户:添加分页数据场景过滤 2023-11-08 16:42:22 +08:00
388e07c834 CRM:完善模块数据放入公海、公海数据领取 2023-11-08 16:05:23 +08:00
533b7295ab Merge remote-tracking branch 'yudao/feature/crm' into feature/crm 2023-11-08 14:46:33 +08:00
c8ed99a5a4 CRM-客户:完善客户详情、分页、公海数据获取 2023-11-08 14:41:51 +08:00
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
5facac7330 refactor: 会员商品收藏 2023-11-08 14:37:18 +08:00
daa7d14b09 reafactor: 会员商品收藏 2023-11-08 14:36:44 +08:00
cba0b08730 doc: 优化文档,patch文件可以放入任意启用的模块 2023-11-08 14:30:46 +08:00
e04c4b11df feat: 达梦flowable 6.8适配 2023-11-08 13:09:49 +08:00
18de22dc39 增加客户的公海领取和 2023-11-08 10:51:10 +08:00
645fe827a3 Merge remote-tracking branch 'origin/feature/crm' into feature/crm 2023-11-08 10:47:42 +08:00
b06432b8f8 增加客户的公海领取和分配 2023-11-08 10:46:59 +08:00
2afc2caf1d 代码生成:主子表的部分实现 2023-11-08 09:42:16 +08:00
71574da2cf feat: CRM 客户公海配置 2023-11-08 00:42:46 +08:00
53afc9d50a codegen:移除多余的 test 类 2023-11-07 23:41:26 +08:00
4ae3d34801 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-11-07 23:11:25 +08:00
15313c2992 转账 - 增加转账定时任务 2023-11-07 23:11:07 +08:00
4235beec3b Merge remote-tracking branch 'origin/feature/crm' into feature/crm 2023-11-07 22:54:54 +08:00
9705ae061c codegen:1)增加 vue3 + crud 模式下的单测;2)增加主子表的 db 字段 2023-11-07 20:43:53 +08:00
668fae9398 CRM-数据权限:完善 code review 提到的问题 2023-11-07 17:52:18 +08:00
a24919e555 style: 客户 review 修改 2023-11-06 21:59:23 +08:00
e8bc284dd0 优化:默认只引入 mysql driver,减少打包大小 2023-11-06 21:41:28 +08:00
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
feba904fd8 多租户:登录界面,根据 host 域名获取对应的租户编号 2023-11-06 19:47:21 +08:00
c162b39e1e 多租户:调整 tenant 表的 domain 字段为 website,避免 dm 数据库的关键字冲突 2023-11-06 19:04:01 +08:00
09d45e6393 转账 - 增加转账通知 2023-11-06 11:33:08 +08:00
24b9688894 doc: 添加达梦数据库适配指引 2023-11-06 00:15:16 +08:00
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
9537669d01 fix: 去除无用行 2023-11-05 20:14:21 +08:00
370d6df473 完善 README.md,补全新的消息队列 2023-11-05 18:28:34 +08:00
023b592299 前端项目,独立仓库 2023-11-05 18:11:34 +08:00
ca184026cf feat: 创建流程实例时,提前指派审批人 2023-11-05 14:21:37 +08:00
b400aaac36 Merge remote-tracking branch 'upstream/master' 2023-11-05 13:26:38 +08:00
989d7c44d0 code review 店铺装修 2023-11-04 22:52:41 +08:00
1eff9822ce 同步最新 master 代码 2023-11-04 20:52:37 +08:00
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
f9e64a9f0a 同步最新 SQL 2023-11-04 20:43:18 +08:00
bf42f8e9ff 【增加CRM:产品以及产品分类】 2023-11-04 19:48:20 +08:00
87bc3f510c 优化:社交登录、用户的管理 2023-11-04 14:37:36 +08:00
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
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
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
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
5bb91f139e Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm 2023-11-03 23:34:37 +08:00
b7900c2035 code review:回款逻辑 2023-11-03 23:02:01 +08:00
0a58790c6b 新增客户锁定和解锁 接口 2023-11-03 22:07:47 +08:00
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
4092f298ed code review:crm 权限模块的实现 2023-11-03 18:53:40 +08:00
bdfb5b8894 营销:装修页面适配 2023-11-03 09:18:04 +08:00
cf114409b0 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-11-03 08:43:40 +08:00
f4d600398c 转账 - 管理后台增加转账单查询 2023-11-03 08:43:21 +08:00
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
c886e7eff2 mq:增加 Rabbitmq 教程内容 2023-11-02 20:18:45 +08:00
456b0c8ddd mq:增加 kafka 配置项 2023-11-02 12:25:50 +08:00
20725e3dfd mq:增加 rabbitmq 配置项 2023-11-02 08:22:05 +08:00
b8d5a665be mq:增加 rocketmq 配置项 2023-11-02 00:07:38 +08:00
e1c34e9124 mq:优化 redis stream 的命名 2023-11-01 22:46:02 +08:00
f8ed0e15f0 mq:增加 kafka、rocketmq、rabbitmq 的实现支持 2023-11-01 19:58:56 +08:00
68c9d563bc CRM-商机:新增获得商机公海分页接口 2023-11-01 16:39:23 +08:00
23cfbfe491 CRM-数据权限:完善数据团队操作-添加、编辑、移除团队成员,退出团队 2023-11-01 16:24:36 +08:00
7a8ffd9ccb CRM-商机:完善获取权限过滤后的分页数据 2023-11-01 11:28:05 +08:00
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
a385a37c4a 完善 CRM-客户 数据权限校验2 2023-10-31 17:42:44 +08:00
c6422dc657 完善 CRM-客户 数据权限校验2 2023-10-31 17:24:19 +08:00
98aae5ed1a feat: 会员商品收藏 2023-10-31 16:51:56 +08:00
32499be98f 营销:完善商城装修
1. 拆分页面设计用的属性修改接口
2. 增加模板的页面保存
3. 增加唯一名称校验
4. 增加页面编辑器,默认选中组件判断
2023-10-31 16:01:23 +08:00
3dade7fd54 新增用户时,给部门增加默认值。
对应Issue,Cloud版本库。
https://gitee.com/zhijiantianya/yudao-cloud/issues/I8C4B5
2023-10-31 07:07:11 +08:00
a0c142f886 新增用户时,给部门增加默认值。
对应Issue,Cloud版本库。
https://gitee.com/zhijiantianya/yudao-cloud/issues/I8C4B5
2023-10-31 06:42:12 +08:00
ab9dc8ad71 新增用户时,给部门增加默认值。
对应Issue,Cloud版本库。
https://gitee.com/zhijiantianya/yudao-cloud/issues/I8C4B5
2023-10-31 06:39:57 +08:00
95e9dc81c9 【修改】回款计划和回款管理统一带上Crm前缀,防止和其他模块冲突。 2023-10-31 01:09:40 +08:00
f1f180ff77 【新增】字典归类
【修改】规范实体命名和字段类型修改
2023-10-31 00:35:41 +08:00
798dd3269f Merge branch 'feature/crm' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm 2023-10-30 21:35:14 +08:00
921c2ab757 【新增】负责人
【修改】规范命名:期数:indexNo-》period
2023-10-30 21:33:28 +08:00
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
4dab376ca9 code review:数据权限的实现 2023-10-30 19:28:33 +08:00
7767a8f837 chore: up mybatis-plus-join 1.4.7 2023-10-30 18:17:17 +08:00
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
7cd5272e7f Merge remote-tracking branch 'yudao/feature/crm' into feature/crm 2023-10-30 16:54:14 +08:00
c2fd817989 完善 CRM-客户 数据权限校验 2023-10-30 16:52:01 +08:00
e6eaa3a24a 完善 CRM-数据权限校验方式 2023-10-30 16:29:24 +08:00
d048daf7d6 mq 重构:默认的 mq 实现,采用 event,减少对 redis、rocketmq 等消息队列的依赖 2023-10-30 12:53:54 +08:00
19c9b6ae93 新增 CRM-数据权限 service 2023-10-30 11:17:43 +08:00
bec8a27a21 新增 CRM-数据权限 注解实现 2023-10-30 00:49:36 +08:00
48b1c19f28 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-29 23:36:26 +08:00
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
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
fc087fa252 Merge branch 'feature/crm' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm 2023-10-29 19:27:16 +08:00
054d80b472 code review:同步 crm 最新代码 2023-10-29 19:23:09 +08:00
53afce0bff code review:crm 回款 2023-10-29 19:22:09 +08:00
973b710992 code review:crm 商机 2023-10-29 19:14:15 +08:00
d1978d318b code review:crm 合同 2023-10-29 19:05:36 +08:00
c637a172ec 营销:装修代码整理 2023-10-29 18:50:55 +08:00
67ac11b56c code review:crm 客户转移 2023-10-29 18:39:54 +08:00
9608cf0539 Merge branch 'feature/crm' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm 2023-10-29 18:03:01 +08:00
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
fe50356ae8 code review:crm 客户模块的实现 2023-10-29 17:38:59 +08:00
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
722e9c8a04 CRM-商机:新增商机转移接口 2023-10-29 02:04:26 +08:00
36a76c5ce6 CRM-联系人:新增联系人转移接口 2023-10-29 01:42:22 +08:00
d9f6fb241a 合同:新增合同转移接口 2023-10-29 01:23:06 +08:00
3af9688383 feat: 调整客户表的字段 2023-10-29 00:33:42 +08:00
c18f5baa4b feat: 调整客户表的字段 2023-10-28 22:47:56 +08:00
f4ea648ac9 fix: 修复PayWalletRechargeCerate参数校验 2023-10-28 19:45:06 +08:00
b0ddd522fb Merge branch 'feature/crm' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm 2023-10-28 00:37:59 +08:00
301f497527 【新增】回款计划-审批枚举类
【新增】回款计划-回款方式枚举类
【新增】回款计划-枚举类校验
【修改】回款计划-错误码调整
【修改】修改回款计划-创建逻辑,添加合同数据的校验
2023-10-28 00:37:47 +08:00
81b6aebf47 code review:商机表的实现 2023-10-27 23:27:08 +08:00
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
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
3a2ccc9d6b 营销:装修模板、装修页面 2023-10-27 14:58:04 +08:00
8552e86d8a 完善三方登录 2023-10-26 17:03:26 +08:00
75115bcc48 1、商机前端页面;
2、商机状态类型和商机状态字段的处理;
2023-10-26 16:22:44 +08:00
5f29399cf4 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-25 23:42:25 +08:00
626bd0bd55 转账 - code review 修改 2023-10-25 23:41:59 +08:00
12ae5bf128 新增社交用户 RUD 2023-10-25 16:57:13 +08:00
738fcef453 新增社交客户端 CRUD 2023-10-25 16:07:17 +08:00
eb4b719b4b 添加社交客户端测试 sql 2023-10-25 15:09:34 +08:00
866eaedfeb feat: 客户表的 crud 2023-10-25 00:32:49 +08:00
04613af0cd feat: 客户表的 crud 2023-10-25 00:25:00 +08:00
126dc610b1 1.8.3 版本发布 2023-10-24 23:14:14 +08:00
3fdc132c17 1.8.3 版本发布 2023-10-24 20:53:37 +08:00
3a9ac56f96 修复 banner 返回字段不对 2023-10-24 20:29:15 +08:00
c11300d33a 解决启动问题 2023-10-24 19:54:49 +08:00
a4aa1fac0b Merge branch 'feature/v2.7.17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-10-24 19:13:09 +08:00
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
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
dd2f5ba2c3 统一 boot 和 cloud 代码 2023-10-24 18:48:02 +08:00
ff3b1e942a Banner: market ==> promotion 2023-10-24 18:00:35 +08:00
d9a5ef3321 统一 boot 和 cloud 代码 2023-10-24 13:58:35 +08:00
df00126fa4 统一 boot 和 cloud 代码 2023-10-24 13:39:21 +08:00
af788e36ce bpm:code review 2023-10-24 08:47:46 +08:00
86598dd177 转账 - 动态收款人字段修改 2023-10-24 08:44:30 +08:00
fc2d30cfaf pay:修复单元测试报错 2023-10-24 08:09:47 +08:00
7bff98b658 统一 boot 和 cloud 代码 2023-10-23 23:48:06 +08:00
9095394fed 钱包 - 创建钱包充值校验修改 2023-10-23 21:47:36 +08:00
633a4c5687 pay:微调 enum 的包名 2023-10-23 19:56:30 +08:00
054569a3d3 promotion:去除已经不使用的代码 2023-10-23 19:24:04 +08:00
3672d0f245 商品模块移除对营销模块的依赖 2023-10-23 17:29:26 +08:00
6723cae781 营销活动:完善 review 提到的问题 2023-10-23 12:02:13 +08:00
a39a0e68a0 fix: vben codegen 2023-10-23 11:49:23 +08:00
98561731f5 chore: update deps 2023-10-23 11:38:55 +08:00
f0d3614c34 fix: reset config 2023-10-23 11:38:41 +08:00
1611dd4b23 docs: up springboot 2.7.17 2023-10-23 11:38:28 +08:00
f3f2efcced feat: update springboot 2.7.17 2023-10-23 11:38:01 +08:00
a778c25075 product:优化代码实现,简化重复判空 2023-10-22 21:44:05 +08:00
918ffc40ae crm联系人前端init 2023-10-22 16:40:57 +08:00
728308cbc0 member:优化部分变量的命名 2023-10-22 16:35:48 +08:00
94c2ad5d1d 修复报错的单元测试 2023-10-22 08:55:27 +08:00
d0caa77f80 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-10-22 08:25:27 +08:00
ec27a1bae5 修复报错的单元测试 2023-10-22 08:24:47 +08:00
55f9e0131c code review:CRM 客户联系人的管理 2023-10-21 22:20:00 +08:00
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
b5560fa0be code review:CRM 线索表的逻辑 2023-10-21 22:05:37 +08:00
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
f942e2c7f2 code review:CRM 回款计划的逻辑 2023-10-21 21:55:21 +08:00
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
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
9697aee898 code review:钱包的逻辑 2023-10-21 21:17:49 +08:00
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
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
6dfef29834 feat: 控制查找子任务次数和清除递归代码 2023-10-21 18:31:30 +08:00
aca65a66b5 feat: 【工作流】--加减签review修改 2023-10-21 18:16:21 +08:00
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
0e754a9924 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-10-21 17:09:24 +08:00
f363c598d8 Banner:完善 review 提到的问题 2023-10-21 17:09:04 +08:00
89e847c8cd 钱包,转账 review 修改 2023-10-21 15:28:07 +08:00
1bb2010dc0 签到记录:完善 review 提到的问题 2023-10-21 01:11:10 +08:00
2f7371b4ea 签到记录:完善 review 提到的问题 2023-10-21 01:01:06 +08:00
e4eeaa1d69 feat: crm 线索表完善 review 提到的问题 2023-10-21 00:53:18 +08:00
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
34a5785768 【新增】回款计划 功能 2023-10-20 23:48:19 +08:00
e4943f0dfa crm联系人 2023-10-20 23:42:22 +08:00
db0fbf0596 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-20 23:22:16 +08:00
183206e2d3 转账 - 支付宝转账修改, 支付宝 Client 支持公钥证书模式 2023-10-20 23:20:47 +08:00
f18a4741a9 营销活动:完善 review 提到的问题 2023-10-20 22:32:37 +08:00
73f4fc8ceb 【新增】回款管理 功能 2023-10-20 22:16:34 +08:00
f462ac7f96 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-10-20 21:04:47 +08:00
04061b028c mall模块-限时折扣功能 2023-10-20 20:54:16 +08:00
283ca908b7 SPU: 完善选择优惠卷 2023-10-20 16:35:49 +08:00
01490c879c 商机sql 2023-10-20 16:14:45 +08:00
bee6f41211 商机 2023-10-20 16:01:54 +08:00
6e11154010 SPU: 添加选择优惠卷 2023-10-20 11:35:16 +08:00
52ebcaaad7 同步 https://gitee.com/zhijiantianya/yudao-cloud/pulls/59/ 2023-10-20 00:31:35 +08:00
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
453f69931f code review:营销文章 2023-10-19 23:41:39 +08:00
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
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
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
439edcd1be code review:crm 线索的 crud 2023-10-19 23:15:18 +08:00
48661f980c !679 feat: CRM 线索表 crud
* feat: CRM 线索表 crud
* feat: CRM 线索表 crud
2023-10-19 14:52:16 +00:00
979b484d7f saas:支持社交应用的多租户配置(wx 小程序) 2023-10-19 21:42:39 +08:00
6f757e5297 saas:支持社交应用的多租户配置(mp) 2023-10-19 12:54:44 +08:00
d256275099 saas:支持社交应用的多租户配置 2023-10-18 23:48:14 +08:00
1b6c8574cd feat: CRM 线索表 crud 2023-10-18 20:02:53 +08:00
a09ee495b6 feat: CRM 线索表 crud 2023-10-18 19:53:15 +08:00
00e18a480f code review:钱包、充值、转账的实现 2023-10-18 18:39:05 +08:00
ffbf9278b8 营销文章:修正文章浏览量类型错误,新增时初始化浏览量 2023-10-18 11:27:14 +08:00
6081ce30d5 营销活动:完善 review 提到的问题 2023-10-18 11:09:20 +08:00
2f69389982 基础设施:数据库文档增加忽略前端FLW_ 2023-10-18 09:46:24 +08:00
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
5842a361e2 同步最新 SQL 脚本 2023-10-17 23:23:17 +08:00
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
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
4b0333f3e9 code review:订单统计 2023-10-17 20:42:22 +08:00
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
0af205ede1 Merge remote-tracking branch 'origin/master' 2023-10-17 18:49:59 +08:00
c629fd2208 code review:工作流逻辑 2023-10-17 18:49:35 +08:00
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
5e65512a92 交易:订单核销 2023-10-17 16:09:37 +08:00
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
164be5732b feat: CRM/合同管理 - SQL 2023-10-16 23:53:27 +08:00
eedb528412 feat: CRM/合同管理 - crud 2023-10-16 23:53:17 +08:00
e26bd20a5b feat:添加测试配置及excel依赖 2023-10-16 23:45:18 +08:00
d842708c23 code review:数据统计 2023-10-16 23:42:54 +08:00
d2112458d2 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-16 22:51:28 +08:00
1ff9bc6a71 code review:文章管理 2023-10-16 22:51:19 +08:00
34210d3534 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-16 22:43:54 +08:00
7d0bcf5d3b wallet - 管理端钱包余额菜单脚本 2023-10-16 22:43:39 +08:00
b89ae001ad 统计:trade_statistics 字段【order_wallet_pay_price】改为【wallet_pay_price】 2023-10-16 22:09:20 +08:00
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
6fbb7d6d6d 终端类型参数改为从Controller传入 2023-10-16 21:01:01 +08:00
b6e63e885d code review:商城统计 2023-10-16 20:01:25 +08:00
4273b8f09c 营销活动:完善 review 提到的问题 2023-10-16 18:53:25 +08:00
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
76f512fc7a 1. APP增加终端Header[terminal]
2. 订单、会员注册记录来源终端
2023-10-16 15:06:59 +08:00
b6d400e04a 统计:会员终端统计接口实现 2023-10-16 14:23:53 +08:00
6f08645f61 会员:增加字段【注册终端】 2023-10-16 14:22:43 +08:00
d3385dcb4f 统计:会员分析数据接口重构 2023-10-16 13:52:00 +08:00
8e35a786ba 统计:处理会员性别统计,存在未知的情况 2023-10-16 13:25:15 +08:00
4f731e9904 统计:处理会员地区统计,存在未知省份的情况 2023-10-16 13:20:11 +08:00
bb82c631e9 统计:Review修改 2023-10-16 13:00:14 +08:00
ea810bb5d6 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-16 10:02:04 +08:00
7345933d6b code review:文章管理 2023-10-16 09:57:57 +08:00
df70402484 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-16 09:55:17 +08:00
f5dac38ca5 商城:增加商城首页 2023-10-16 09:51:20 +08:00
69268b525a Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-16 09:07:13 +08:00
4359c584bb code review:拼团逻辑 2023-10-16 09:07:02 +08:00
3db7b30e66 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-16 08:46:44 +08:00
fcbbbc737d wallet - 管理端, 充值套餐脚本 2023-10-16 08:46:27 +08:00
4f7c7f5619 wallet - 管理端 钱包余额流水查询 2023-10-16 08:36:28 +08:00
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
7e312aae02 初始化 crm 模块 2023-10-15 20:16:46 +08:00
7cb8f8fab9 wallet - 管理端 钱包余额查询 2023-10-15 17:33:55 +08:00
b009f0b058 application-local.yaml 恢复 2023-10-15 16:43:04 +08:00
26d3672668 营销活动: 文章分类管理软件包调整 2023-10-15 16:40:27 +08:00
1fe6c82899 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-10-15 16:17:14 +08:00
55eed1377a 营销活动: 新增文章管理 2023-10-15 16:16:41 +08:00
944e3862a5 修复敏感词检验问题
1.修复排序,优先使用较短的前缀失效问题
2.修复敏感词为单个字符校验失败问题
2023-10-15 14:30:43 +08:00
a47ab32800 营销活动: 新增文章分类管理 2023-10-15 01:29:30 +08:00
6e4a9c3b01 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-14 22:00:52 +08:00
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
3110e427fb 同步 https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/647/files 2023-10-14 17:45:49 +08:00
970e524088 code review:交易统计 2023-10-14 13:15:14 +08:00
1ac2f2b5c2 code review:会员统计 2023-10-14 01:26:06 +08:00
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
82545ddaac 优化 README.md,减少静态资源加载 2023-10-13 18:27:30 +08:00
a4613f0af9 拼团活动: 完善 review 提到的问题 2023-10-13 12:07:28 +08:00
e06f61ef39 wallet - 充值套餐 管理端 2023-10-13 10:46:10 +08:00
8cd7941fc3 wallet - 充值套餐 管理端 2023-10-13 10:43:04 +08:00
04d491b90d 优化 README.md,减少静态资源加载 2023-10-13 09:39:40 +08:00
625504333b 优化 README.md 2023-10-13 09:35:23 +08:00
3105d86b7d 优化 README.md 2023-10-13 09:34:33 +08:00
2e207019b3 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-12 22:21:17 +08:00
571961b4da 充值套餐修改 2023-10-12 22:20:42 +08:00
7a9dbfe41d Merge remote-tracking branch 'origin/master' 2023-10-12 21:59:04 +08:00
b30754a0a4 同步最新 mall 代码 2023-10-12 21:58:56 +08:00
a72869b97e code review:修复部分统计报错 2023-10-12 21:54:06 +08:00
9a876cff3d feat:【工作流】添加vue2版本的退回和委派前端代码 2023-10-11 16:08:39 +08:00
4be709b815 统计:Review修改 2023-10-11 15:26:17 +08:00
66cdf4ca4c Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-11 15:06:09 +08:00
fef808d88c code review:统计代码 2023-10-11 12:32:28 +08:00
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
670a098aa8 code review:拼团记录流程 2023-10-11 11:04:22 +08:00
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
b0179457ce 重构:将订单的分支流程,抽到 TradeOrderHandler 实现类中(补全各种排重逻辑) 2023-10-11 07:49:23 +08:00
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
150a1c9771 重构:将订单的分支流程,抽到 TradeOrderHandler 实现类中(取消的排重逻辑) 2023-10-10 20:38:20 +08:00
2e5cc0537b 重构:将订单的分支流程,抽到 TradeOrderHandler 实现类中 2023-10-10 19:20:12 +08:00
cfbc8b4849 拼团记录(admin-api):增加 page-by-headId 接口获取指定 headId 完整拼团列表分页 2023-10-10 17:21:37 +08:00
bccd270fc7 营销活动:完成砍价、秒杀库存回滚。完成拼团过期和虚拟成团处理 2023-10-10 15:30:58 +08:00
599d13b1ac feat: 随便测试 2023-10-10 11:36:24 +08:00
fdbebc406c 秒杀活动:纠正秒杀库存和秒杀总库存扣减错误的问题 2023-10-10 10:57:17 +08:00
42fcbe0501 砍价活动:完成订单取消时恢复活动库存 2023-10-10 10:47:25 +08:00
bc781d9473 fix: 【工作流】按 review 修改代码 2023-10-10 10:46:16 +08:00
245f14b8f1 秒杀活动:完成订单取消时恢复活动库存和商品库存 2023-10-10 10:25:57 +08:00
2c10dde195 统计:修复错误 2023-10-09 23:53:50 +08:00
91d0bbf8b1 合并代码 2023-10-09 23:40:11 +08:00
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
df16278a03 统计:会员统计 2023-10-09 23:27:10 +08:00
6388950ab2 code review:【工作流】—— 加签的实现 2023-10-09 20:57:23 +08:00
831983e314 营销活动:重构 getCombinationActivityBySpuIdsAndStatus 方法 2023-10-09 18:17:20 +08:00
45a2cd70f0 Merge branch 'feature/bpm-addSignAndSubSign' of https://gitee.com/ykhcool/ruoyi-vue-pro 2023-10-09 17:45:46 +08:00
5d6faa8023 fix: 【工作流】-加减签父任务处理逻辑完善 2023-10-09 16:40:31 +08:00
e845872adc Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-09 16:26:42 +08:00
57407a39d2 营销活动:修正 selectListBySpuIdsAndStatus 查询 sql,添加接口测试 2023-10-09 16:25:06 +08:00
c869d99a0f 修复:启动报错-循环依赖 2023-10-09 16:25:04 +08:00
cd887511d8 营销活动:修正 selectListBySpuIdsAndStatus 查询 sql,添加接口测试 2023-10-09 16:18:00 +08:00
e09f07475a 修复:启动保存-循环依赖 2023-10-09 16:11:02 +08:00
53e67c0437 拼团活动:完善 review 提到的问题 2023-10-09 11:53:02 +08:00
10af05066c feat: 【工作流】--任务列表只返回顶级任务,拼装成父子关系并返回 2023-10-08 22:35:02 +08:00
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
2c0f1121ca 拼团活动:完善 review 提到的问题 2023-10-08 17:46:48 +08:00
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
c71bdd158a 拼团活动:完善 review 提到的问题 2023-10-08 17:19:39 +08:00
c8a9d68933 拼团活动:完善 review 提到的问题 2023-10-08 12:08:17 +08:00
8a11ca8126 code review:拼团记录流程 2023-10-08 09:59:53 +08:00
01e6140d67 code review:拼团记录流程 2023-10-08 09:53:09 +08:00
99649bfdb8 code review:拼团记录流程 2023-10-08 07:43:25 +08:00
6a38da4ad9 promotion:合并最新代码 2023-10-07 23:00:13 +08:00
c917f01d83 promotion:code review 拼团相关的部分代码 2023-10-07 22:47:45 +08:00
6636ee7420 拼团记录(APP):新增一个取消拼团的接口 2023-10-07 18:46:19 +08:00
1a0fda23b1 拼团记录:调整团长的 headId 为 CombinationRecordDO#HEAD_ID_GROUP 2023-10-07 17:11:25 +08:00
89b240c1f9 订单:介入 TradeOrderHandler#cancelOrder 2023-10-07 16:58:40 +08:00
c485c6e04d 订单:重构拼团下单流程更改为订单支付后再创建拼团记录 2023-10-07 16:30:28 +08:00
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
f40bd23f6a 拼团记录:完善拼团记录创建前的条件校验规则 2023-10-07 14:30:25 +08:00
ec2c3e508a promotion:优化拼团记录的详情代码 2023-10-07 13:58:12 +08:00
c7b5df930e promotion:修复拼团下单时,相关字段记录不正确的情况。 2023-10-07 07:09:15 +08:00
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
6099786c1b 拼团记录:完善拼团记录后台管理接口 2023-10-06 21:26:53 +08:00
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
34bf360da6 trade:调整拼团活动列表接口 2023-10-06 21:04:37 +08:00
ce77d510bb 拼团记录:添加拼团记录后台管理接口 2023-10-06 20:27:22 +08:00
383439f902 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-06 14:17:14 +08:00
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
8e7b295d24 trade:砍价记录的详情 100% 2023-10-06 10:17:41 +08:00
5f57cc6247 trade:砍价记录的详情 50% 2023-10-06 02:06:38 +08:00
3d51c67f1a 拼团活动:app-api 获得拼团活动列表增加 Spring Cache 缓存 2023-10-06 01:43:56 +08:00
92da91a7dc 订单:修改订单收货地址添加日志记录 2023-10-06 01:32:57 +08:00
9d7285c4ed 营销活动:实现 list-by-spu-ids 接口 2023-10-06 01:19:32 +08:00
07493bc7e5 营销活动:实现 list-by-spu-id 接口 2023-10-06 01:04:36 +08:00
3f6f7f404b 拼团活动:更改创建拼团记录的校验方式 2023-10-06 00:24:40 +08:00
474eebd8c9 拼团活动:更改创建拼团记录的校验方式 2023-10-06 00:20:00 +08:00
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
038e23a6b3 拼团活动:完善拼团 app-api 相关接口 2023-10-06 00:03:03 +08:00
aec8e853e4 trade:完善砍价的下单流程 2023-10-05 23:24:44 +08:00
0b2943ba8b 拼团活动:完善拼团下单金额结算 2023-10-05 21:28:38 +08:00
07d6ab5842 拼团活动:完善 TradeCombinationHandler 2023-10-05 19:14:19 +08:00
1bda3c8b53 promotion:完善砍价 API ~ 提交下,准备出门吃饭!!!! 2023-10-05 17:22:17 +08:00
6a04d6c458 promotion:新增助力记录列表 2023-10-05 12:43:14 +08:00
269da3d56d promotion:新增砍价记录列表 2023-10-05 12:07:05 +08:00
cd45be1fe2 promotion:优化砍价活动的分页结果 2023-10-05 02:18:14 +08:00
16e436a0f5 promotion:增加助力砍价的接口 2023-10-05 00:05:20 +08:00
cc087e4eca promotion:增加创建砍价的接口 2023-10-04 21:55:05 +08:00
a37427c355 stat:增加用户统计的设计 2023-10-04 18:53:49 +08:00
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
6f39b2c030 trade:1、重构 order handler 的参数;2、增加砍价商品的价格计算 2023-10-04 17:30:07 +08:00
8dbabb9efc trade:1、重构 order handler 的参数;2、增加砍价商品的价格计算 2023-10-04 11:29:38 +08:00
7a15b340b0 交易:核销 2023-10-04 10:51:36 +08:00
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
8e905f706d 交易:核销 2023-10-04 09:11:51 +08:00
dc1347184f code review:拼团、砍价活动 2023-10-04 00:47:17 +08:00
20f5834d9a trade:价格计算时,接入优惠劵逻辑 2023-10-04 00:30:03 +08:00
a1e9bedf34 promotion:完善秒杀的 uniapp 接口 2023-10-03 21:45:51 +08:00
5819b08740 交易:Review修改 2023-10-03 21:25:23 +08:00
3c5917a6cd Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-03 21:21:48 +08:00
a9e822762d 统计:交易统计定时任务 2023-10-03 21:21:11 +08:00
ac55a9657c promotion:完善秒杀模块 2023-10-03 18:41:41 +08:00
c66b4e7bc0 code review:日志清理 Job 2023-10-03 11:02:33 +08:00
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
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
b7359706db Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-02 23:52:25 +08:00
d0f0bc5888 分销:调整推广人列表查询方式 2023-10-02 23:51:49 +08:00
7fdd36d979 Review代码修改 2023-10-02 21:27:46 +08:00
1f910992d6 trade:新增是否自提的配置项 2023-10-02 21:18:52 +08:00
2f0483ce9f [新增][定时任务]重新申请 ApiAccessLog、ApiErrorLog、JobLog 3个日志的定时清理 2023-10-02 19:18:36 +08:00
fdb10aeced trade:优化运费模版的实现 2023-10-02 18:30:14 +08:00
6f4c04d944 trade:完善退款详情 2023-10-02 15:44:41 +08:00
0c1f5c9582 trade:完善订单详情 2023-10-02 10:34:52 +08:00
f8b4a08fae code review:访问日志、错误日志的清理 Job 实现 2023-10-02 00:06:28 +08:00
d4417d2474 code review:积分、优惠劵、佣金等逻辑 2023-10-01 23:31:07 +08:00
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
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
abfebebdd5 交易:增加 积分抵扣计算器 单元测试 2023-10-01 17:12:33 +08:00
11921fab5a [新增][定时任务]ApiAccessLog、ApiErrorLog、JobLog 3个日志的定时清理 2023-10-01 16:53:17 +08:00
afd306a71d 交易:增加 赠送积分计算器 单元测试 2023-10-01 16:23:41 +08:00
2168145c3e 会员:会员配置的积分相关字段加上point前缀 2023-10-01 10:41:21 +08:00
ab35fcbe9b 会员:积分配置改为会员配置 2023-10-01 10:25:18 +08:00
4f03635fcd 签到:签到后增加用户积分、经验 2023-10-01 09:53:54 +08:00
a04a3a27a9 Review代码修改 2023-09-30 23:41:11 +08:00
d3f03540f8 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-09-30 23:35:19 +08:00
82210a9583 订单:完善拼团活动 2023-09-30 23:34:45 +08:00
7d68bdc7c8 分销:重构下级分销统计 2023-09-30 23:30:06 +08:00
cafa938ff4 common:LocalDateTimeUtils 增加方法:月份开始时间、月份结束时间 2023-09-30 22:21:47 +08:00
e7876b1520 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-30 22:09:49 +08:00
3875c80471 wallet:钱包支付,接入 user 付款界面 2023-09-30 22:08:15 +08:00
d2c5eaf916 优惠券:重构是否领取检查方式 2023-09-30 22:05:11 +08:00
aaa01de21d 分销:修改佣金排名查询算法 2023-09-30 19:55:18 +08:00
d0d21b2787 优惠券:新增/修改时,校验对应的商品、分类是否存在 2023-09-30 19:39:02 +08:00
16cea61435 wallet:增加充值套餐 2023-09-30 18:54:10 +08:00
42a899c5d3 交易:订单增加字段 推广人编号 2023-09-30 17:49:38 +08:00
fc432ba073 优惠券:新人券使用 MQ 发放 2023-09-30 17:29:32 +08:00
9d71dff2a4 操作日志搜索参数名修改
Signed-off-by: ligiteezhanghao <3550906264@qq.com>
2023-09-30 09:10:02 +00:00
497ea2eee8 会员详情,修改会员积分 2023-09-30 15:50:13 +08:00
d7ae944438 feat: 【工作流】--减签逻辑优化 2023-09-30 15:35:14 +08:00
cd678e997a feat: 【工作流】--减签和加签共用处理父任务逻辑 2023-09-30 14:56:16 +08:00
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
3489144757 新任务:日志的清理 job 2023-09-30 12:31:18 +08:00
367b45e3bd code review:数据统计 2023-09-30 12:30:01 +08:00
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
0b35d4a7e3 订单:完善拼团活动部分 TODO 2023-09-30 11:27:24 +08:00
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
6b7f071988 Review代码修改 2023-09-29 22:47:04 +08:00
26628913cb 错误码分段 2023-09-29 21:34:38 +08:00
929ff4286a Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-29 21:08:49 +08:00
171161e6c7 统计:交易统计 2023-09-29 21:08:15 +08:00
96b1662e4a Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-29 20:52:22 +08:00
9ee0aebd3f promotion:增加 coupon 的 code review 2023-09-29 20:52:11 +08:00
80d532b0f1 feat: 【工作流】--减签 2023-09-29 15:51:00 +08:00
7d497ce09b feat: 【工作流】--加签 2023-09-29 14:57:28 +08:00
71ec06393a merge 冲突修改 2023-09-29 14:56:32 +08:00
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
ce6f7ab1b1 Pay: 新增转账示例单 2023-09-29 14:01:58 +08:00
aa2f651124 Pay: 转账单实现 2023-09-29 13:50:06 +08:00
666ba351a2 trade:退款理由的维护 2023-09-29 13:35:40 +08:00
3c643f814c trade:补全售后日志的记录 2023-09-29 11:46:43 +08:00
d402bdb7e0 trade:优化售后取消订单的实现代码 2023-09-29 10:08:20 +08:00
62f821abf2 wangfangyuan,fix:修改springdoc版本,解决Swagger文档都是form提交。 2023-09-28 23:15:00 +08:00
f9bf41d773 code review:分佣剩余部分的 review 2023-09-28 22:22:38 +08:00
b1ce971a2f code review:解决分佣的 npe 问题 2023-09-28 16:39:07 +08:00
9cd36abf10 同步 master 分支代码 2023-09-28 15:28:40 +08:00
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
eeb8873b1d trade:微调交易配置的注释 2023-09-28 15:10:56 +08:00
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
b2c608e7a5 交易:发货订单日志 2023-09-27 21:27:55 +08:00
565a8e0e6b Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-27 21:24:37 +08:00
b9018baa03 trade:简化价格调整的逻辑 2023-09-27 19:14:48 +08:00
c5f2d07c87 商城:增加 stat 统计设计 2023-09-27 19:14:32 +08:00
26dfbfb2ac trade:发货逻辑,增加订单日志 2023-09-27 09:55:04 +08:00
be426235dd Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-27 01:20:40 +08:00
bc07e1dbf4 售后:重构售后更新订单的逻辑 2023-09-27 01:19:49 +08:00
74ef98f8fc 售后:售后成功后,回滚 SKU 库存 2023-09-27 00:24:22 +08:00
2766dd672a 优惠券:过期定时任务 2023-09-27 00:15:12 +08:00
11ffa45b89 积分:Review代码修改 2023-09-26 23:54:43 +08:00
53bd1b9ec1 trade:订单评论超时时,自动评论 2023-09-26 23:50:54 +08:00
cd2d0b7089 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-26 23:23:12 +08:00
77f7763560 优惠券:完善优惠券领取接口 2023-09-26 23:21:01 +08:00
cf41347cb3 trade:支付订单成功时,记录订单日志 2023-09-26 22:48:21 +08:00
b1ac3a0b8b 优惠券:完善优惠券匹配接口 2023-09-26 22:46:06 +08:00
f9aec7d8fd 优惠券:完善我的优惠券接口 2023-09-26 21:08:11 +08:00
debf568750 code review:增加取消售后的优化建议 2023-09-26 20:57:10 +08:00
0a3a6825d5 优惠券:完善APP优惠券查询接口 2023-09-26 20:44:22 +08:00
ad535e674f trade:积分相关的价格计算 2023-09-26 20:11:54 +08:00
a8c78f3097 trade:增加自动收货的 job 2023-09-26 19:27:37 +08:00
a431bccc02 分销:Review代码修改 2023-09-26 15:11:48 +08:00
9e99b04375 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-26 00:04:18 +08:00
826d792ff2 trade:增加自动取消的 job 2023-09-26 00:04:11 +08:00
5a5f92d2e9 feat: 测试站内信接口增加Member 用户类型的支持。 2023-09-25 15:54:31 +08:00
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
42c47d9b44 秒回活动:订单金额计算初步设计 2023-09-25 14:56:56 +08:00
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
3972fbd1d9 fix: 根据review结果修改 2023-09-25 11:30:44 +08:00
437185cb1d Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-25 10:48:32 +08:00
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
e384b810bf code review:分销逻辑 2023-09-25 09:39:39 +08:00
1553900193 fix: 解决冲突 2023-09-25 09:22:11 +08:00
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
16af31d980 分销:@Select sql语句增加逻辑删除字段过滤 2023-09-25 08:36:55 +08:00
0f0e6eb8ba Pay Client 新增转账接口 2023-09-25 08:34:58 +08:00
3dca66eefa 分销:提现统计 2023-09-25 08:05:29 +08:00
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
0669b9da34 Merge remote-tracking branch 'origin/master' 2023-09-24 23:24:32 +08:00
9b7c757942 1.8.2 版本发布 2023-09-24 23:24:24 +08:00
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
83a133b344 bpm:优化 BpmnModelUtils 2023-09-24 23:06:04 +08:00
967e578d54 分销:重命名提现类型字段 2023-09-24 22:32:13 +08:00
9856e17974 分销:根据商品,计算推广员可以得到的佣金 2023-09-24 22:27:24 +08:00
96d4e7bc56 fix: 需要填充错误信息中的参数 2023-09-24 22:23:31 +08:00
ffdaf3a859 bpm:简化流程驳回的逻辑实现,提升可读性 2023-09-24 22:19:36 +08:00
e9fd377772 分销:Review代码修改 2023-09-24 20:28:44 +08:00
63fee66657 chore: update okio fix minio bug 2023-09-24 18:04:48 +08:00
cfec4b12ca docs: update springboot 2.7.16 2023-09-24 17:46:48 +08:00
13f135abe9 chore: update deps 2023-09-24 17:44:35 +08:00
a98a7c7645 chore: lombok 1.18.30 2023-09-24 17:38:18 +08:00
22041b6f8d chore: hutool 5.8.22 2023-09-24 17:36:42 +08:00
8187398bdf chore: springboot 2.7.16 2023-09-24 17:36:09 +08:00
0b649fd3e1 bpm:简化获得可回退节点的实现 2023-09-24 16:08:50 +08:00
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
921f99d39d fix: 方法,变量名词,注释规范 2023-09-24 13:13:55 +08:00
421bb7d154 code review:分销逻辑 2023-09-24 11:56:00 +08:00
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
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
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
2a9aa357cb fix: 对具有软删除的表去除UNIQUE INDEX 2023-09-24 08:29:56 +08:00
b4587fd79e product:订单表,增加 vip 优惠字段 2023-09-24 00:45:32 +08:00
53e789dfdc trade:订单表,增加 vip 优惠字段 2023-09-23 23:58:22 +08:00
bf0e7d2c77 System:字典数据列表过滤已关闭的数据 2023-09-23 23:42:20 +08:00
aa5525d1f5 code review:营销活动 & 交易订单的对接 2023-09-23 22:21:23 +08:00
1da14a3f53 trade:删除订单的实现 2023-09-23 20:23:28 +08:00
a9485ad6bf trade:取消订单、确认收货,增加订单日志 2023-09-23 18:13:35 +08:00
e9c9ac0cab trade:确认收货时,增加订单日志 2023-09-23 17:47:39 +08:00
b13f71424b feat: 工作流-》流程实例的任务节点回退 2023-09-23 14:47:34 +08:00
052328c5fa 积分:完善积分获得、退还、使用 相关逻辑 2023-09-23 14:11:16 +08:00
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
9451342aae trade:营销商品(拼团、砍价)不能使用优惠劵 2023-09-22 23:54:18 +08:00
dc46dff62c Merge remote-tracking branch 'origin/feature/mall_product' into brokerate 2023-09-22 23:15:31 +08:00
f30fa39067 修改Review代码 2023-09-22 23:15:10 +08:00
bbd18afbcc 分佣: 简化推广用户关系树查询方式 2023-09-22 23:13:39 +08:00
6e6486ccae Trade: 完善配置 2023-09-22 22:51:46 +08:00
ad0513c87c 分佣: 推广人列表 2023-09-22 22:12:15 +08:00
bf40767fa1 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-22 21:56:17 +08:00
7c4fbc63dc trade:物流费用计算,增加金额 divide 分拆逻辑 2023-09-22 21:56:09 +08:00
ee15b802b2 分佣: 推广人排行 2023-09-22 21:12:09 +08:00
972b01c001 分佣: 佣金排行 2023-09-22 20:55:05 +08:00
92f6c8f4d6 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-22 19:05:20 +08:00
910ffa7a5a 钱包充值退款 2023-09-22 19:04:59 +08:00
7a8a440eb6 分佣: 佣金记录 2023-09-22 18:49:26 +08:00
eddc897cd8 分佣: 提现记录 2023-09-22 18:48:16 +08:00
637ae8ce1d 分佣: 提现记录 2023-09-22 18:35:43 +08:00
c146c98b72 分佣: 提现 2023-09-22 18:06:11 +08:00
f72a087007 分佣: 我的推广统计接口 2023-09-22 15:42:59 +08:00
594e4d5fee system: uniapp增加字典数据查询接口 2023-09-22 15:11:06 +08:00
a7de955926 trade: 分销业务 - 提现申请 2023-09-22 00:27:45 +08:00
5ed99a9105 trade: 分销业务 - 整理包名 2023-09-22 00:26:32 +08:00
24111c1548 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-21 22:02:30 +08:00
5949727c8d trade:全局配送价格配置 2023-09-21 22:02:22 +08:00
c880dbfa60 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-21 17:32:43 +08:00
dbd7ab5f23 code review 修改 2023-09-21 17:31:58 +08:00
b94f89b4f5 refresh after task add 2023-09-21 15:08:35 +08:00
8060aeb5e7 秒杀: app 端返回增加秒杀活动状态 2023-09-21 09:07:37 +08:00
35569c5ec8 trade:下单时,如果是门店自提,增加核销码的生成 2023-09-20 23:21:00 +08:00
1b477aaa0d trade:优化下单逻辑的实现 2023-09-20 20:21:41 +08:00
583a0a2dd5 砍价+拼团: 修复 selectList limit 条件执行报错问题 2023-09-20 16:28:41 +08:00
6ef94ade6a 完善订单和活动 review 提到的问题 2023-09-20 16:06:29 +08:00
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
1d2a6ad065 拼团活动: 完善 app 端获取活动分页、列表、详情接口 2023-09-20 10:09:15 +08:00
c766f7daa5 code review:砍价、秒杀的逻辑 2023-09-20 01:07:41 +08:00
1b154699c6 code review:处理错误的 mysql 连接 2023-09-20 00:10:18 +08:00
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
962f2bbf69 code review:提现逻辑 2023-09-19 23:58:16 +08:00
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
e22c577f7a trade: 分销业务 - 佣金提现后台管理 2023-09-19 22:20:32 +08:00
8cfb738db3 code review:分销逻辑 2023-09-19 22:16:25 +08:00
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
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
408df683d8 秒杀活动: 完善 app 端获取活动分页、列表、详情接口 2023-09-19 18:57:28 +08:00
f998d43e68 infra: 修正 查询实体列表方法,传入的ID集合为空时,会导致异常的问题 2023-09-19 17:14:42 +08:00
a3e161a9a3 trade: 分销业务review代码修改 2023-09-19 16:50:43 +08:00
6c80ef38f5 docs: spring boot3 2023-09-19 16:37:54 +08:00
a3e8b42be6 trade: 分销业务review代码修改 2023-09-19 16:37:51 +08:00
af6016bba5 砍价活动: 完善 app 端获取活动分页、列表、详情接口 2023-09-19 16:35:21 +08:00
75874035a4 Merge remote-tracking branch 'origin/feature/mall_product' into brokerate 2023-09-19 15:31:14 +08:00
be1ecf96d4 code review:会员签到逻辑 2023-09-18 22:18:42 +08:00
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
080c32b9f3 code review:钱包充值 2023-09-18 13:07:54 +08:00
b81ebe6f19 修复 common 下的 test 引入不正确的问题,减少包依赖大小 2023-09-17 01:37:10 +08:00
436fef7efa 1. 移除 netty-all,减少依赖
2. 修复 xss 无法禁用的问题
2023-09-17 00:37:11 +08:00
222daa5366 pay 缓存,使用 guava 替代 job 扫描,目的:提升启动速度,加快缓存失效 2023-09-16 23:22:58 +08:00
a51579a77d fileConfig 缓存,使用 guava 替代 job 扫描,目的:提升启动速度,加快缓存失效 2023-09-16 21:35:05 +08:00
48fd4972da sms 缓存,使用 guava 替代 job 扫描,目的:提升启动速度,加快缓存失效 2023-09-16 20:58:34 +08:00
ab800aa891 1. 简化 JsonUtils 初始化方式,去掉 BeanPostProcessor
2. 减少日志打印

目的:优化启动速度
2023-09-16 18:05:50 +08:00
50371b3676 1. 禁用 member 模块
2. 减少 mybatis 日志打印
3. 降低 local 环境的初始连接

目的:提升项目的启动速度
2023-09-16 17:04:59 +08:00
62c4838ba7 默认禁用 spring boot admin 的启动 2023-09-16 15:30:02 +08:00
ebb3a04251 优化多租户 Job 的实现,采用 AOP 替代 BeanPostProcessor,提升启动速度 2023-09-16 14:06:15 +08:00
6a371f06b0 默认禁用 spring data redis repositories,一方面没用到,一方面提高启动速度 2023-09-16 13:29:47 +08:00
808ff6abb9 默认禁用 lock4j 依赖,保证启动速度 2023-09-16 13:14:40 +08:00
f0f5b52150 默认禁用 quartz 依赖,保证启动速度 2023-09-16 12:50:36 +08:00
08d39d4593 默认禁用 resilience4j 依赖,保证启动速度 2023-09-16 12:01:49 +08:00
a52e490c86 Merge remote-tracking branch 'origin/feature/mall_product' into brokerate 2023-09-16 08:41:06 +08:00
d4a891e6c4 新增两个APP端接口
1.获取用户个人签到信息
2.用户签到接接口
2023-09-15 23:21:11 +08:00
0907ca2081 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-15 22:09:13 +08:00
bbc16bb937 钱包充值 Mapper 类 2023-09-15 16:14:04 +08:00
73e4976ae4 Merge remote-tracking branch 'origin/feature/mall_product' into brokerate 2023-09-15 16:11:01 +08:00
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
9d262e8e7f 新增两个APP端接口
1.获取用户个人签到信息
2.用户签到接接口
2023-09-15 15:20:39 +08:00
2c821d2bbf Merge remote-tracking branch 'origin/feature/mall_product' into brokerate 2023-09-15 14:13:48 +08:00
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
0e1b8126dd 新增钱包充值。启动报错修复 2023-09-14 16:55:31 +08:00
cfaffd3c88 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-13 23:26:38 +08:00
1b9a3f9f63 code review:调整操作日志的封装 2023-09-13 23:25:52 +08:00
bcb3b19418 钱包充值 表结构设计 2023-09-13 17:28:42 +08:00
a10d77cdfe mall+order: 完善部分 TODO 提到的问题 2023-09-13 12:04:13 +08:00
437131cc7a Merge remote-tracking branch 'origin/master' into feature/auth
# Conflicts:
#	yudao-dependencies/pom.xml
2023-09-13 12:00:10 +08:00
9358639c41 code review:订单部分逻辑 2023-09-12 23:01:12 +08:00
e8bdd8349c code review:订单部分逻辑 2023-09-12 13:54:52 +08:00
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
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
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
c67ecbf61d Merge remote-tracking branch 'origin/feature/mall_product' into brokerate 2023-09-11 20:04:23 +08:00
950ec10cff Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-09-11 17:51:17 +08:00
254d7828aa mall+order: 订单活动特殊逻辑的抽离 2023-09-11 17:48:01 +08:00
1f327ef8ca 更新商城的演示地址 2023-09-11 16:55:56 +08:00
f2ee213caa 更新商城的演示地址 2023-09-11 16:42:38 +08:00
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
4674caa01a fix: vben codegen 2023-09-11 13:35:00 +08:00
092e48b9d5 perf: vben codegen 2023-09-11 12:41:48 +08:00
5e9e41c045 fix: required 过期 2023-09-11 12:30:33 +08:00
1184b46c40 chore: up justauth 1.0.4 2023-09-11 12:21:46 +08:00
97a91e5454 chore: up hutool 5.8.21 2023-09-11 11:29:14 +08:00
c5b78a2af5 chore: up druid 1.2.19 2023-09-11 11:25:12 +08:00
e1b92c3d64 chore: up springboot 2.7.15 2023-09-11 11:22:20 +08:00
314dee430e bugfix:微信公众号登录报 access token 的问题 2023-09-11 11:06:42 +08:00
77daa0085e trade: 分销业务review代码修改 2023-09-11 00:54:12 +08:00
7fb455096c 商城活动: 完善活动商品并发库存扣减逻辑 2023-09-11 00:13:45 +08:00
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
4eedf6ad36 Merge remote-tracking branch 'owen/brokerate' into brokerate 2023-09-10 23:36:46 +08:00
290d1671a2 trade: 分销业务后台功能:推广订单列表 2023-09-10 23:36:38 +08:00
0c9485a6bf infra: 修正 查询实体列表方法,传入的ID集合为空时,会导致异常的问题 2023-09-10 23:36:23 +08:00
dffdd471d5 member: 修正 查询用户列表方法,传入的ID集合为空时,会导致异常的问题 2023-09-10 23:32:40 +08:00
6c193f723f trade: 分销业务后台功能:推广订单列表 2023-09-10 23:30:43 +08:00
3976011af0 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-09-10 22:54:01 +08:00
499a054eb9 trade: 分销业务后台功能:推广用户列表 2023-09-10 22:32:39 +08:00
40e1a879e3 登录:社交登录时,额外返回 openid 2023-09-10 18:01:53 +08:00
57f0ea04f7 mall-order: 完善活动商品库存扣减逻辑(并发更新库存下一提交实现) 2023-09-10 11:06:39 +08:00
c023209aa5 订单管理:完善订单调价分摊逻辑 2023-09-10 00:50:13 +08:00
51dab96889 支付订单错误码枚举类变量添加 PAY_ 前缀和交易订单区分开避免冲突 2023-09-10 00:48:30 +08:00
50354462fe spu:分佣属性和分佣保持一致 2023-09-09 23:18:09 +08:00
95d8be0455 订单管理:完善订单聚合搜索 2023-09-09 23:04:13 +08:00
2bbd86e25d 优化 README 说明 2023-09-09 22:53:26 +08:00
4265441e1d 分销:增加商品的分佣金额计算 api mock 2023-09-09 22:28:01 +08:00
a47d744f64 分销:绑定分销的 url 调整 2023-09-09 21:05:44 +08:00
797680895b trade: 分销业务后台功能:佣金格式化 2023-09-09 20:00:57 +08:00
cd51d57f12 分销:调整 app 的 price 到 brokeragePrice 2023-09-09 19:42:53 +08:00
426594ae00 分销:调整 app 的 price 到 brokeragePrice 2023-09-09 19:34:50 +08:00
643602d038 trade: 分销业务后台功能:修改上级推广人 2023-09-09 19:20:12 +08:00
5858f57fe9 钱包 review 修改 2023-09-09 18:32:53 +08:00
5a940b1d2c 修复 knife4j get 参数无法正确展示的问题 2023-09-09 15:04:22 +08:00
a5e33f6d3a 引入 mybatis plus join 作为基类 2023-09-09 14:56:30 +08:00
ca55e61dd2 trade: 分销业务后台功能:清除推广员、修改推广资格 2023-09-09 14:38:47 +08:00
65d7b30011 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-09-09 10:35:14 +08:00
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
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
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
4e9be7a181 trade: 分销业务后台功能:修改推广资格 2023-09-09 01:58:46 +08:00
259734964d trade: 分销业务后台功能:清除推广员、修改推广员 2023-09-09 01:54:48 +08:00
f97c7a0f6e trade: 分销业务绑定推广员 2023-09-09 01:46:42 +08:00
d7488e70b0 使用下划线分割ErrorCodeConstants的ErrorCode 2023-09-09 01:30:51 +08:00
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
6ef36d5ca6 trade: 增加分销 API 2023-09-08 23:33:02 +08:00
1ead368595 trade: 优化分销用户佣金字段名称 2023-09-08 23:10:04 +08:00
4b43304c76 trade: 优化分销用户绑定用户编号、绑定时间字段名称 2023-09-08 22:51:05 +08:00
3e09da0128 code review:支付钱包 2023-09-08 22:47:00 +08:00
f36a6c5d6c trade: 优化修改推广员接口字段名称 2023-09-08 22:40:49 +08:00
b85d660a5c trade: 分销业务完善校验 2023-09-08 22:33:44 +08:00
2fd201c7fa 🌈 style: 描述错误, 社交类型的枚举为 SocialTypeEnum 而不是 SysUserSocialTypeEnum 2023-09-08 16:33:49 +08:00
0a0c3c0ede trade: 分销业务相关类型移除Trade前缀 2023-09-08 12:56:34 +08:00
ddcebb1986 common: MoneyUtils 移到 common 模块 2023-09-08 12:46:43 +08:00
1cc2dfc963 trade: 分销Review代码修改 2023-09-08 12:29:38 +08:00
166b1b31c0 trade: 分销用户管理 2023-09-08 11:03:57 +08:00
5d6bb84d25 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-09-08 00:59:53 +08:00
0e8755972c 营销活动+订单:完善大部分 TODO 提到的问题 2023-09-08 00:35:54 +08:00
5808f77ade code review:订单分佣 2023-09-08 00:29:25 +08:00
a4d6d5e6c3 fix db creation error 2023-09-07 16:18:24 +08:00
b3d3efc8c4 升级 springdoc、knife4j 版本 2023-09-07 12:59:36 +08:00
b8a4d8cab2 分销:避免报错 2023-09-07 12:29:50 +08:00
1bf182c341 补充
Signed-off-by: GamePlayer-Joker <13317488+gameplayer-joker@user.noreply.gitee.com>
2023-09-07 02:18:41 +00:00
76a8fb8a0a AppCombinationRecordRespVO中的expireTime过期时间是LocalDateTime, 现在用的是new Date() 2023-09-07 01:41:46 +00:00
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
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
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
fcca69d243 修复 revision 在 Maven install、deploy 时,不替换为版本号的问题 2023-09-06 20:41:52 +08:00
beb385aab4 修复 revision 在 Maven install、deploy 时,不替换为版本号的问题 2023-09-06 20:04:29 +08:00
2591ab5d36 订单中心+营销活动:完善部分 TODO 提到的问题 2023-09-06 11:29:51 +08:00
9074312fe3 后台接入钱包支付 2023-09-06 10:34:24 +08:00
4a0fa2a3a4 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-06 08:50:33 +08:00
3f51be6a2d 钱包。删除不需要的类 2023-09-06 08:50:22 +08:00
fa53a3b15e trade: MemberBrokerageRecord 重命名为 TradeBrokerageRecord 2023-09-06 00:35:40 +08:00
9336a0a102 trade: 分销业务从 member 模块 转移到 trade模块 2023-09-06 00:16:47 +08:00
e4b153a866 分佣:增加获得分销排行分页 API mock 2023-09-05 23:49:35 +08:00
a68691f2d9 trade: 增加分销用户表 2023-09-05 23:45:53 +08:00
6474502738 trade: 增加交易中心配置表 2023-09-05 22:31:36 +08:00
0329f13fbf 分佣:增加获得分销排行分页 API mock 2023-09-05 21:32:34 +08:00
9eb7837b67 member: 佣金失效 2023-09-05 19:43:07 +08:00
a708521b9d member: 佣金解冻 2023-09-05 19:05:01 +08:00
2f6092005b member: 佣金解冻 2023-09-05 18:59:24 +08:00
f99e2aec2d Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-05 12:44:43 +08:00
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
090058a2ba member: 佣金不冻结时,直接就是结算状态 2023-09-05 09:27:12 +08:00
c7ef8519c8 member: 分销增加佣金 2023-09-05 08:56:39 +08:00
eae8218f0d 分佣:增加获得分销排行分页 API mock 2023-09-05 00:11:41 +08:00
7389e4fb65 分佣:增加获得分销记录分页 API mock 2023-09-04 22:48:26 +08:00
fc56a15f76 分佣:增加用户分销记录、提现 API mock 2023-09-04 21:00:03 +08:00
cc4c924717 钱包 review DO 类修改 2023-09-04 14:54:38 +08:00
91b03e7c93 钱包 review 修改 2023-09-04 12:18:56 +08:00
6a819da0b6 分佣:增加用户分销统计 API mock 2023-09-03 21:21:33 +08:00
991b53649b member: 分销配置 2023-09-03 21:19:42 +08:00
36b3cfafd2 同步 v1.8.1 SQL 脚本 2023-09-03 19:15:18 +08:00
5308e309ea 同步 https://gitee.com/zhijiantianya/yudao-cloud/pulls/51/files 2023-09-03 18:44:03 +08:00
379c143dbb 修复:#320 支付手续费计算不正确,超过付款金额 #334 2023-09-03 18:39:51 +08:00
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
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
4809e9b462 修复单元测试报错的问题 2023-09-03 18:28:29 +08:00
8f86f65884 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-09-03 18:07:05 +08:00
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
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
9148170926 调整 mapper 命名,避免可能的冲突 2023-09-02 19:23:09 +08:00
71efa0ed6f promotion: 订单使用品类券时,根据品类过滤可用商品 2023-09-02 10:05:56 +08:00
8bbaaf1ce9 promotion: 优惠券模板 productSpuIds 改成 productScopeValues 2023-09-02 09:53:37 +08:00
6a7be19d3a common: 增加InEnumCollectionValidator,用于校验枚举值列表参数的取值范围是否有䇅 2023-09-02 08:44:02 +08:00
11ad7ad5e4 mall: 优惠券退还优化 2023-09-02 07:44:16 +08:00
c25bf38f50 code review:交易订单的取消 2023-09-02 00:52:31 +08:00
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
68c1113ed1 code review:优惠劵发放 2023-09-02 00:32:16 +08:00
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
3fbce643ee mall: 发送优惠券功能优化 2023-09-01 23:45:50 +08:00
76f510f247 code review:优惠劵发放 2023-09-01 22:51:28 +08:00
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
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
dd6adb8ee6 code review order 2023-09-01 19:08:27 +08:00
e26814be31 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-09-01 12:13:11 +08:00
1f9968d784 订单中心:修改获取售后订单详情接口,修改订单管理后台物流获取接口 2023-09-01 12:12:15 +08:00
1ca5dd7e93 Crontab组件radio的label类型不一致 2023-09-01 08:48:07 +08:00
891ed3d055 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-09-01 00:34:06 +08:00
361ad2e22a 同步最新商城演示图 2023-09-01 00:33:17 +08:00
e6f1e5d968 同步最新商城演示图 2023-09-01 00:28:39 +08:00
26129b52a8 同步最新 SQL 脚本 2023-08-31 20:47:30 +08:00
d982a95fdd Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-08-31 20:38:59 +08:00
ba444c9538 code review:支付钱包 2023-08-31 20:13:12 +08:00
bca6fb4698 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-08-31 20:06:10 +08:00
f28b960319 调整最新图片 url 2023-08-31 20:06:02 +08:00
457312d5aa 修改 PayClientFactory 创建 PayClient 方法 2023-08-31 14:30:12 +08:00
7d4d3bea55 Revert "创建 PayClient 迁移到 PayChannelService"
This reverts commit 716727bfa7.
2023-08-31 08:27:22 +08:00
60d4aa97fb code review:售后详情接口 2023-08-30 20:18:40 +08:00
059202a588 购物车:调整购物车接口 2023-08-30 19:14:28 +08:00
73f1636daa 售后日志添加售前售后状态 2023-08-30 10:58:37 +08:00
3e4b1c0552 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-08-30 08:43:13 +08:00
5a788af084 购物车:简化 cart 表命名 2023-08-30 08:43:07 +08:00
278f2af8f8 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-08-29 15:29:02 +08:00
716727bfa7 创建 PayClient 迁移到 PayChannelService 2023-08-29 15:28:24 +08:00
e8662e35e1 修复:微信支付初始化 client 客户端错误,导致发起支付报错 2023-08-29 11:45:04 +08:00
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
9507b6d800 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-08-29 09:54:39 +08:00
d5fe7708ce 订单售后退款:添加获取售后订单详情接口 2023-08-29 09:54:14 +08:00
cc71aabd3d 钱包:钱包流水 api 2023-08-29 00:31:54 +08:00
ddcb3e69f9 会员等级 app 接口 2023-08-28 21:01:46 +08:00
6132443d26 code review:钱包实现 2023-08-28 18:54:40 +08:00
0411b3464a 订单售后退款:添加获取售后订单详情接口 2023-08-28 17:21:29 +08:00
9077f14bae 钱包支付 Client 失败问题修改 2023-08-28 13:54:25 +08:00
3d894ca7f5 修复:#320 支付手续费计算不正确,超过付款金额
(cherry picked from commit 0df2d7191f7a467f2eeeb5bd19217a4a039395db)
2023-08-28 11:20:19 +08:00
7237bc07bb 钱包退款的实现 2023-08-28 10:25:50 +08:00
498edfffb1 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-08-28 09:24:04 +08:00
655eefc340 订单管理:完善订单管理提到的一些问题 2023-08-28 09:23:30 +08:00
c7f6f92159 钱包支付 Client 的实现 2023-08-28 07:39:03 +08:00
d82729e4c6 同步最新会员中心 SQL 2023-08-27 21:15:44 +08:00
8b98d13d8b Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-08-27 21:05:42 +08:00
1baa7f4aee 优化 AlipayPcPayClientTest 的方法命名,补全 assert 断言 2023-08-27 16:33:19 +08:00
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
02bc9d28de 解决 MapStruct 的时区问题 2023-08-27 11:19:48 +08:00
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
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
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
530ec7ab24 mall: 完善后台发送优惠券 2023-08-26 22:29:56 +08:00
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
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
1e2c83d90f mall: 商品评论表增加冗余 SKU 的图片地址, 规格 2023-08-26 14:40:16 +08:00
02abe86253 member:
1.用户积分变动方法, 提取到单独的接口中
2.规范代码
2023-08-26 13:52:20 +08:00
f10b638caf feat: 获得会员用户接口增加经验值字段 2023-08-26 12:55:11 +08:00
f6f33a07d0 code review:订单评论、订单积分的变更 2023-08-26 11:19:43 +08:00
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
583d34a801 code review:移除收件地址多余的方法 2023-08-26 01:51:47 +08:00
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
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
fd126ba2f7 member: 根据积分配置的比例,换算积分 2023-08-25 23:14:27 +08:00
d4acacec60 trade: 1.支付成功后,增加用户积分;2.退款成功后,扣减用户积分 2023-08-25 23:07:54 +08:00
dad56fd096 trade: 1.支付成功后,增加用户经验;2.退款成功后,扣减用户经验 2023-08-25 22:21:14 +08:00
f33b66558c 新增查询钱包余额明细接口 2023-08-25 22:08:40 +08:00
1ffbd9399e 新增获得支付钱包接口 2023-08-25 22:08:40 +08:00
9aee08ee0e 会员:修改Review的代码 2023-08-25 21:12:31 +08:00
2895ae3ddb Merge remote-tracking branch 'origin/feature/mall_product' into member_dev 2023-08-25 21:03:19 +08:00
2132de9dd1 商品:完善后台商品评论功能 2023-08-25 21:02:49 +08:00
65eddc63af feat: 增加管理后台用户收件地址管理接口。 2023-08-24 17:04:08 +08:00
5cc3e6510b 使用Parenthesis为原有表达式添加括号 2023-08-24 14:38:47 +08:00
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
b119aadba5 支付宝 条码支付 Client 单元测试 2023-08-23 12:30:15 +08:00
81c12b1852 解决MapStruct的时区问题 2023-08-23 12:21:49 +08:00
eb4434ecbc 解决MapStruct的时区问题 2023-08-23 12:11:47 +08:00
282c15c7c4 fix: vben codegen antdv 4.0 2023-08-23 11:37:09 +08:00
da8b2eab6d 合并冲突 2023-08-23 10:24:01 +08:00
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
4132cf1437 会员: 会员等级取消分页功能 2023-08-23 10:12:21 +08:00
dc382d80bb 会员: 重构会员等级逻辑 2023-08-23 10:02:00 +08:00
60875a0472 code review:获取用户积分记录 接口增加对userId 的支持,获取用户签到记录接口增加对userId的支持 2023-08-23 00:48:33 +08:00
175d244dee Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 2023-08-23 00:46:44 +08:00
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
c0ffaf8ea9 支付宝 PC 网站 Client 单元测试 2023-08-22 22:17:27 +08:00
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
54bf24b966 code review:会员等级 2023-08-22 21:59:00 +08:00
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
ca51056c00 会员: 统一用户等级记录、用户经验记录 命名 2023-08-22 20:49:25 +08:00
002475f33a 订单管理:完善订单管理 补全相关接口 2023-08-22 18:55:00 +08:00
d2c135eda9 订单管理:添加修改备注、订单调价、修改地址接口 2023-08-22 16:31:28 +08:00
0753df68b8 feat: 获取用户积分记录 接口增加对userId 的支持,获取用户签到记录接口增加对userId的支持。 2023-08-22 15:31:36 +08:00
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
292f23c4b2 code review:会员等级 2023-08-22 12:53:29 +08:00
d29c5a556c 订单管理:添加修改备注、订单调价、修改地址接口 2023-08-22 12:19:25 +08:00
bdb38c4157 会员: 修改会员等级,使用单独的表单、接口 2023-08-22 11:23:09 +08:00
eff9fafde8 创建支付宝 Client 抽象类测试类, 测试公共方法 2023-08-22 08:40:41 +08:00
5a2d9d14df 会员: 删除用户标签, 用户等级时, 校验是否关联了用户 2023-08-22 01:33:28 +08:00
7fd497fcc9 会员: 修改重复的错误码 2023-08-22 01:22:01 +08:00
7b2f639324 会员: 规范代码, 用户等级, 用户分组 2023-08-22 01:15:16 +08:00
716f11e80b fix: 合并差异 2023-08-22 00:57:36 +08:00
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
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
8ae3401452 会员: 增加会员分组功能 2023-08-22 00:43:36 +08:00
c2b6c0d72a fix: 订单列表重构 ① 2023-08-22 00:42:20 +08:00
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
0d1fc1138a 增加 app 的签到 mock 接口、积分记录分页、签到记录分页 2023-08-21 22:20:59 +08:00
de83531285 会员:用户标签增加下拉框使用的 精简信息列表查询接口 2023-08-21 21:44:04 +08:00
e711092440 会员:用户管理增加用户等级查询条件 2023-08-21 21:42:59 +08:00
8ffbc15cec 会员:后台调整会员等级 2023-08-21 21:31:16 +08:00
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
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
281ba1e369 code review:调整错误码分段 2023-08-20 19:38:17 +08:00
a83c156bf1 code review:签到记录 2023-08-20 19:34:28 +08:00
c5e85f3bfb code review:签到配置 2023-08-20 19:26:31 +08:00
4257cad46a code review:会员积分 2023-08-20 19:06:23 +08:00
e2032e7e97 会员:增加会员等级增删改查 2023-08-20 15:54:06 +08:00
9eca965dd6 Merge remote-tracking branch 'origin/feature/mall_product' into member_dev 2023-08-20 10:55:42 +08:00
c7285da9a7 code review:会员签到配置 2023-08-20 10:14:28 +08:00
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
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
2584911d88 code review:会员标签 2023-08-20 09:25:23 +08:00
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
95254341a1 1. 会员用户的找回密码 API 的优化 2023-08-19 23:12:34 +08:00
4f589cad53 会员:
1.会员设置标签
2023-08-19 20:19:56 +08:00
5d4a7ffa3b 1. 会员用户的修改密码 API 的优化 2023-08-19 20:16:41 +08:00
87e5b2bed1 1. 会员用户的修改手机 API 的优化 2023-08-19 19:23:54 +08:00
4153331535 1. 合并 member 修改昵称和头像接口,统一成修改基本信息 API 2023-08-19 17:47:34 +08:00
94a32d34b2 1. 会员用户,增加 point 积分字段
2. 增加获得优惠劵、收藏数量的 API 接口
2023-08-19 17:00:40 +08:00
9b6e2114c7 会员:
1.增加会员标签功能
2023-08-19 16:06:12 +08:00
a4e2cacc46 会员中心:会员管理 60% 2023-08-19 14:43:53 +08:00
e8c1bdde3d 会员中心:会员管理 50% 2023-08-19 14:12:03 +08:00
db1f44305d 会员积分和会员签到模块todo修改 2023-08-19 14:09:47 +08:00
2e9dfac9ab 会员积分和会员签到模块todo修改 2023-08-19 14:09:22 +08:00
61fbb9909a 订单:
1、简化交易订单的逻辑
2023-08-18 19:59:30 +08:00
fe07e223e4 订单:
1、简化交易订单的逻辑
2023-08-18 19:28:36 +08:00
f217ba0807 售后:
1、完善整个流程的实现
2023-08-18 19:22:08 +08:00
6446b753d3 fix: required = true ==> requiredMode = Schema.RequiredMode.REQUIRED 2023-08-18 10:56:08 +08:00
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
5dd6e5bee8 营销:
1. 售后订单,增加对 afterSaleId 的更新
2023-08-17 22:32:30 +08:00
6fbf7b261b 扫码支付统一退款单元测试, 修复退款失败,渠道错误未赋值bug 2023-08-17 21:52:53 +08:00
d3c02f2a57 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-08-16 22:11:27 +08:00
c3de25e760 营销:
1. 调整店铺装修接口
2023-08-16 22:11:18 +08:00
1b03fdb08b 支付宝 扫码支付 统一下单 单元测试 2023-08-16 08:51:27 +08:00
a159a983a2 订单:
1. 拆分读写 OrderService,避免单 Service 逻辑过重。
2023-08-15 21:19:13 +08:00
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
e4a2c738b2 订单:
1. 增加查询物流接口
2023-08-15 20:18:22 +08:00
5b9106fdb5 fix: 在调用 selectList() 的时候 如果 Collection 参数为空会报错 sql 异常 2023-08-15 17:54:55 +08:00
5c2723c7bf fix: 修复合并差异 2023-08-15 00:02:50 +08:00
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
e2a8f7b389 fix: 完善订单发货逻辑、重构砍价活动、完善拼团记录创建逻辑 2023-08-14 21:26:07 +08:00
651725e3e8 fix: 完善订单发货逻辑、重构砍价活动、完善拼团记录创建逻辑 2023-08-14 21:20:03 +08:00
a8223fc4f2 !1 fix: posgres sql
Merge pull request !1 from 天天写BUG/master
2023-08-13 17:35:01 +00:00
e6f4d649aa fix: postgres sql 2023-08-14 01:32:46 +08:00
36da5d69b0 1、增加 App 的文件上传接口 2023-08-13 22:02:29 +08:00
715c42574f 订单:
1、订单评价的接入
2023-08-13 21:44:48 +08:00
7dc398717a 订单:
1、实现确认收货接口
2023-08-13 20:27:19 +08:00
503c996acd 订单:
1、移除 deliverStatus 发货状态,暂时没作用
2、无需发货时,使用 logisticsId 进行实现
3、订单详情,增加 logisticsId 和 logisticsName 返回
2023-08-13 20:12:24 +08:00
e159b2e500 code review:砍价的代码 2023-08-13 00:49:35 +08:00
ba31d5f6fb 优化拼团活动的管理后台代码 2023-08-13 00:06:46 +08:00
baa2e69cdf fix: vben codegen 2023-08-12 18:31:16 +08:00
1a999cbb75 chore: up mybatis-plus 3.5.3.2 2023-08-12 18:09:19 +08:00
b55c1b942d perf: vben 2.0 codegen 2023-08-12 17:31:33 +08:00
6fdd4da0b3 优化秒杀活动的管理后台代码 2023-08-12 16:05:47 +08:00
ebf4ac1d5a 优化 README.md,从 .image 读取图片 2023-08-12 00:43:12 +08:00
3bfaa3d5c3 优化 README.md,从 .image 读取图片 2023-08-12 00:27:04 +08:00
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
5fcd0a21da Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 2023-08-11 22:44:20 +08:00
ee53d2ad51 修复租户套餐修改时,查询角色报错问题 2023-08-11 22:24:01 +08:00
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
b5515799dc !557 修改创建菜单时permission为空,缓存KEY 为空的BUG 2023-08-11 19:32:26 +08:00
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
27b8202053 微调支付收银界面,缺少 success 参数 2023-08-11 09:22:22 +08:00
134e5ca20f feat: 将 redisCache 的扫描策略设置成 scan 2023-08-10 15:27:19 +08:00
64c8dd6292 feat: 拓展 支持自定义过期时间的 RedisCacheManager 使支持自定义过期时间单位 2023-08-10 15:27:03 +08:00
c4a7da9233 Revert "feat: 拓展 支持自定义过期时间的 RedisCacheManager 使支持自定义过期时间单位"
This reverts commit 47698bfc6c.
2023-08-10 15:26:31 +08:00
e1fe21f24c Revert "feat: 将 redisCache 的扫描策略设置成 scan"
This reverts commit 72d2dcc68f.
2023-08-10 15:26:25 +08:00
47698bfc6c feat: 拓展 支持自定义过期时间的 RedisCacheManager 使支持自定义过期时间单位 2023-08-10 11:50:18 +08:00
72d2dcc68f feat: 将 redisCache 的扫描策略设置成 scan 2023-08-10 11:26:44 +08:00
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
93effe8fa7 新版表结构 2023-08-09 22:43:14 +08:00
d397758dd1 还原配置文件 2023-08-09 22:39:12 +08:00
8f43fba629 会员积分针对代码格式、功能优化
1.修改积分抵扣单位
2023-08-09 22:31:55 +08:00
bae94d06ac 会员积分针对代码格式、功能优化
1.优化todo建议
2.删除无用代码
2023-08-09 20:59:45 +08:00
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
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
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
384359c9d4 fix: 完善拼团、秒杀、砍价活动管理 2023-08-06 20:21:53 +08:00
5f9184904a fix: 完善拼团、秒杀、砍价活动管理 2023-08-06 17:46:16 +08:00
afaef0dfbb Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-08-06 01:05:47 +08:00
222d1cf69b 增加对比新老数组的 C/U/D 对象 2023-08-06 00:25:23 +08:00
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
105f1a2707 fix: banner 日志打印 2023-08-05 16:35:11 +08:00
1f3794db77 fix: 修复MailAccountService 更新/删除缓存未清空 2023-08-05 14:49:04 +08:00
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
3b715a1380 typo: apiclient_key.perm => apiclient_key.pem
Signed-off-by: dhb52 <dhb52@126.com>
2023-08-03 15:34:36 +00:00
508ad76cb8 fix: 修复MailAccountService 更新/删除缓存未清空 2023-08-03 18:08:38 +08:00
a82898ca13 Merge remote-tracking branch 'yudao/master' into feature/mall_product 2023-08-02 21:14:41 +08:00
92b10e2ecf Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-07-31 18:37:13 +08:00
f5079b1c57 feat: 添加砍价活动相关 DO 2023-07-31 18:36:21 +08:00
d156d43d63 fix:完善 review 拼团、秒杀活动的实现提到的问题 2023-07-31 18:34:56 +08:00
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
ae98315616 增加模拟支付的订单号、退款号返回 2023-07-29 11:32:48 +08:00
59e6006572 chore: up deps version 2023-07-29 11:26:06 +08:00
402a3809a3 chore: up springboot 2.7.14 2023-07-29 11:23:13 +08:00
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
24a406e47d 文件配置的本地缓存,使用 Job 轮询,替代 MQ 广播 2023-07-29 09:20:15 +08:00
d67f4a7f46 文件配置的本地缓存,使用 Job 轮询,替代 MQ 广播 2023-07-29 09:10:52 +08:00
dfa09c787a 短信渠道的本地缓存,使用 Job 轮询,替代 MQ 广播 2023-07-29 08:59:07 +08:00
27e70e73a3 敏感词的本地缓存,使用 Job 轮询,替代 MQ 广播 2023-07-29 07:31:53 +08:00
5e7e3d816c 彻底移除 RedisKeyDefine 2023-07-29 07:16:10 +08:00
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
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
0fb3c4bfcc docker compose首次启动加载sql脚本 2023-07-28 17:08:29 +08:00
446951bd11 fix:封装函数 convertCDUMap 作用:数据划分为需要新增的、还是删除的、还是更新的。 2023-07-28 16:30:38 +08:00
7f657ee931 优化 mp-java 库的依赖管理 2023-07-27 23:15:49 +08:00
c33186569d 优化 mp 账号的刷新机制,使用 Job 轮询,替换 MQ 广播 2023-07-27 20:25:15 +08:00
5d6308e4bb 对齐 boot 与 cloud 的代码 2023-07-27 13:59:29 +08:00
859cf74a6c 对齐 boot 与 cloud 的代码 2023-07-27 13:00:52 +08:00
6a38738760 新增模拟支付渠道,通知查询为空bug 修改 2023-07-27 08:19:24 +08:00
21b3744544 1.8.0 版本发布 2023-07-27 07:45:04 +08:00
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
6c174d9c83 对齐 boot 与 cloud 的代码 2023-07-26 23:56:02 +08:00
14d7db0c60 对齐 boot 与 cloud 的代码 2023-07-26 23:27:06 +08:00
114f1e4833 对齐 boot 与 cloud 的代码 2023-07-26 22:36:34 +08:00
461c789492 清理 bpm 用不到的实体、与 convert 方法 2023-07-26 20:53:10 +08:00
a0417f182e Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 2023-07-26 19:36:11 +08:00
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
1dee258c18 适配postgres数据库sql脚本
infra_codegen_table表增加front_type字段
member_user表部分字段增加默认值
system_menu表permission增加默认值
2023-07-26 01:22:42 +08:00
d9522808eb 优化 LambdaQueryWrapperX 的 inIfPresent 判空逻辑 2023-07-25 20:58:44 +08:00
8e51de5349 修复“删除流程模型方法 有注释写错” 2023-07-25 20:33:41 +08:00
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
7f0901e0bb 优化项目启动速度, 2023-07-25 08:39:28 +08:00
7c165fb1f6 1. 完善 PayNotifyServiceImpl 的单元测试 2023-07-24 23:04:38 +08:00
zjl
9d10c85be8 接口日志持续时间修改为毫秒单位 2023-07-24 23:00:24 +08:00
3a1694dea3 1. 微信 App 支付 WxAppPayClient 实现
2. 优化微信支付的下单逻辑,增加 build request 公用方法
2023-07-24 22:07:54 +08:00
0fcc0072c2 1. AlipayBarPayClient 增加小额支付的成功返回 2023-07-24 21:44:09 +08:00
5ae43a238d 1. 修复支付宝 App 发起报错的问题
2. 移除微信 H5 支付,基本没人使用,减少复杂性
2023-07-24 20:54:04 +08:00
73e1158836 by gateway:
1. notify 部分单元测试
2023-07-24 20:11:21 +08:00
c9c176ea05 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-07-24 17:30:54 +08:00
7957cfa50d fix:优化拼团与订单集成逻辑 2023-07-24 17:29:51 +08:00
8d13ecc9c8 fix:优化订单发货逻辑使其支持一单分发 2023-07-24 15:14:16 +08:00
00e1c30f57 1. 修复创建支付应用,界面会报错的问题
2. 同步最新 SQL 文件
2023-07-24 12:51:14 +08:00
3f988a890d 完善“支付系统”的说明 2023-07-24 08:46:12 +08:00
3a24d05bdc mall + pay:
1. 修复单元测试的报错
2023-07-24 07:04:11 +08:00
6aea461e8d mall + pay:
1. 完善 PayRefundServiceTest 的单元测试
2023-07-23 23:20:52 +08:00
ebeb14be2f mall + pay:
1. 完善 PayRefundServiceTest 的单元测试
2023-07-23 22:29:33 +08:00
9812881094 mall + pay:
1. 增加退款同步的 Job
2023-07-23 21:16:03 +08:00
0e5e6c7ce0 mall + pay:
1. 增加微信退款的查询接口
2023-07-23 20:39:52 +08:00
5b066ea693 mall + pay:
1. 增加支付宝退款查询接口
2023-07-22 20:46:38 +08:00
ac5646b84d mall + pay:
1. 支付订单的过期关闭 Job[单测]
2023-07-22 19:53:48 +08:00
cc853a2b92 mall + pay:
1. 支付订单的状态同步 Job[单测]
2023-07-22 17:47:58 +08:00
15cca8f3de mall + pay:
1. 支付订单的状态同步 Job
2. 支付订单的过期关闭 Job
2023-07-22 15:48:45 +08:00
348d073718 mall + pay:
1. 发起支付时,增加实际已支付的二次校验,避免重复支付
2023-07-22 13:19:22 +08:00
717caf527a mall + pay:
1. 增加微信支付 Client 的查询订单接口
2023-07-22 12:07:18 +08:00
f46a037164 mall + pay:
1. 增加支付宝 Client 的查询订单接口
2023-07-22 11:19:42 +08:00
b426c63eeb Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-07-21 22:02:50 +08:00
e27ec2fd50 by gateway:
1. 完善部分 refund 单元测试
2023-07-21 22:02:39 +08:00
f92a5899f3 mall + pay:
1. 简化微信支付的配置界面
2023-07-21 21:50:05 +08:00
d556877b13 chore: use xingyuv jushauth 2023-07-21 17:55:47 +08:00
c95a1d0a7d chore: up springboot 2.10.13 2023-07-21 17:53:40 +08:00
6c5ea2bc11 Merge remote-tracking branch 'origin/master' into feature/captcha 2023-07-21 17:43:05 +08:00
91b4280625 fix: vben form bug 2023-07-21 17:40:27 +08:00
f23e1b857a fix:合并差异修正 2023-07-21 16:54:58 +08:00
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
259807600a feat:拼团订单集成 2023-07-21 16:47:04 +08:00
29d61beb11 mall + pay:
1. 简化支付宝支付的配置界面
2023-07-21 13:49:42 +08:00
da529851bd mall + pay:
1. 简化支付宝支付的配置界面
2023-07-21 09:19:59 +08:00
654b70c514 mall + pay:
1. 增加通知管理
2023-07-20 22:48:06 +08:00
b54f7e9256 by gateway:
1. 完善部分 order 单元测试
2. 增加支付订单的 no 生成逻辑
2023-07-20 20:07:44 +08:00
721adfbf60 mall + pay:
1. 优化退款管理的导出实现
2023-07-19 23:05:45 +08:00
3caa5f14bd mall + pay:
1. 优化退款管理的接口实现
2023-07-19 22:33:19 +08:00
b84da30234 mall + pay:
1. 优化订单管理的接口实现
2. 支付状态增加 refund 类型,将 refund status 合并进去
2023-07-19 21:09:02 +08:00
5dcb3db5d7 mall + pay:
1. 优化订单管理的接口实现
2023-07-19 09:50:24 +08:00
888c488206 mall + pay:
1. 优化 PayClient 退款逻辑,返回业务失败 errorCode + errorMsg 错误码
2023-07-18 22:36:03 +08:00
3f410c2735 by gateway:
1. 补全 channel 单元测试
2. 完善部分 order 单元测试
2023-07-18 20:21:25 +08:00
1c282bd3cb mall + pay:
1. 优化 PayClient 退款逻辑,返回业务失败 errorCode + errorMsg 错误码
2023-07-18 13:00:22 +08:00
d80bf5a368 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-07-18 09:06:02 +08:00
6f475f8c85 mall + pay:
1. 优化 PayClient 支付逻辑,返回业务失败 errorCode + errorMsg 错误码
2023-07-18 07:37:03 +08:00
7cf4c5415e mall + pay:
1. 将 payNotifyUrl 统一改成 orderNotifyUrl
2023-07-17 16:38:31 +08:00
d0a7f41875 mall + pay:
1. 完善微信支付的 V3 支付回调、退款回调
2023-07-17 16:27:51 +08:00
68a4ef98ca mall + pay:
1. 拆分支付回调、退款回调的 URL
2. 修复微信支付回调的时间解析错误
2023-07-17 11:47:45 +08:00
66ed61c641 mall + pay:
1. 微信支付配置,补全 apiclient_cert.p12 证书
2023-07-17 07:56:33 +08:00
7caf8e900f mall + pay:
1. 增加微信 bar 和 native 的集成测试,方便调试配置
2023-07-16 19:24:29 +08:00
ecdc39612f mall + pay:
1. 后台的收银台,接入微信扫码支付
2023-07-15 23:14:42 +08:00
a6437b7cc5 mall + pay:
1. 后台的收银台,接入微信扫码支付
2023-07-15 21:18:36 +08:00
c44ace6011 mall + pay:
1. 完成支付宝的退款重构
2. 完成 demo 模块的退款接入
2023-07-15 20:36:04 +08:00
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
147cd271b8 fix:完善拼团活动列表展示 2023-07-14 17:34:37 +08:00
7cdb321fe4 fix:完善拼团活动CRUD 2023-07-14 17:08:37 +08:00
927f71c7e2 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-07-14 14:28:26 +08:00
fbb63ee262 mall + pay:
1. 修复 PayNotifyTask 首次通知时,可能会失败的情况;原因:MySQL 时间的精度问题;
2023-07-12 22:40:39 +08:00
47ba5b7b44 by gateway: 支付渠道的代码优化 2023-07-12 20:34:43 +08:00
35ceef371c Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-07-12 12:52:58 +08:00
052e4689ee by gateway: 支付应用的代码优化 2023-07-12 12:52:48 +08:00
0ac599a3d9 mall + pay:
1. 修复支付宝沙箱地址的调整
2. 收银台的前端 URL 支付走整个网页跳转
3. 收银台的支付成功后,增加 returnUrl 回跳
4. 修复 PayNotifyTask 首次通知时,可能会失败的情况;原因:租户未传递;
2023-07-12 00:04:19 +08:00
f1c4c7964a gateway commit test 2023-07-11 21:18:24 +08:00
cad508def6 mall + pay:
1. bar 扫码支付成功后,额外返回 notify
2. notify 在支付回调时,增加幂等处理
2023-07-10 23:06:00 +08:00
ca4afc2909 mall + pay:
1. 调整 cashier 的 channels 的读取实现方式
2023-07-10 18:28:43 +08:00
2485a5ebc9 mall + pay:
1. 将 amount 统一都修改成 price
2. 将 payed 统一改成 payStatus
2023-07-10 17:35:26 +08:00
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
9cbd0fec1c Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-07-10 09:21:26 +08:00
5d2d52020e mall + pay:简化 pay 的复杂度
1. 移除 merchant 表设计
2. 移除 app 和 channel 的导出
2023-07-09 12:40:26 +08:00
4682650e11 mall + pay:
1. 先添加 WxAppPayClient、WxH5PayClient 的类,暂未实现
2023-07-09 00:47:31 +08:00
b06a21f9af mall + pay:
1. 实现 WxNativePayClient 的支付功能
2023-07-09 00:36:40 +08:00
e31b40eefa mall + pay:
1. 实现 WxBarPayClient 的支付功能
2023-07-08 23:37:25 +08:00
4014137a4c mall + pay:调整异常的处理
1. 在 PayOrderUnifiedRespDTO 增加 status 字段,用于后续微信付款码支付时,直接支付成功的场景。
2023-07-08 22:40:27 +08:00
efb221b1fe mall + pay:调整异常的处理
1. 如果是业务异常,则统一转换成 ServiceException
2. 如果是系统异常,则使用 PayException 包装成无需 check 的异常
2023-07-08 19:26:42 +08:00
e615be971e mall + pay:
1、测试通过微信小程序支付
2023-07-08 12:44:50 +08:00
d76bc7aa82 mall + pay:
1、初步完成微信扫码支付,暂时缺少状态的处理
2023-07-08 00:08:05 +08:00
284506b356 mall 下单日志 2023-07-07 14:06:56 +08:00
f492797fba update 售后日志 2023-07-07 14:06:56 +08:00
eaeb435459 交易日志sql 2023-07-07 14:06:56 +08:00
2865c28a9f 售后日志优化,map->抽方法 2023-07-07 14:06:56 +08:00
75afab1f86 售后日志优化 2023-07-07 14:06:56 +08:00
3f33ca2d6b mall + pay:
1、增加获得支付渠道接口
2023-07-06 23:16:53 +08:00
d224b6b9be mall + pay:
1、调整微信 Lite 小程序支付的实现
2023-07-06 20:55:23 +08:00
cbc61184bd mall + pay:
1、优化微信公众号 MP 支付的实现
2023-07-06 19:11:32 +08:00
67d60e32f8 mall + pay:
1、调整微信支付,修复 v2 传递的时间不正确
2、调整 mp js ticket 接口到 system 模块
2023-07-06 00:19:05 +08:00
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
b78f814552 fix:mall promotion SeckillActivity 2023-07-05 22:05:05 +08:00
78b3d2a20f fix:mall promotion Combination 2023-07-05 11:31:16 +08:00
20eb0a2a88 mall + pay:
1、调整 returnUrl 的实现
2023-07-04 23:43:16 +08:00
41d996f7f3 feat:mall promotion CombinationProduct 2023-07-04 11:21:03 +08:00
c563051841 feat:mall product 新增通过 spuIds 获取相关 spu 详情列表的接口 2023-07-03 14:44:27 +08:00
409ec555e8 feat:mall CombinationActivity 2023-07-03 08:07:05 +08:00
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
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
9b90320985 mall + trade:
1、增加配送信息
2023-07-02 12:55:15 +08:00
1b558a02b0 修复member_user pg脚本中没有默认值导致创建用户失败的bug 2023-07-02 01:33:59 +08:00
6fc724545b mall + trade:
1、取消订单 mock 接口
2、删除订单 mock 接口
2023-07-02 00:15:28 +08:00
6206dd94e2 mall + trade:
1、获取订单结算信息,增加门店自提编号
2023-07-01 00:26:09 +08:00
0a20f7fe9e Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-06-30 22:45:09 +08:00
3750dc76c7 mall + trade:
1、获取订单结算信息,增加积分的 mock 返回
2023-06-30 22:45:03 +08:00
3a1e5c1b5f pay : 会员电子钱包表结构 2023-06-30 10:24:36 +08:00
ef656cf762 mall + promotion:
1、增加获得符合条件的优惠劵
2023-06-29 20:20:00 +08:00
b3c1be108c mall + trade:
1、增加门店自提的 mock 接口
2023-06-29 00:24:45 +08:00
a918b54b28 Merge remote-tracking branch 'origin/dev-fix-sql4pg' into master-cq 2023-06-29 00:01:58 +08:00
c1e020a286 将master数据库中pg数据库的引用数据库名称变量改为master 2023-06-28 23:28:19 +08:00
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
c7ced55a6c 会员中心代码、sql脚本提交
1.合并积分模块只member module
2.初始化sql放入mysql/member_point.sql
3.添加会员中/会员积分、会员签到/xxx层级目录
4.删除无用的接口代码
2023-06-28 22:49:19 +08:00
5ffea93731 mall + product:
1、完善商品评论列表的 mock
2023-06-28 00:25:44 +08:00
846405d8b1 mall + promotion:
1、增加 article mock 接口
2023-06-27 22:44:38 +08:00
3e9768374b chore: up justauth 1.0.1 captcha-plus 1.0.5 2023-06-26 22:19:20 +08:00
7ad3b6ad2b chore: use com.xingyuv.justauth 2023-06-26 21:08:56 +08:00
7036a6652c mall + member:
1、调整收获地址的返回
2023-06-26 20:07:46 +08:00
8ea46b8fc2 fix: getNewPhoneNoInfo 已过期 2023-06-26 16:53:08 +08:00
9826bd614b docs: up Lombok 1.18.28 2023-06-26 16:50:41 +08:00
c1782c432f chore: up deps version 2023-06-26 16:50:20 +08:00
d44c29296d chore: up hutool 5.8.20 Lombok 1.18.28 2023-06-26 16:49:33 +08:00
4393c5da1c docs: up Druid 1.2.18 2023-06-26 16:30:00 +08:00
02fe0329e4 chore: up druid 1.2.18 2023-06-26 16:29:26 +08:00
0899f5fd29 docs: up springboot 2.10.12 2023-06-26 16:27:06 +08:00
bdb18b4ced chore: up springboot 2.7.13 2023-06-26 16:26:38 +08:00
5c9a99c83e mall + promotion:
1、mock 优惠劵模版分页
2、mock 批量删除收藏
2023-06-25 17:40:04 +08:00
e5c556f106 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-06-25 15:49:30 +08:00
bb0bb2a4fa mall + promotion:商品列表 2023-06-25 11:25:13 +08:00
4a3703e302 mall + promotion:review 页面装修 2023-06-25 11:24:55 +08:00
050f0bb6a2 页面装修 review 修改 2023-06-24 21:09:49 +08:00
b582206003 mall + promotion:review 页面装修 2023-06-24 12:54:59 +08:00
ad1f656dfa 页面装修修改,后端只负责存取 2023-06-24 00:11:04 +08:00
1dfbe45913 mall + order:review 售后日志 2023-06-23 21:50:57 +08:00
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
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
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
6b1d996b66 页面装修数据结构定义 2023-06-23 10:53:29 +08:00
26f563df57 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-06-23 00:57:49 +08:00
ab30ff6480 fix:完善 mall seckill 相关 ② 2023-06-23 00:57:27 +08:00
b0fcd96dfe mall + promotion:增加砍价记录的 mock 2023-06-23 00:26:04 +08:00
f5b2bb4d7d mall + promotion:增加砍价记录的 mock 2023-06-22 23:06:16 +08:00
c33bd38b5d mall + promotion:增加砍价记录的 mock 2023-06-21 23:45:59 +08:00
b44ad3a0f7 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-06-21 08:42:36 +08:00
666925da6e fix:mall vo @Schema required = true => requiredMode = Schema.RequiredMode.REQUIRED 2023-06-21 08:41:45 +08:00
772a982b5f mall + promotion:增加拼团记录的 mock 2023-06-21 00:29:50 +08:00
700d95a43d fix:完善商品评论 review 提到的问题 2023-06-20 18:12:39 +08:00
8dfb298376 fix:完善 mall seckill 相关 ① 2023-06-20 09:08:15 +08:00
9517ffdfb8 fix:修复 mall product promotion 测试 sql 2023-06-20 09:06:32 +08:00
bf7f68a04b mall + promotion:增加拼团的 mock 返回 2023-06-19 23:35:28 +08:00
8a7f7fd641 mall + promotion:增加拼团的 mock 返回 2023-06-19 20:35:43 +08:00
2f0aaee823 售后日志优化 2023-06-19 17:04:07 +08:00
d6bd4be8b0 '' 2023-06-19 13:10:50 +08:00
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
6b3af71735 订单详情修改20230619 2023-06-19 12:50:28 +08:00
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
2672b3e2fa fix 依赖启动问题 2023-06-19 10:19:47 +08:00
a93b9a616f 售后日志优化 2023-06-19 10:19:29 +08:00
7fc1016e90 chore: up captcha-plus 1.0.4 2023-06-19 09:47:18 +08:00
850d028ec7 chore: 添加华为云maven aliyun同步速度慢 2023-06-19 09:47:01 +08:00
331be53b8b fix:完善时段配置管理 2023-06-19 08:58:11 +08:00
49d726019a Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-06-19 08:33:48 +08:00
fc570b6062 mall + promotion:完善秒杀活动的 mock 返回 2023-06-18 21:23:50 +08:00
d795dbc7ac mall + promotion:优化限购、库存的返回结果 2023-06-18 20:15:34 +08:00
cd4940d710 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-06-18 13:17:36 +08:00
a93acd2a74 mall + promotion:mock 秒杀列表 2023-06-18 02:05:10 +08:00
6573849f56 mall + promotion:mock 拼团列表 2023-06-18 00:35:22 +08:00
7d0e9ea762 fix 依赖启动问题 2023-06-17 23:47:38 +08:00
60b24e36d5 code review:售后日志逻辑 2023-06-17 22:15:03 +08:00
1871a01944 fix:seckill:调整相关类属性和表字段对齐 2023-06-17 22:14:23 +08:00
59e16795be !514 mall交易日志封装
* 交易日志封装
* 交易日志封装
* 交易日志模块
2023-06-17 14:00:10 +00:00
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
16f2a5b91a Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-06-17 21:19:02 +08:00
32cca12cd2 fix:seckillTime => seckillConfig 2023-06-17 21:17:02 +08:00
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
8e3a65d84c 本地连接修改 2023-06-17 16:39:28 +08:00
8d58b1e862 Bump guava from 31.1-jre to 32.0.0-jre in /yudao-dependencies #96 2023-06-17 14:19:26 +08:00
a4c11b890c fix(sec): upgrade commons-net:commons-net to #98 2023-06-17 14:17:24 +08:00
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
c7e3a8c126 修复 Vue 2生产环境打包压缩等配置未生效问题 2023-06-17 13:58:55 +08:00
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
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
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
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
0d47d6cead mall + trade:code review 快递客户端的实现,没啥问题咧,搞下单测就 ok 拉 2023-06-17 11:59:38 +08:00
59d5fef592 mall + trade:优化运费模版的代码 2023-06-17 11:35:31 +08:00
07fe52939d mall + promotion:mock banner mock 接口 2023-06-17 00:47:47 +08:00
5b324f90a4 mall + promotion:mock 拼团活动列表 2023-06-16 23:27:27 +08:00
8ec3733882 mall + trade:mock 拼团记录列表的接口 2023-06-16 20:32:03 +08:00
af9334c9b2 mall + trade:mock 拼团记录详情的接口 2023-06-16 00:12:49 +08:00
1662d17fc9 快递客户端 review 修改 2023-06-15 14:59:31 +08:00
e69e6d880b 快递价格计算 review 修改 2023-06-15 10:49:24 +08:00
217a31a123 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-06-15 09:11:07 +08:00
af0eeb6e3b Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-06-14 23:08:28 +08:00
b74991e242 mall + trade:mock 拼团活动详情的接口 2023-06-14 23:08:22 +08:00
b892a6d2bd feat: captcha-plus 1.0.4 2023-06-14 18:00:14 +08:00
25df1e2ecd revert: config 2023-06-14 17:58:51 +08:00
296256a55a 修复-公众号标签修改提示报错“[微信公众号 yudao-module-mp - 已禁用][参考 https://doc.iocoder.cn/mp/build/ 开启]” 2023-06-14 17:30:15 +08:00
66f09ed54b 修复-公众号标签修改提示报错“[微信公众号 yudao-module-mp - 已禁用][参考 https://doc.iocoder.cn/mp/build/ 开启]” 2023-06-14 17:19:50 +08:00
cd33f68e2b chore: up springboot 2.10.12 2023-06-14 16:50:46 +08:00
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
e23fb5024a fix: required = true 已过期 2023-06-14 15:21:41 +08:00
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
df6d63068d fix:修改第1点描述错误, 【用户看到 】改为 【用户看不到】
Signed-off-by: Syriana钟亨 <4916681+sairupe@user.noreply.gitee.com>
2023-06-13 08:36:20 +00:00
60172274ec fix:合并代码后修改差异完善商品评论相关 2023-06-12 17:02:46 +08:00
70b48ca232 使用docker compose -T来执行数据导入
Signed-off-by: dhb52 <dhb52@126.com>
2023-06-12 08:32:26 +00:00
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
9ff873fe53 fix:完善商品评论测试 sql 2023-06-12 12:09:16 +08:00
20100aa78b fix:完善商品评论 2023-06-12 12:08:55 +08:00
dcb1660880 mall + trade:code review 快递计算逻辑 2023-06-12 00:20:20 +08:00
e1a8e45ac7 mall + trade:快递价格计算 2023-06-11 23:40:38 +08:00
0c283ded5d Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-06-11 23:19:09 +08:00
b6c7a940be mall + promotion:增加秒杀活动的 mock 接口 2023-06-11 23:19:04 +08:00
644d976a78 快递100 快递查询实现 2023-06-11 18:15:33 +08:00
45e5578cb4 快递查询、 通过快递鸟查询实现 2023-06-11 10:22:33 +08:00
5ffc1ac9f3 mall + promotion:增加秒杀活动的 mock 接口 2023-06-11 00:22:45 +08:00
5f64fe052b 初始化sql 2023-06-10 20:45:31 +08:00
73d0e9d08a 初始化积分模块
1.积分设置管理
2.积分签到规则管理
3.用户积分记录管理
4.用户签到积分管理
2023-06-10 20:44:31 +08:00
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
9e894e0430 mall + promotion:增加优惠劵的 mock 接口 2023-06-10 09:57:37 +08:00
66210e5ee2 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-06-10 00:19:08 +08:00
bb8e44a268 mall + product:增加评论 mock 逻辑 2023-06-10 00:17:22 +08:00
dde89d51d5 物流运费计算 review 修改 + 单元测试 2023-06-10 00:15:57 +08:00
1e1a22c256 mall + product:评论的 review 2023-06-09 22:41:16 +08:00
84b365a707 mall + product:简化收藏逻辑,去掉 type 字段 2023-06-09 20:44:00 +08:00
25bea4920c mall + trade:review 物流计算 2023-06-09 19:17:25 +08:00
f2d803c111 mall + product:review 评论接口 2023-06-09 13:59:04 +08:00
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
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
91e357e59d fix:移动 app 商品评论分页相关常量到 AppCommentPageReqVO 中 2023-06-08 17:15:37 +08:00
8f7efbe4e2 fix:测试 app 商品评论页获取评论分页接口和相关评论分类数量接口,修复测试时发现的问题 2023-06-08 16:14:23 +08:00
151e58daa1 fix:完善 app 商品评论页获取评论分页接口和相关评论分类数量接口 2023-06-08 11:37:49 +08:00
5bfca56efa fix:完善 TODO 提到的问题 2023-06-07 18:08:49 +08:00
db7e47faa2 fix:完善 TODO 提到的问题 2023-06-07 14:15:25 +08:00
6ca09af97e 解决邮件发送用户编号为空问题 2023-06-05 14:09:49 +08:00
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
36c45bd44e review 价格运算修改. 2023-06-04 17:45:40 +08:00
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
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
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
910d374cee mall + trade:review 运费价格计算 2023-06-03 19:56:23 +08:00
36ce968893 mall + trade:review 运费价格计算 2023-06-03 18:08:59 +08:00
f1fa8eadd2 mall - trade - 新增 TradeDeliveryPriceCalculator 2023-06-03 17:16:18 +08:00
73a781cbbe mall + trade:增加 TradeRewardActivityPriceCalculatorTest 的单元测试 2023-06-03 13:36:07 +08:00
0d08c814ec mall + trade:增加 TradeDiscountActivityPriceCalculator 的单元测试 2023-06-03 13:14:47 +08:00
1452f6b231 mall + trade:增肌爱 TradeCouponPriceCalculator 的单元测试 2023-06-03 11:53:40 +08:00
636b14ccce mall + trade:创建订单逻辑,接入新的价格接口 2023-06-03 09:14:51 +08:00
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
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
8d2bcc57aa fix: 完善商品管理 2023-06-01 11:41:26 +08:00
5de8fa2e42 mall + trade:解决报错问题 2023-05-31 21:17:35 +08:00
e86214015d fix: 完善商品管理 2023-05-31 16:39:43 +08:00
e34eddc386 mall + trade:review 自提代码 2023-05-31 09:18:24 +08:00
894b19b8ec 新增自提门店管理 2023-05-30 21:18:30 +08:00
f8db53896f review 修改 2023-05-30 21:17:51 +08:00
35daee84e7 fix: 解决合并代码后项目运行失败的问题,相关问题已标注 TODO 2023-05-30 10:26:42 +08:00
fcaa92d406 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-05-30 09:46:31 +08:00
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
8004a11036 master代码错误 2023-05-29 09:17:11 +08:00
406f69e21d Merge remote-tracking branch 'origin/master' 2023-05-29 00:05:14 +08:00
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
6bdc31a315 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-28 23:16:18 +08:00
0631c51d93 mall + trade:review 配置管理列表 2023-05-28 23:16:11 +08:00
6a9146ff8d mall + trade:调整价格计算的逻辑 2023-05-28 20:09:51 +08:00
22c70df111 bugfix:解决公众号粉丝同步api配置错误 2023-05-28 14:56:41 +08:00
55dbff7570 运费模板 review 修改. 运费模块可以选择多个区域 2023-05-27 11:20:43 +08:00
02fa6fc5c6 mall + trade:调整价格字段,更易懂 2023-05-26 23:58:26 +08:00
0083d12404 mall:review + mall:快递费用 2023-05-25 22:51:38 +08:00
b065a2a741 fix:修复商品 review 提到的问题 2023-05-25 09:23:38 +08:00
53e9be733f mall:review + mall:快递公司管理 2023-05-24 23:40:55 +08:00
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
a70c7ca855 fix:完善 mall.sql 2023-05-23 11:59:48 +08:00
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
cac5545762 fix:完善商品管理, 完善 mall.sql, 完善 product 测试相关sql, 完善 ProductSpuServiceImplTest 测试 2023-05-23 11:01:40 +08:00
16956a6501 运费模板,区域选择使用懒加载优化性能 2023-05-22 23:08:21 +08:00
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
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
e942b52a67 mall:订单详情:调整售后字段 2023-05-21 12:18:52 +08:00
e745bb6675 mall:订单列表:增加订单类型的接入 2023-05-20 11:22:43 +08:00
be7c664e07 mall:订单统计接口 2023-05-20 10:11:38 +08:00
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
3da2eb89b2 新增快递公司功能 2023-05-18 23:37:56 +08:00
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
f129eab36f REVIEW 物流配送管理表 2023-05-16 21:41:40 +08:00
db73ddc942 REVIEW 物流配送管理表 2023-05-16 19:17:25 +08:00
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
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
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
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
7a792a7d48 商品收藏相关修改 2023-05-14 23:39:05 +08:00
7fef594390 订单接口的梳理 2023-05-14 17:35:34 +08:00
c21e88860f REVIEW 物流管理相关的表 2023-05-14 17:35:17 +08:00
85047bca7b feat: vben dict 2023-05-14 16:48:35 +08:00
467811a42e REVIEW 商品收藏的逻辑 v2 2023-05-14 09:07:45 +08:00
0ffa7ff4c8 发货配送模块表结构 2023-05-12 19:39:48 +08:00
wfm
494928ed88 feat:重放消息判断过期时间 2023-05-12 17:23:21 +08:00
e4a5a5672f StrUtils.maxLength会强制给后面加三个点,哪怕长度没有超过,优化长度不超过不加... 2023-05-12 16:36:55 +08:00
69ebfbe105 feat: 适配vue3.3 defineOptions 2023-05-12 11:19:57 +08:00
7c1a4db5a9 fix: 添加redis卷, 修改host绑定端口 2023-05-12 11:03:13 +08:00
9d68c62177 refactor: vben dict 2023-05-11 17:36:58 +08:00
4891f18538 perf: 添加docker-compose/name字段,ui/Dockerfile --frozen-lockfile 2023-05-10 23:39:31 +08:00
d794c2c198 fix: bpm/task路由错误 2023-05-10 23:12:12 +08:00
912e18857a feat: vben 文件上传 2023-05-10 17:28:41 +08:00
c3d9439030 perf: admin/Dockerfile 挂载包管理器缓存目录 2023-05-09 23:38:39 +08:00
8ec0be01a8 新增:达梦数据库驱动,KeyGenerator 2023-05-09 14:03:45 +08:00
6ac96facf6 新增:达梦数据库dm8 sql文件 2023-05-09 10:10:13 +08:00
0b3640a522 fix: required = true ==> requiredMode = Schema.RequiredMode.REQUIRED 2023-05-08 10:06:17 +08:00
d25062ec81 chore: up springboot 2.7.11 2023-05-08 10:04:57 +08:00
da2810dece chore: up easyexcel 3.3.0 2023-05-06 16:36:42 +08:00
6a4616b6ea chore: up springdoc 1.7.0 2023-05-06 16:32:28 +08:00
235882791f chore: up druid 1.2.17 2023-05-06 16:30:05 +08:00
5b13c07e01 chore: up springboot 2.7.11 2023-05-06 16:28:53 +08:00
be01cd4894 chore: up mapstruct 1.5.5.Final 2023-05-06 16:26:31 +08:00
023322cb25 chore: up hutool 5.8.18 2023-05-06 16:24:29 +08:00
14d02bdfb3 商品收藏修改 2023-05-06 11:58:27 +08:00
96e2bf020f REVIEW 商品收藏的逻辑 2023-05-05 23:38:31 +08:00
cd86620b74 REVIEW 商品管理的逻辑 2023-05-05 23:01:23 +08:00
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
810c7ed040 完善商品管理 2023-05-04 01:32:25 +08:00
c233ce1a20 合并分支修复差异 2023-05-03 22:18:27 +08:00
6b05835cb3 购物车:增加获得商品数量 Map 接口 2023-05-03 09:20:17 +08:00
e163ae8b70 完成商品保存和编辑数据回显 2023-05-03 02:31:50 +08:00
9980b12551 调整购物车接口,支持 add 商品时,适配前端可能要删除的情况 2023-05-03 00:30:02 +08:00
97502c8b51 fix: docker-compose添加自启动 2023-05-02 10:31:24 +08:00
70816371e5 初步完成商品CRUD 2023-05-02 02:33:14 +08:00
f7fe9ad7b0 1. 商城:调整购物车的失效逻辑实现,基于 SPU 是否下架
2. 商城:增加购物车失效的重选逻辑
2023-05-01 16:00:37 +08:00
6428f0fcaf 添加商品枚举 2023-05-01 14:47:00 +08:00
da162853ec 商城:完善购物车的逻辑 2023-04-30 20:32:01 +08:00
15ced47b17 添加多租户 2023-04-30 17:35:38 +08:00
c10ea9d9de 移除ProductSku相关的status属性,修改Property 2023-04-30 17:35:05 +08:00
24a56bb45f 移除ProductSku相关的status属性,修改Property 2023-04-30 17:34:56 +08:00
f56d394830 修改ProductSpuBaseVO第一版 2023-04-29 21:28:09 +08:00
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
2113e825d7 完善 App 商品详情逻辑的 10% 2023-04-27 22:43:37 +08:00
3851149338 feat: vue3 vben 支持富文本生成 2023-04-27 13:22:42 +08:00
7549ab2611 feat: vue3 vben 支持富文本生成 2023-04-27 13:22:22 +08:00
c88794f212 feat: vue3 vben 代码生成支持创建和更新两种表单 2023-04-27 13:17:03 +08:00
1df0fd1bf8 fix: vue3 vben 代码生成支持创建和更新两种表单 2023-04-27 13:10:32 +08:00
28f4456bbe fix: vue3 vben codegen 2023-04-27 11:43:48 +08:00
3ced6a3240 完善 App 商品搜索的逻辑 2023-04-26 20:13:12 +08:00
3219611a32 fix: vue3 vben codegen dict 2023-04-26 18:42:03 +08:00
4068548c45 移除ProductSpuSpecTypeEnum及相关引用 2023-04-26 17:38:42 +08:00
dbb75e1d9e doc: 添加docker/docker-compose文档 2023-04-25 22:55:25 +08:00
8e64e93d9e feat: docker-compose docker.env 2023-04-25 22:54:56 +08:00
c139be1966 perf: yudao-server/Dockerfile添加$ARGS参数 2023-04-25 22:54:11 +08:00
9bdd71dbf1 feat: Docker支持-yudao-ui-admin 2023-04-25 22:52:42 +08:00
a5f018104e 调整商品分类的实现 2023-04-25 21:33:59 +08:00
7c47fd47c1 fix: 代码生成:解决Java代码DO和VO中的警告。 2023-04-25 21:28:38 +08:00
f8e54dda30 feat: vben codegen 2023-04-25 18:26:27 +08:00
81b8f4171f fix: vue3 codegen PageReqVO 2023-04-25 14:50:49 +08:00
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
992a30486e 补充mall.sql 2023-04-24 11:09:57 +08:00
c3e36ba9da 修正相关问题让服务正常启动,改动位置都已加上TODO记录 2023-04-24 10:50:40 +08:00
6786aa352b 修正DO对齐数据库表字段,VO对齐前端 2023-04-24 10:29:02 +08:00
640a60231c 增加 vben 演示环境 2023-04-24 01:11:42 +08:00
91f63ff813 尝试修复项目第一次打包失败报Failed to execute goal org.apache.maven.plugins:maven-jar-plugin:3.3.0:jar 2023-04-22 19:44:03 +08:00
8ce8f4e3a8 尝试修复项目第一次打包失败报Failed to execute goal org.apache.maven.plugins:maven-jar-plugin:3.3.0:jar 2023-04-22 19:41:30 +08:00
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
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
552e9969cc fix: 代码生成:Vue3标准模板问题修复。 2023-04-21 18:07:28 +08:00
d3cd87767b 缺少ServletUtils引用
Signed-off-by: inypeacock <1300856@qq.com>
2023-04-21 05:13:54 +00:00
535413804b 1.7.2 版本发布 2023-04-19 20:44:19 +08:00
502fa11f1d Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 2023-04-19 18:10:59 +08:00
32da5aae84 商城:product:完善 ProductSpuDO 表 2023-04-19 18:07:22 +08:00
63542b4ccb 商城:product:完善 ProductSkuDO 表 2023-04-19 16:30:57 +08:00
b30fc28021 商城:product:完善 ProductSpuDO 表 2023-04-19 10:55:43 +08:00
d5a48e63a3 fix: 新建商品时商品分类状态判断错误 2023-04-16 21:53:24 +08:00
e5fcc7a387 boot3:适合 ServletUtils 2023-04-16 21:40:56 +08:00
d23ed5a61d 增加 Vue3 演示环境 2023-04-16 11:53:56 +08:00
a30ca26af8 删除多余"占位"文件 2023-04-15 15:44:55 +08:00
f62bf6c21c !432 将业务表单做为动态组件,直接显示到审批页面,不再需要点击查看
Merge pull request !432 from 疯狂的世界/flowable
2023-04-15 02:26:14 +00:00
e686de9d03 Merge remote-tracking branch 'origin/master' 2023-04-15 09:48:45 +08:00
fdea0ae0ea 优化请求头的 tenant-id 的解析逻辑,避免前端传错类型 2023-04-15 09:48:21 +08:00
89e785dc49 !457 【轻量级 PR】:解决敏感词导出和字典数据编辑保存的两个BUG
Merge pull request !457 from clockdotnet/master_pr
2023-04-15 01:39:41 +00:00
a3a3792693 !456 新建租户报错
Merge pull request !456 from LiZhongShi/master
2023-04-15 01:15:53 +00:00
d2ba90db5d 修复单元测试报错 2023-04-14 22:59:45 +08:00
206b5a5e47 解决字典数据编辑颜色清空不能保存问题 2023-04-14 22:15:50 +08:00
27c5b5f369 解决敏感词导出excel内容为500错误问题 2023-04-14 22:14:34 +08:00
c67a7f7b7d fix 新建租户页面无校验用户名密码 2023-04-14 16:04:30 +08:00
b27964b483 !454 vben 版本代码生成器
Merge pull request !454 from xingyu/feature/codegen_vben
2023-04-13 15:40:27 +00:00
8eac97ae12 移除 Vue3 专属菜单,统一菜单! 2023-04-13 23:38:27 +08:00
67ac794c62 feat: knife4j 4.1.0 2023-04-13 17:39:48 +08:00
ed996759bb docs: 升级最新依赖 添加vben版本前端地址 2023-04-13 16:55:19 +08:00
7265300f31 chore: 升级最新依赖 2023-04-13 15:46:01 +08:00
e3d74b1713 chore: 升级最新依赖 2023-04-13 15:44:20 +08:00
844d102a65 chore: up springboot 2.7.10 2023-04-13 15:43:01 +08:00
5aff120d77 chore: reset 2023-04-13 15:11:44 +08:00
01902c4345 chore: up minio 8.5.2 2023-04-13 14:53:36 +08:00
f839f89e93 chore: up esayexcel 3.2.1 2023-04-13 14:52:43 +08:00
70f632852b chore: up hutool 5.8.15 2023-04-13 14:51:50 +08:00
ce65b82fc9 docs: 添加 vue3 vben 版本说明 2023-04-13 14:45:15 +08:00
760a1d31d5 feat: 代码生成 vben 2023-04-13 14:43:18 +08:00
da0f9ca528 feat: 代码生成 vben 2023-04-13 14:42:18 +08:00
ce80c6f9d8 !453 代码生成时,增加 UI 类型的选择,可生成 Vue2、Vue3 多种管理后台的代码,支持 CRUD Schema 模式
Merge pull request !453 from 芋道源码/feature/codegen-front
2023-04-13 00:17:25 +00:00
d500332a18 代码生成,支持配置前端 UI 类型 2023-04-13 07:53:41 +08:00
cb6b7a754e Vue3 CRUD Schema 模版,index 和 form 完善 2023-04-12 23:11:04 +08:00
9d272e7941 Vue3 CRUD Schema 模版,data 完整提交 2023-04-12 22:40:53 +08:00
a65b8f63b7 Vue3 CRUD Schema 模版,data 部分提交 2023-04-10 23:20:38 +08:00
9a5d7c8646 Vue3 CRUD Schema 模版,部分提交 2023-04-10 22:31:04 +08:00
70de47c156 fix: yudao-ui-admin前端-Cron表达式-周选择第4项,#号两边的值颠倒了 2023-04-10 17:15:12 +08:00
0e3904b613 代码生成时,前端 vue 增加组件名 2023-04-09 21:32:26 +08:00
de782479be 优化 ProjectReactor 提示 2023-04-09 11:19:55 +08:00
5c0161d762 修复租户名的重复问题 2023-04-09 11:12:24 +08:00
aa16b8279f !446 配合周建进行测试所提bug的后端修改
Merge pull request !446 from clockdotnet/master_pr
2023-04-09 02:30:08 +00:00
75c74590e5 修复工作流创建流程时,流程名可能不存在的问题 2023-04-09 10:21:29 +08:00
5656a0b0b7 修复支付通知的通知 Transaction 不生效的问题 2023-04-09 10:13:42 +08:00
e2d6898723 !450 fix:同一个类中:A方法(无事务)调B方法(有事务),事务不生效问题
Merge pull request !450 from yuerspring/master
2023-04-09 02:10:35 +00:00
caeb23a3dc Merge remote-tracking branch 'origin/feature/codegen-front' into feature/codegen-front 2023-04-09 10:05:29 +08:00
1737fd3af9 修改公众号的 mpuser 的包名 2023-04-09 10:05:23 +08:00
fe6593466f !451 xss请求Wrapper getAttribute方法 问题修复
Merge pull request !451 from zhangxingjia/master
2023-04-09 02:04:43 +00:00
f46c0e24fe 所有菜单的 name 都加上模块的前缀,避免冲突 2023-04-08 17:40:45 +00:00
00a2818c01 增加 swagger、druid、skywalking、admin 的自定义路径 2023-04-08 17:40:45 +00:00
99f92310e2 优化 Vue3 模版,修改 title、visible 变量 2023-04-08 17:40:45 +00:00
79eb90d653 1. 优化代码生成模版
2. 优化 Vue2 所在目录
2023-04-08 17:40:45 +00:00
e8d2dc513b 代码生成:完善 Vue3 标准模版的表单 2023-04-08 17:40:45 +00:00
e96f052a06 代码生成:完善 Vue3 标准模版的表单 2023-04-08 17:40:45 +00:00
d6227f7767 代码生成:完善 Vue3 标准模版的列表,在 80 长度下的排版问题 2023-04-08 17:40:45 +00:00
975b978e37 代码生成:完善 Vue3 标准模版的列表 2023-04-08 17:40:45 +00:00
4f00d923af 代码生成:支持 Vue3 标准模版的列表 2023-04-08 17:40:45 +00:00
6879fcd94f 改造代码生成器,支持多种前端模版 2023-04-08 17:40:45 +00:00
adb8b58967 所有菜单的 name 都加上模块的前缀,避免冲突 2023-04-08 11:49:28 +08:00
04c3cdf372 增加 swagger、druid、skywalking、admin 的自定义路径 2023-04-07 23:25:43 +08:00
bc6eaea2b4 fix xss请求Wrapper getAttribute方法 问题修复 2023-04-07 19:07:33 +08:00
70514a0ac2 fix:同一个类中:A方法(无事务)调B方法(有事务),事务不生效问题 2023-04-03 14:00:24 +08:00
2b1e5f1a3a 解决登录时输入无效租户名称登录失败提示不友好问题,还原修改 2023-04-03 12:56:25 +08:00
92cf4b9e63 租户添加或修改时租户名称改为不可以重复,否则会造成重复名称的租户无法正常登录的问题,按规范优化代码 2023-04-03 12:55:06 +08:00
70a10b26d2 优化 Vue3 模版,修改 title、visible 变量 2023-04-03 00:35:29 +08:00
b024c716ed 增加 CodegenTableDO 自增标识 2023-04-02 19:23:04 +08:00
09afdaafcf !24 【轻量级 PR】:PasswordEncoder 加密复杂度自定义 2023-04-02 19:12:32 +08:00
b9ba17a477 !31 IP查询导致异常问题 2023-04-02 19:01:46 +08:00
28da6b0c24 1. 优化代码生成模版
2. 优化 Vue2 所在目录
2023-04-02 18:58:01 +08:00
bb0110656b !440 test: job 租户单元测试
Merge pull request !440 from 与或非/test/tenant-job
2023-04-02 04:13:36 +00:00
3e0d7d87fb !426 bugfix: 转换HistoricTaskInstance.createTime -> BpmTaskRespVO.createTime
Merge pull request !426 from SuperHao/N/A
2023-04-02 04:11:36 +00:00
c12c780d29 !438 fix: 短信验证码登录问题
Merge pull request !438 from 打听幸福的下落/master
2023-04-02 04:09:29 +00:00
8734686601 !447 大陆手机号码是否正确的正则优化
Merge pull request !447 from 冰是睡着的水/N/A
2023-04-02 04:00:30 +00:00
f6d3f30961 !442 原来的Date类型查询订单返回时间差8个小时,项目全局使用LocalDateTime时间
Merge pull request !442 from chop/N/A
2023-04-02 03:51:46 +00:00
fbbd3bc66c 优化大陆手机号验证。以19013896321为例,原来的正则匹配结果为false。
Signed-off-by: 冰是睡着的水 <850083043@qq.com>
2023-04-01 03:34:22 +00:00
64cd19f7db 解决新增租户时创建的租户第一个用户性别为无效值的问题,前端改了,后端还是默认0即未知吧 2023-03-30 21:15:26 +08:00
f276f9d5c2 .gitignore 2023-03-30 16:49:19 +08:00
f4fdc4592e yarn.lock 2023-03-30 16:47:09 +08:00
1802510777 Revert "gitignore"
This reverts commit 3645d9d6
2023-03-30 16:46:17 +08:00
55358aa170 租户添加或修改时租户名称改为不可以重复,否则会造成重复名称的租户无法正常登录的问题 2023-03-30 16:00:25 +08:00
ea4ca187c7 解决配置文件导出缺少参数键名及其他字段不正确的问题 2023-03-30 15:56:07 +08:00
b8628f75c5 解决新增租户时创建的租户第一个用户性别为无效值0的问题 2023-03-30 15:19:20 +08:00
774d8291b7 解决配置管理新增时是否可见为空报错信息不正确问题 2023-03-30 14:57:33 +08:00
8d2c33e9b0 解决字符串型字段等值查询条件前端传空字符串不能正常忽略问题 2023-03-29 21:19:18 +08:00
af4f52a25f 解决代码生成页面实体查询条件无效问题 2023-03-29 21:15:12 +08:00
37fcc5cbe7 解决登录时输入无效租户名称登录失败提示不友好问题 2023-03-29 21:14:05 +08:00
38d7d75f7f [新增][商品评价]管理后台/APP端
1. 增加头像返回字段
2. 调整商户自评userId
3. 控制评论图片数量判断
2023-03-23 14:06:14 +08:00
13f9d0f49f 代码生成:完善 Vue3 标准模版的表单 2023-03-22 20:50:09 +08:00
0ff007c783 代码生成:完善 Vue3 标准模版的表单 2023-03-22 00:06:13 +08:00
5c404c62ee 代码生成:完善 Vue3 标准模版的列表,在 80 长度下的排版问题 2023-03-21 22:38:42 +08:00
c29b061f4c Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-03-21 11:17:10 +08:00
6fe5f4bc0d [新增][商品评价]管理后台/APP端 2023-03-21 11:09:10 +08:00
14e7c52e0e 原来的Date类型查询订单返回时间差8个小时,项目全局使用LocalDateTime时间
原来的Date类型查询订单返回时间差8个小时,项目全局使用LocalDateTime时间

Signed-off-by: chop <935048000@qq.com>
2023-03-21 02:35:42 +00:00
eb2e33f318 代码生成:完善 Vue3 标准模版的列表 2023-03-20 22:57:08 +08:00
348a0ff02a test: 修复 code view 存在的问题 2023-03-20 21:50:53 +08:00
cbf5ef5953 [新增][商品评价]管理后台
1. 显示 / 隐藏评论
2. 商家回复
2023-03-19 22:07:07 +08:00
d15995e7f9 代码生成:支持 Vue3 标准模版的列表 2023-03-19 20:57:55 +08:00
da53a041da [新增][商品评价]管理后台分页查询 2023-03-19 18:59:51 +08:00
f69d8503a2 [新增][商品评价]
1. 实体类
2. h2.sql
2023-03-19 15:47:49 +08:00
c1935fba2d Merge remote-tracking branch 'origin/master' into feature/mall_product 2023-03-19 11:36:00 +08:00
f07191437e 改造代码生成器,支持多种前端模版 2023-03-19 01:17:26 +08:00
b54c5eaa45 test: job 租户单元测试 2023-03-18 20:53:33 +08:00
467170d3de Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro 2023-03-16 22:43:58 +08:00
c2748585b1 fix: 短信验证码登录不显示获取验证码按钮问题 2023-03-16 21:23:43 +08:00
cdaff5c63f !437 补充缺失的6张表对应的6个序列
Merge pull request !437 from libran/N/A
2023-03-16 13:09:26 +00:00
12527840e8 !435 补充上缺失的6张表
Merge pull request !435 from libran/N/A
2023-03-16 13:08:36 +00:00
350cdbad11 !436 补充system_menu表缺失的两个字段和数据:component_name、always_show
Merge pull request !436 from libran/N/A
2023-03-16 13:06:58 +00:00
aae6f12832 fix: MybatisPlus 主键策略使用雪花算法 ASSIGN_ID 时,获取登录验证码主键精度丢失问题
SmsCodeDO 主键类型为 Integer,使用雪花算法后 Long 转 Integer 精度丢失,system_sms_code 表数据入库后主键为负数
2023-03-16 20:25:29 +08:00
0218f24b94 补充缺失的6张表对应的6个序列
补充缺失的6张表对应的6个序列:
system_mail_account_seq
system_mail_log_seq
system_mail_template_seq
system_notify_message_seq
system_notify_template_seq
system_user_session_seq

Signed-off-by: libran <fang.jian@126.com>
2023-03-16 07:58:42 +00:00
b7db210d94 update sql/postgresql/ruoyi-vue-pro.sql.
补充system_menu表缺失的两个字段和数据:component_name、always_show

Signed-off-by: libran <fang.jian@126.com>
2023-03-16 07:45:20 +00:00
83b0546b7e update sql/postgresql/ruoyi-vue-pro.sql.
补充上缺失的6张表:
system_mail_account
system_mail_log
system_mail_template
system_notify_message
system_notify_template
system_user_session

Signed-off-by: libran <fang.jian@126.com>
2023-03-16 07:42:30 +00:00
9c4e54a5ce !434 [新增]mybatis模块新增Mybaits-plus-join插件依赖
Merge pull request !434 from wangzhs/feature/mybatis-plus-join
2023-03-15 14:06:37 +00:00
b0c73b786a [测试][商品分类]测试创建商品分类 2023-03-15 14:23:42 +08:00
5674bfafc8 [修改][商品分类]分类只能存在2级 2023-03-15 14:03:00 +08:00
b89d7ff384 [修改][商品分类]
1. 删除 description 分类描述字段
2. 新增big_pic_url PC端分类图字段
2023-03-15 13:44:13 +08:00
4a01348e0b [新增][商品分类] 列表查询筛选增加 status、parentId 字段 2023-03-15 11:36:45 +08:00
1811b96eb5 Merge remote-tracking branch 'origin/master' into feature/mall_product 2023-03-14 23:05:19 +08:00
900d12bab8 fix:清除关联依赖 2023-03-14 21:48:21 +08:00
35851b7c1d fix:清除关联依赖 2023-03-14 21:47:17 +08:00
69fa19a856 删除单测方法 2023-03-14 21:45:09 +08:00
80b7352d9a 删除测试AdminUserDO中Dept实体对象 2023-03-14 20:58:28 +08:00
112663a3b5 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-03-14 12:06:05 +08:00
f9569f910f 切换 Mybatis-plus-join 依赖 2023-03-13 18:32:43 +08:00
95159b0257 调整Mybaits Plus Join的SQL注入器到YudaoMybatisAutoConfiguration 2023-03-13 09:52:27 +08:00
7e0fb6cb56 调整Mybaits Plus Join的SQL注入器到YudaoMybatisAutoConfiguration 2023-03-12 17:43:42 +08:00
ef510f9478 增加 mybatis plus join 集成的修改建议 2023-03-11 18:23:07 +08:00
670f67e551 新增 mybatis-plus-join 2023-03-11 17:47:15 +08:00
d87dd934b2 Merge pull request #228 from xiaohe4966/master
修复生成代码测试里面的时间问题(buildBetweenTime方法)
2023-03-11 10:19:18 +08:00
d430f6cb26 Merge pull request #225 from xuing/master
修复某些情况下ContextHolder的NPE异常
2023-03-11 10:12:38 +08:00
693ecb2813 !430 积木报告建表语句错误
Merge pull request !430 from 疯狂的世界/dev
2023-03-11 02:01:26 +00:00
db86e90177 修复生成代码测试里面的时间问题(buildBetweenTime方法) 2023-03-10 11:33:02 +08:00
8245f8a369 将业务表单做为动态组件,直接显示到审批页面,不再需要点击查看 2023-03-09 00:23:27 +08:00
eed3d8b18d 修复ContextHolder的NPE异常 2023-03-08 20:16:19 +08:00
147091fa08 修复积木报表建表语句错误 2023-03-08 19:41:46 +08:00
1c1894af7d !428 补充update分隔符
Merge pull request !428 from joinfriend/N/A
2023-03-07 23:54:13 +00:00
ede7aabb55 补充update分隔符
Signed-off-by: joinfriend <277784977@163.com>
2023-03-07 17:25:00 +00:00
0cd24436d8 !427 【轻量级PR】flowable自动建表问题
Merge pull request !427 from LinkLi/master
2023-03-06 13:38:45 +00:00
0751e57dd8 fix: 若同个服务器内其他数据库有相同的工作流表,flowable不会建表的问题 2023-03-06 16:00:36 +08:00
b761a7b462 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
 Conflicts:
	yudao-ui-admin/yarn.lock
2023-03-06 11:28:00 +08:00
4592b79deb bugfix: 转换HistoricTaskInstance.createTime -> BpmTaskRespVO.createTime
Signed-off-by: SuperHao <jacky.jihao@gmail.com>
2023-03-01 02:17:20 +00:00
f8d8fdfb35 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-02-13 11:26:02 +08:00
0709b807d9 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-02-09 11:09:40 +08:00
2871c255e5 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-02-06 15:01:36 +08:00
c0639d713f Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-02-06 11:35:34 +08:00
4247061b96 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
 Conflicts:
	yudao-ui-admin/yarn.lock
2023-02-01 11:01:23 +08:00
4584774d74 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-01-10 16:09:16 +08:00
cb881018ce Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
 Conflicts:
	yudao-ui-admin/yarn.lock
2022-12-29 14:35:53 +08:00
f478448ec9 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
 Conflicts:
	yudao-ui-admin/yarn.lock
2022-11-24 15:01:21 +08:00
87c40a4ab1 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2022-11-03 09:44:48 +08:00
3e936f3959 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
 Conflicts:
	yudao-ui-admin/yarn.lock
2022-09-16 11:05:25 +08:00
44e2a710fc Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2022-09-01 09:49:09 +08:00
17206e1df5 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2022-08-08 10:37:06 +08:00
784a4f0591 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
 Conflicts:
	.gitignore
	yudao-ui-admin/yarn.lock
2022-07-29 09:50:58 +08:00
3645d9d6e9 gitignore 2022-07-21 10:40:31 +08:00
4975 changed files with 166845 additions and 211593 deletions

1
.gitattributes vendored
View File

@ -1 +0,0 @@
*.sql linguist-language=java

104
.gitignore vendored
View File

@ -1,51 +1,53 @@
######################################################################
# Build Tools
.gradle
/build/
!gradle/wrapper/gradle-wrapper.jar
target/
!.mvn/wrapper/maven-wrapper.jar
######################################################################
# IDE
### STS ###
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
### IntelliJ IDEA ###
.idea
*.iws
*.iml
*.ipr
### NetBeans ###
nbproject/private/
build/*
nbbuild/
dist/
nbdist/
.nb-gradle/
######################################################################
# Others
*.log
*.xml.versionsBackup
*.swp
!*/build/*.java
!*/build/*.html
!*/build/*.xml
### JRebel ###
rebel.xml
application-my.yaml
/yudao-ui-app/unpackage/
######################################################################
# Build Tools
.gradle
/build/
!gradle/wrapper/gradle-wrapper.jar
target/
!.mvn/wrapper/maven-wrapper.jar
.flattened-pom.xml
######################################################################
# IDE
### STS ###
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
### IntelliJ IDEA ###
.idea
*.iws
*.iml
*.ipr
### NetBeans ###
nbproject/private/
build/*
nbbuild/
dist/
nbdist/
.nb-gradle/
######################################################################
# Others
*.log
*.xml.versionsBackup
*.swp
!*/build/*.java
!*/build/*.html
!*/build/*.xml
### JRebel ###
rebel.xml
application-my.yaml
/yudao-ui-app/unpackage/

BIN
.image/Java监控.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 112 KiB

BIN
.image/MySQL.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 142 KiB

BIN
.image/OA请假-列表.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 152 KiB

BIN
.image/OA请假-发起.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 68 KiB

BIN
.image/OA请假-详情.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 65 KiB

BIN
.image/Redis.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 95 KiB

BIN
.image/admin-uniapp/01.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

BIN
.image/admin-uniapp/02.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

BIN
.image/admin-uniapp/03.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

BIN
.image/admin-uniapp/04.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.7 KiB

BIN
.image/admin-uniapp/05.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 56 KiB

BIN
.image/admin-uniapp/06.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.6 KiB

BIN
.image/admin-uniapp/07.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

BIN
.image/admin-uniapp/08.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

BIN
.image/admin-uniapp/09.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 204 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 139 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 69 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 201 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 60 KiB

BIN
.image/个人中心.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 37 KiB

BIN
.image/代码生成.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 130 KiB

BIN
.image/令牌管理.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 89 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 89 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 160 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 150 KiB

BIN
.image/任务日志.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 124 KiB

BIN
.image/商户信息.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 83 KiB

BIN
.image/在线用户.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 73 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 53 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 109 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 69 KiB

BIN
.image/字典数据.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 78 KiB

BIN
.image/字典类型.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 126 KiB

BIN
.image/定时任务.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 74 KiB

BIN
.image/岗位管理.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 80 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 93 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 93 KiB

BIN
.image/应用管理.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 55 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 176 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 91 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 87 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 37 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 41 KiB

BIN
.image/操作日志.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 98 KiB

BIN
.image/支付订单.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 208 KiB

BIN
.image/敏感词.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 47 KiB

BIN
.image/数据库文档.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 97 KiB

BIN
.image/文件管理.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 74 KiB

BIN
.image/文件管理2.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 114 KiB

BIN
.image/文件配置.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 116 KiB

BIN
.image/日志中心.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 84 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 173 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 125 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 125 KiB

BIN
.image/流程表单.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 148 KiB

BIN
.image/生成效果.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 128 KiB

BIN
.image/用户分组.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 82 KiB

BIN
.image/用户管理.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 112 KiB

BIN
.image/登录.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 93 KiB

BIN
.image/登录日志.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 77 KiB

BIN
.image/短信日志.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 41 KiB

BIN
.image/短信模板.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 248 KiB

BIN
.image/短信渠道.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 80 KiB

BIN
.image/租户套餐.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 96 KiB

BIN
.image/租户管理.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 115 KiB

BIN
.image/系统接口.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 91 KiB

BIN
.image/菜单管理.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 129 KiB

BIN
.image/表单构建.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 102 KiB

BIN
.image/角色管理.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 85 KiB

BIN
.image/访问日志.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 73 KiB

BIN
.image/退款订单.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 92 KiB

BIN
.image/通知公告.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 77 KiB

BIN
.image/部门管理.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 109 KiB

BIN
.image/配置管理.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 89 KiB

BIN
.image/链路追踪.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 80 KiB

BIN
.image/错误日志.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 110 KiB

BIN
.image/错误码管理.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 131 KiB

BIN
.image/首页.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 62 KiB

310
README.md
View File

@ -1,3 +1,9 @@
<p align="center">
<img src="https://img.shields.io/badge/Spring%20Boot-2.7.18-blue.svg" alt="Downloads">
<img src="https://img.shields.io/badge/Vue-3.2-blue.svg" alt="Downloads">
<img src="https://img.shields.io/github/license/YunaiV/ruoyi-vue-pro"/>
</p>
**严肃声明:现在、未来都不会有商业版本,所有代码全部开源!**
**「我喜欢写代码,乐此不疲」**
@ -9,7 +15,9 @@
## 🐶 新手必读
* 演示地址:<http://dashboard.yudao.iocoder.cn>
* 演示地址【Vue3 + element-plus】<http://dashboard-vue3.yudao.iocoder.cn>
* 演示地址【Vue3 + vben(ant-design-vue)】:<http://dashboard-vben.yudao.iocoder.cn>
* 演示地址【Vue2 + element-ui】<http://dashboard.yudao.iocoder.cn>
* 启动文档:<https://doc.iocoder.cn/quick-start/>
* 视频教程:<https://doc.iocoder.cn/video/>
@ -21,30 +29,32 @@
>
> 😜 给项目点点 Star 吧,这对我们真的很重要!
![架构图](https://static.iocoder.cn/ruoyi-vue-pro-architecture.png?imageView2/2/format/webp)
![架构图](/.image/common/ruoyi-vue-pro-architecture.png)
* 管理后台的 Vue3 版本采用 [vue-element-plus-admin](https://gitee.com/kailong110120130/vue-element-plus-admin) Vue2 版本采用 [vue-element-admin](https://github.com/PanJiaChen/vue-element-admin)
* 管理后台的移动端采用 [uni-app](https://github.com/dcloudio/uni-app) 方案,一份代码多终端适配,同时支持 APP、小程序、H5
* Java 后端:`master` 分支为 JDK 8 + Spring Boot 2.7.18`master-jdk21` 分支为 JDK21 + Spring Boot 3.2.0
* 管理后台的电脑端Vue3 提供 `element-plus``vben(ant-design-vue)` 两个版本Vue2 提供 `element-ui` 版本
* 管理后台的移动端:采用 `uni-app` 方案,一份代码多终端适配,同时支持 APP、小程序、H5
* 后端采用 Spring Boot 多模块架构、MySQL + MyBatis Plus、Redis + Redisson
* 数据库可使用 MySQL、Oracle、PostgreSQL、SQL Server、MariaDB、国产达梦 DM、TiDB 等
* 消息队列可使用 Event、Redis、RabbitMQ、Kafka、RocketMQ 等
* 权限认证使用 Spring Security & Token & Redis支持多终端、多种用户的认证系统支持 SSO 单点登录
* 支持加载动态权限菜单,按钮级别权限控制,本地缓存提升性能
* 支持加载动态权限菜单,按钮级别权限控制,Redis 缓存提升性能
* 支持 SaaS 多租户,可自定义每个租户的权限,提供透明化的多租户底层封装
* 工作流使用 Flowable支持动态表单、在线设计流程、会签 / 或签、多种任务分配方式
* 高效率开发,使用代码生成器可以一键生成前后端代码 + 单元测试 + Swagger 接口文档 + Validator 参数校验
* 高效率开发,使用代码生成器可以一键生成 Java、Vue 前后端代码、SQL 脚本、接口文档,支持单表、树表、主子表
* 实时通信,采用 Spring WebSocket 实现,内置 Token 身份校验,支持 WebSocket 集群
* 集成微信小程序、微信公众号、企业微信、钉钉等三方登陆,集成支付宝、微信等支付与退款
* 集成阿里云、腾讯云等短信渠道,集成 MinIO、阿里云、腾讯云、七牛云等云存储服务
* 集成报表设计器、大屏设计器,通过拖拽即可生成酷炫的报表与大屏
## 🐳 项目关系
![架构演进](https://static.iocoder.cn/yudao-roadmap.png?imageView2/2/format/webp)
![架构演进](/.image/common/yudao-roadmap.png)
三个项目的功能对比,可见社区共同整理的 [国产开源项目对比](https://www.yuque.com/xiatian-bsgny/lm0ec1/wqf8mn) 表格。
### 后端项目
| 项目 | Star | 简介 |
|-----------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------|
| [ruoyi-vue-pro](https://gitee.com/zhijiantianya/ruoyi-vue-pro) | [![Gitee star](https://gitee.com/zhijiantianya/ruoyi-vue-pro/badge/star.svg?theme=white)](https://gitee.com/zhijiantianya/ruoyi-vue-pro) [![GitHub stars](https://img.shields.io/github/stars/YunaiV/ruoyi-vue-pro.svg?style=social&label=Stars)](https://github.com/YunaiV/ruoyi-vue-pro) | 基于 Spring Boot 多模块架构 |
@ -53,27 +63,36 @@
### 前端项目
| 项目 | Star | 简介 |
|----------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------|
| [yudao-ui-admin-vue3](https://gitee.com/yudaocode/yudao-ui-admin-vue3) | [![Gitee star](https://gitee.com/yudaocode/yudao-ui-admin-vue3/badge/star.svg?theme=white)](https://gitee.com/yudaocode/yudao-ui-admin-vue3) [![GitHub stars](https://img.shields.io/github/stars/yudaocode/yudao-ui-admin-vue3.svg?style=social&label=Stars)](https://github.com/yudaocode/yudao-ui-admin-vue3) | 基于 Vue3 + element-plus 实现的管理后台 |
| [yudao-ui-admin](https://gitee.com/zhijiantianya/ruoyi-vue-pro/tree/master/yudao-ui-admin) | [![Gitee star](https://gitee.com/zhijiantianya/ruoyi-vue-pro/badge/star.svg?theme=white)](https://gitee.com/zhijiantianya/ruoyi-vue-pro/tree/master/yudao-ui-admin) [![GitHub stars](https://img.shields.io/github/stars/YunaiV/ruoyi-vue-pro.svg?style=social&label=Stars)](https://github.com/YunaiV/ruoyi-vue-pro/tree/master/yudao-ui-admin) | 基于 Vue2 + element-ui 实现的管理后台 |
| [yudao-ui-admin-uniapp](https://gitee.com/zhijiantianya/ruoyi-vue-pro/tree/master/yudao-ui-admin-uniapp) | [![Gitee star](https://gitee.com/zhijiantianya/ruoyi-vue-pro/badge/star.svg?theme=white)](https://gitee.com/zhijiantianya/ruoyi-vue-pro/tree/master/yudao-ui-admin-uniapp) [![GitHub stars](https://img.shields.io/github/stars/YunaiV/ruoyi-vue-pro.svg?style=social&label=Stars)](https://github.com/YunaiV/ruoyi-vue-pro/tree/master/yudao-ui-admin-uniapp) | 基于 uni-app + uni-ui 实现的管理后台的小程序 |
| [yudao-ui-go-view](https://gitee.com/yudaocode/yudao-ui-go-view) | [![Gitee star](https://gitee.com/yudaocode/yudao-ui-go-view/badge/star.svg?theme=white)](https://gitee.com/yudaocode/yudao-ui-go-view) [![GitHub stars](https://img.shields.io/github/stars/yudaocode/yudao-ui-go-view.svg?style=social&label=Stars)](https://github.com/yudaocode/yudao-ui-go-view) | 基于 Vue3 + naive-ui 实现的大屏报表 |
| [yudao-ui-app](https://gitee.com/zhijiantianya/ruoyi-vue-pro/tree/master/yudao-ui-app) | [![Gitee star](https://gitee.com/zhijiantianya/ruoyi-vue-pro/badge/star.svg?theme=white)](https://gitee.com/zhijiantianya/ruoyi-vue-pro/tree/master/yudao-ui-app) [![GitHub stars](https://img.shields.io/github/stars/YunaiV/ruoyi-vue-pro.svg?style=social&label=Stars)](https://github.com/YunaiV/ruoyi-vue-pro/tree/master/yudao-ui-app) | 基于 uni-app + uview 实现的用户 App |
| 项目 | Star | 简介 |
|----------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------|
| [yudao-ui-admin-vue3](https://gitee.com/yudaocode/yudao-ui-admin-vue3) | [![Gitee star](https://gitee.com/yudaocode/yudao-ui-admin-vue3/badge/star.svg?theme=white)](https://gitee.com/yudaocode/yudao-ui-admin-vue3) [![GitHub stars](https://img.shields.io/github/stars/yudaocode/yudao-ui-admin-vue3.svg?style=social&label=Stars)](https://github.com/yudaocode/yudao-ui-admin-vue3) | 基于 Vue3 + element-plus 实现的管理后台 |
| [yudao-ui-admin-vben](https://gitee.com/yudaocode/yudao-ui-admin-vben) | [![Gitee star](https://gitee.com/yudaocode/yudao-ui-admin-vben/badge/star.svg?theme=white)](https://gitee.com/yudaocode/yudao-ui-admin-vben) [![GitHub stars](https://img.shields.io/github/stars/yudaocode/yudao-ui-admin-vben.svg?style=social&label=Stars)](https://github.com/yudaocode/yudao-ui-admin-vben) | 基于 Vue3 + vben(ant-design-vue) 实现的管理后台 |
| [yudao-mall-uniapp](https://gitee.com/yudaocode/yudao-mall-uniapp) | [![Gitee star](https://gitee.com/yudaocode/yudao-mall-uniapp/badge/star.svg?theme=white)](https://gitee.com/yudaocode/yudao-mall-uniapp) [![GitHub stars](https://img.shields.io/github/stars/yudaocode/yudao-mall-uniapp.svg?style=social&label=Stars)](https://github.com/yudaocode/yudao-mall-uniapp) | 基于 uni-app 实现的商城小程序 |
| [yudao-ui-admin-vue2](https://gitee.com/yudaocode/yudao-ui-admin-vue2) | [![Gitee star](https://gitee.com/yudaocode/yudao-ui-admin-vue2/badge/star.svg?theme=white)](https://gitee.com/yudaocode/yudao-ui-admin-vue2) [![GitHub stars](https://img.shields.io/github/stars/yudaocode/yudao-ui-admin-vue2.svg?style=social&label=Stars)](https://github.com/yudaocode/yudao-ui-admin-vue2) | 基于 Vue2 + element-ui 实现的管理后台 |
| [yudao-ui-admin-uniapp](https://gitee.com/yudaocode/yudao-ui-admin-uniapp) | [![Gitee star](https://gitee.com/yudaocode/yudao-ui-admin-uniapp/badge/star.svg?theme=white)](https://gitee.com/yudaocode/yudao-ui-admin-uniapp) [![GitHub stars](https://img.shields.io/github/stars/yudaocode/yudao-ui-admin-uniapp.svg?style=social&label=Stars)](https://github.com/yudaocode/yudao-ui-admin-uniapp) | 基于 Vue2 + element-ui 实现的管理后台 |
| [yudao-ui-go-view](https://gitee.com/yudaocode/yudao-ui-go-view) | [![Gitee star](https://gitee.com/yudaocode/yudao-ui-go-view/badge/star.svg?theme=white)](https://gitee.com/yudaocode/yudao-ui-go-view) [![GitHub stars](https://img.shields.io/github/stars/yudaocode/yudao-ui-go-view.svg?style=social&label=Stars)](https://github.com/yudaocode/yudao-ui-go-view) | 基于 Vue3 + naive-ui 实现的大屏报表 |
## 🐰 分支说明
| | JDK 8 完整版 | JDK 8 精简版 | JDK 17 完整版 |
|-------|-----------------------------------------------------------|--------------------------------------------------------------------|-----------------------------------------------------------------------------|
| 分支 | [`master`](https://gitee.com/zhijiantianya/ruoyi-vue-pro) | [`mini`](https://gitee.com/zhijiantianya/ruoyi-vue-pro/tree/mini/) | [`boot-dev`](https://gitee.com/zhijiantianya/ruoyi-vue-pro/tree/boot3-dev/) |
| 说明 | 包括所有功能 | 只保留核心功能 | 适配 Spring Boot 3.X |
| 系统功能 | √ | √ | √ |
| 基础设施 | √ | √ | √ |
| 会员中心 | √ | √ | √ |
| 工作流程 | √ | x | 适配中 |
| 数据报表 | √ | x | 适配中 |
| 商城系统 | √ | x | √ |
| 微信公众号 | √ | x | √ |
### ⬅️ 完整版
【完整版】包括系统功能、基础设施、会员中心、数据报表、工作流程、商城系统、微信公众号、CRM 等功能
* JDK 8 + Spring Boot 2.7.18 版本:<https://gitee.com/zhijiantianya/ruoyi-vue-pro>`master` 分支
* JDK 21 + Spring Boot 3.2.0 版本:<https://gitee.com/zhijiantianya/ruoyi-vue-pro>`master-jdk21` 分支
两个分支的功能是一致的,可以放心使用!
### ➡️️ 精简版
【精简版】只包括系统功能、基础设施功能不包括会员中心、数据报表、工作流程、商城系统、微信公众号、CRM 等功能
* JDK 8 + Spring Boot 2.7.18 版本:<https://gitee.com/yudaocode/yudao-boot-mini>`master` 分支
* JDK 21 + Spring Boot 3.2.0 版本:<https://gitee.com/yudaocode/yudao-boot-mini>`master-jdk21` 分支
如果你想把【完整版】的功能,迁移到【精简版】,可以参考 [《迁移功能到精简版》](https://doc.iocoder.cn/migrate-module/) 文档。
如果你想把【完整版】的功能,迁移到【精简版】,可以参考 [《迁移功能到精简版》](https://doc.iocoder.cn/migrate-module/) 文档。
## 😎 开源协议
@ -83,9 +102,9 @@
② 代码全部开源,不会像其他项目一样,只开源部分代码,让你无法了解整个项目的架构设计。[国产开源项目对比](https://www.yuque.com/xiatian-bsgny/lm0ec1/wqf8mn)
![开源项目对比](https://static.iocoder.cn/project-vs.png?imageView2/2/format/webp/w/1280)
![开源项目对比](/.image/common/project-vs.png)
③ 代码整洁、架构整洁,遵循《阿里巴巴 Java 开发手册》规范,代码注释详细,57000 行 Java 代码,22000 行代码注释。
③ 代码整洁、架构整洁,遵循《阿里巴巴 Java 开发手册》规范,代码注释详细,113770 行 Java 代码,42462 行代码注释。
## 🤝 项目外包
@ -99,7 +118,7 @@
系统内置多种多种业务功能,可以用于快速你的业务系统:
![功能分层](https://static.iocoder.cn/ruoyi-vue-pro-biz.png)
![功能分层](/.image/common/ruoyi-vue-pro-biz.png)
* 系统功能
* 基础设施
@ -109,6 +128,8 @@
* 数据报表
* 商城系统
* 微信公众号
* ERP 系统
* CRM 系统
> 友情提示:本项目基于 RuoYi-Vue 修改,**重构优化**后端的代码,**美化**前端的界面。
>
@ -157,36 +178,36 @@
| | 功能 | 描述 |
|-----|------|---------------------------|
| 🚀 | 商户信息 | 管理商户信息,支持 Saas 场景下的多商户功能 |
| 🚀 | 应用信息 | 配置商户的应用信息,对接支付宝、微信等多个支付渠道 |
| 🚀 | 支付订单 | 查看用户发起的支付宝、微信等的【支付】订单 |
| 🚀 | 退款订单 | 查看用户发起的支付宝、微信等的【退款】订单 |
ps核心功能已经实现正在对接微信小程序中...
| 🚀 | 回调通知 | 查看支付回调业务的【支付】【退款】的通知结果 |
| 🚀 | 接入示例 | 提供接入支付系统的【支付】【退款】的功能实战 |
### 基础设施
| | 功能 | 描述 |
|-----|----------|----------------------------------------------|
| 🚀 | 代码生成 | 前后端代码的生成Java、Vue、SQL、单元测试支持 CRUD 下载 |
| 🚀 | 系统接口 | 基于 Swagger 自动生成相关的 RESTful API 接口文档 |
| 🚀 | 数据库文档 | 基于 Screw 自动生成数据库文档,支持导出 Word、HTML、MD 格式 |
| | 表单构建 | 拖动表单元素生成相应的 HTML 代码,支持导出 JSON、Vue 文件 |
| 🚀 | 配置管理 | 对系统动态配置常用参数,支持 SpringBoot 加载 |
| ⭐️ | 定时任务 | 在线(添加、修改、删除)任务调度包含执行结果日志 |
| 🚀 | 文件服务 | 支持将文件存储到 S3MinIO、阿里云、腾讯云、七牛云、本地、FTP、数据库等 |
| 🚀 | API 日志 | 包括 RESTful API 访问日志、异常日志两部分,方便排查 API 相关的问题 |
| | MySQL 监控 | 监视当前系统数据库连接池状态可进行分析SQL找出系统性能瓶颈 |
| | Redis 监控 | 监控 Redis 数据库的使用情况,使用的 Redis Key 管理 |
| 🚀 | 消息队列 | 基于 Redis 实现消息队列Stream 提供集群消费Pub/Sub 提供广播消费 |
| 🚀 | Java 监控 | 基于 Spring Boot Admin 实现 Java 应用的监控 |
| 🚀 | 链路追踪 | 接入 SkyWalking 组件,实现链路追踪 |
| 🚀 | 日志中心 | 接入 SkyWalking 组件,实现日志中心 |
| 🚀 | 分布式锁 | 基于 Redis 实现分布式锁,满足并发场景 |
| 🚀 | 幂等组件 | 基于 Redis 实现幂等组件,解决重复请求问题 |
| 🚀 | 服务保障 | 基于 Resilience4j 实现服务的稳定性,包括限流、熔断等功能 |
| 🚀 | 日志服务 | 轻量级日志中心,查看远程服务器的日志 |
| 🚀 | 单元测试 | 基于 JUnit + Mockito 实现单元测试,保证功能的正确性、代码的质量等 |
| | 功能 | 描述 |
|-----|-----------|----------------------------------------------|
| 🚀 | 代码生成 | 前后端代码的生成Java、Vue、SQL、单元测试支持 CRUD 下载 |
| 🚀 | 系统接口 | 基于 Swagger 自动生成相关的 RESTful API 接口文档 |
| 🚀 | 数据库文档 | 基于 Screw 自动生成数据库文档,支持导出 Word、HTML、MD 格式 |
| | 表单构建 | 拖动表单元素生成相应的 HTML 代码,支持导出 JSON、Vue 文件 |
| 🚀 | 配置管理 | 对系统动态配置常用参数,支持 SpringBoot 加载 |
| ⭐️ | 定时任务 | 在线(添加、修改、删除)任务调度包含执行结果日志 |
| 🚀 | 文件服务 | 支持将文件存储到 S3MinIO、阿里云、腾讯云、七牛云、本地、FTP、数据库等 |
| 🚀 | WebSocket | 提供 WebSocket 接入示例,支持一对一、一对多发送方式 |
| 🚀 | API 日志 | 包括 RESTful API 访问日志、异常日志两部分,方便排查 API 相关的问题 |
| | MySQL 监控 | 监视当前系统数据库连接池状态可进行分析SQL找出系统性能瓶颈 |
| | Redis 监控 | 监控 Redis 数据库的使用情况,使用的 Redis Key 管理 |
| 🚀 | 消息队列 | 基于 Redis 实现消息队列Stream 提供集群消费Pub/Sub 提供广播消费 |
| 🚀 | Java 监控 | 基于 Spring Boot Admin 实现 Java 应用的监控 |
| 🚀 | 链路追踪 | 接入 SkyWalking 组件,实现链路追踪 |
| 🚀 | 日志中心 | 接入 SkyWalking 组件,实现日志中心 |
| 🚀 | 分布式锁 | 基于 Redis 实现分布式锁,满足并发场景 |
| 🚀 | 幂等组件 | 基于 Redis 实现幂等组件,解决重复请求问题 |
| 🚀 | 服务保障 | 基于 Resilience4j 实现服务的稳定性,包括限流、熔断等功能 |
| 🚀 | 日志服务 | 轻量级日志中心,查看远程服务器的日志 |
| 🚀 | 单元测试 | 基于 JUnit + Mockito 实现单元测试,保证功能的正确性、代码的质量等 |
### 数据报表
@ -212,120 +233,137 @@ ps核心功能已经实现正在对接微信小程序中...
### 商城系统
建设中...
![功能图](/.image/common/mall-feature.png)
![功能图](http://static.iocoder.cn/mall%20%E5%8A%9F%E8%83%BD%E5%9B%BE-min.png)
![功能图](/.image/common/mall-preview.png)
![GIF 图-耐心等待](https://raw.githubusercontent.com/YunaiV/Blog/master/Mall/onemall-admin-min.gif)
![GIF 图-耐心等待](https://raw.githubusercontent.com/YunaiV/Blog/master/Mall/onemall-h5-min.gif)
演示地址:<https://doc.iocoder.cn/mall-preview/>
### 会员中心
和「商城系统」一起开发
| | 功能 | 描述 |
|-----|------|----------------------------------|
| 🚀 | 会员管理 | 会员是 C 端的消费者,该功能用于会员的搜索与管理 |
| 🚀 | 会员标签 | 对会员的标签进行创建、查询、修改、删除等操作 |
| 🚀 | 会员等级 | 对会员的等级、成长值进行管理,可用于订单折扣等会员权益 |
| 🚀 | 会员分组 | 对会员进行分组,用于用户画像、内容推送等运营手段 |
| 🚀 | 积分签到 | 回馈给签到、消费等行为的积分,会员可订单抵现、积分兑换等途径消耗 |
### ERP 系统
![功能图](/.image/common/erp-feature.png)
演示地址:<https://doc.iocoder.cn/erp-preview/>
### CRM 系统
![功能图](/.image/common/crm-feature.png)
演示地址:<https://doc.iocoder.cn/crm-preview/>
## 🐨 技术栈
### 模块
| 项目 | 说明 |
|--------------------------------------------------------------------------|--------------------|
| `yudao-dependencies` | Maven 依赖版本管理 |
| `yudao-framework` | Java 框架拓展 |
| `yudao-server` | 管理后台 + 用户 APP 的服务端 |
| `yudao-module-system` | 系统功能的 Module 模块 |
| `yudao-module-member` | 会员中心的 Module 模块 |
| `yudao-module-infra` | 基础设施的 Module 模块 |
| `yudao-module-bpm` | 工作流程的 Module 模块 |
| `yudao-module-pay` | 支付系统的 Module 模块 |
| `yudao-module-mall` | 商城系统的 Module 模块 |
| `yudao-module-mp` | 微信公众号的 Module 模块 |
| `yudao-module-report` | 大屏报表 Module 模块 |
| 项目 | 说明 |
|-----------------------|--------------------|
| `yudao-dependencies` | Maven 依赖版本管理 |
| `yudao-framework` | Java 框架拓展 |
| `yudao-server` | 管理后台 + 用户 APP 的服务端 |
| `yudao-module-system` | 系统功能的 Module 模块 |
| `yudao-module-member` | 会员中心的 Module 模块 |
| `yudao-module-infra` | 基础设施的 Module 模块 |
| `yudao-module-bpm` | 工作流程的 Module 模块 |
| `yudao-module-pay` | 支付系统的 Module 模块 |
| `yudao-module-mall` | 商城系统的 Module 模块 |
| `yudao-module-erp` | ERP 系统的 Module 模块 |
| `yudao-module-crm` | CRM 系统的 Module 模块 |
| `yudao-module-mp` | 微信公众号的 Module 模块 |
| `yudao-module-report` | 大屏报表 Module 模块 |
### 框架
| 框架 | 说明 | 版本 | 学习指南 |
|---------------------------------------------------------------------------------------------|------------------|-------------|----------------------------------------------------------------|
| [Spring Boot](https://spring.io/projects/spring-boot) | 应用开发框架 | 2.7.8 | [文档](https://github.com/YunaiV/SpringBoot-Labs) |
| [MySQL](https://www.mysql.com/cn/) | 数据库服务器 | 5.7 / 8.0+ | |
| [Druid](https://github.com/alibaba/druid) | JDBC 连接池、监控组件 | 1.2.15 | [文档](http://www.iocoder.cn/Spring-Boot/datasource-pool/?yudao) |
| [MyBatis Plus](https://mp.baomidou.com/) | MyBatis 增强工具包 | 3.5.3.1 | [文档](http://www.iocoder.cn/Spring-Boot/MyBatis/?yudao) |
| [Dynamic Datasource](https://dynamic-datasource.com/) | 动态数据源 | 3.6.1 | [文档](http://www.iocoder.cn/Spring-Boot/datasource-pool/?yudao) |
| [Redis](https://redis.io/) | key-value 数据库 | 5.0 / 6.0 | |
| [Redisson](https://github.com/redisson/redisson) | Redis 客户端 | 3.18.0 | [文档](http://www.iocoder.cn/Spring-Boot/Redis/?yudao) |
| [Spring MVC](https://github.com/spring-projects/spring-framework/tree/master/spring-webmvc) | MVC 框架 | 5.3.24 | [文档](http://www.iocoder.cn/SpringMVC/MVC/?yudao) |
| [Spring Security](https://github.com/spring-projects/spring-security) | Spring 安全框架 | 5.7.6 | [文档](http://www.iocoder.cn/Spring-Boot/Spring-Security/?yudao) |
| [Hibernate Validator](https://github.com/hibernate/hibernate-validator) | 参数校验组件 | 6.2.5 | [文档](http://www.iocoder.cn/Spring-Boot/Validation/?yudao) |
| [Flowable](https://github.com/flowable/flowable-engine) | 工作流引擎 | 6.8.0 | [文档](https://doc.iocoder.cn/bpm/) |
| [Quartz](https://github.com/quartz-scheduler) | 任务调度组件 | 2.3.2 | [文档](http://www.iocoder.cn/Spring-Boot/Job/?yudao) |
| [Knife4j](https://gitee.com/xiaoym/knife4j) | Swagger 增强 UI 实现 | 4.0.0 | [文档](http://www.iocoder.cn/Spring-Boot/Swagger/?yudao) |
| [Resilience4j](https://github.com/resilience4j/resilience4j) | 服务保障组件 | 1.7.1 | [文档](http://www.iocoder.cn/Spring-Boot/Resilience4j/?yudao) |
| [SkyWalking](https://skywalking.apache.org/) | 分布式应用追踪系统 | 8.12.0 | [文档](http://www.iocoder.cn/Spring-Boot/SkyWalking/?yudao) |
| [Spring Boot Admin](https://github.com/codecentric/spring-boot-admin) | Spring Boot 监控平台 | 2.7.10 | [文档](http://www.iocoder.cn/Spring-Boot/Admin/?yudao) |
| [Jackson](https://github.com/FasterXML/jackson) | JSON 工具库 | 2.13.3 | |
| [MapStruct](https://mapstruct.org/) | Java Bean 转换 | 1.5.3.Final | [文档](http://www.iocoder.cn/Spring-Boot/MapStruct/?yudao) |
| [Lombok](https://projectlombok.org/) | 消除冗长的 Java 代码 | 1.18.24 | [文档](http://www.iocoder.cn/Spring-Boot/Lombok/?yudao) |
| [JUnit](https://junit.org/junit5/) | Java 单元测试框架 | 5.8.2 | - |
| [Mockito](https://github.com/mockito/mockito) | Java Mock 框架 | 4.8.0 | - |
| 框架 | 说明 | 版本 | 学习指南 |
|---------------------------------------------------------------------------------------------|------------------|----------------|----------------------------------------------------------------|
| [Spring Boot](https://spring.io/projects/spring-boot) | 应用开发框架 | 2.7.18 | [文档](https://github.com/YunaiV/SpringBoot-Labs) |
| [MySQL](https://www.mysql.com/cn/) | 数据库服务器 | 5.7 / 8.0+ | |
| [Druid](https://github.com/alibaba/druid) | JDBC 连接池、监控组件 | 1.2.19 | [文档](http://www.iocoder.cn/Spring-Boot/datasource-pool/?yudao) |
| [MyBatis Plus](https://mp.baomidou.com/) | MyBatis 增强工具包 | 3.5.3.2 | [文档](http://www.iocoder.cn/Spring-Boot/MyBatis/?yudao) |
| [Dynamic Datasource](https://dynamic-datasource.com/) | 动态数据源 | 3.6.1 | [文档](http://www.iocoder.cn/Spring-Boot/datasource-pool/?yudao) |
| [Redis](https://redis.io/) | key-value 数据库 | 5.0 / 6.0 /7.0 | |
| [Redisson](https://github.com/redisson/redisson) | Redis 客户端 | 3.18.0 | [文档](http://www.iocoder.cn/Spring-Boot/Redis/?yudao) |
| [Spring MVC](https://github.com/spring-projects/spring-framework/tree/master/spring-webmvc) | MVC 框架 | 5.3.24 | [文档](http://www.iocoder.cn/SpringMVC/MVC/?yudao) |
| [Spring Security](https://github.com/spring-projects/spring-security) | Spring 安全框架 | 5.7.11 | [文档](http://www.iocoder.cn/Spring-Boot/Spring-Security/?yudao) |
| [Hibernate Validator](https://github.com/hibernate/hibernate-validator) | 参数校验组件 | 6.2.5 | [文档](http://www.iocoder.cn/Spring-Boot/Validation/?yudao) |
| [Flowable](https://github.com/flowable/flowable-engine) | 工作流引擎 | 6.8.0 | [文档](https://doc.iocoder.cn/bpm/) |
| [Quartz](https://github.com/quartz-scheduler) | 任务调度组件 | 2.3.2 | [文档](http://www.iocoder.cn/Spring-Boot/Job/?yudao) |
| [Springdoc](https://springdoc.org/) | Swagger 文档 | 1.6.15 | [文档](http://www.iocoder.cn/Spring-Boot/Swagger/?yudao) |
| [Resilience4j](https://github.com/resilience4j/resilience4j) | 服务保障组件 | 1.7.1 | [文档](http://www.iocoder.cn/Spring-Boot/Resilience4j/?yudao) |
| [SkyWalking](https://skywalking.apache.org/) | 分布式应用追踪系统 | 8.12.0 | [文档](http://www.iocoder.cn/Spring-Boot/SkyWalking/?yudao) |
| [Spring Boot Admin](https://github.com/codecentric/spring-boot-admin) | Spring Boot 监控平台 | 2.7.10 | [文档](http://www.iocoder.cn/Spring-Boot/Admin/?yudao) |
| [Jackson](https://github.com/FasterXML/jackson) | JSON 工具库 | 2.13.3 | |
| [MapStruct](https://mapstruct.org/) | Java Bean 转换 | 1.5.5.Final | [文档](http://www.iocoder.cn/Spring-Boot/MapStruct/?yudao) |
| [Lombok](https://projectlombok.org/) | 消除冗长的 Java 代码 | 1.18.30 | [文档](http://www.iocoder.cn/Spring-Boot/Lombok/?yudao) |
| [JUnit](https://junit.org/junit5/) | Java 单元测试框架 | 5.8.2 | - |
| [Mockito](https://github.com/mockito/mockito) | Java Mock 框架 | 4.8.0 | - |
## 🐷 演示图
### 系统功能
| 模块 | biu | biu | biu |
|------------|--------------------------------------------------------------------|------------------------------------------------------------------|------------------------------------------------------------------|
| 登录 & 首页 | ![登录](https://static.iocoder.cn/images/ruoyi-vue-pro/登录.jpg?imageView2/2/format/webp/w/1280) | ![首页](https://static.iocoder.cn/images/ruoyi-vue-pro/首页.jpg?imageView2/2/format/webp/w/1280) | ![个人中心](https://static.iocoder.cn/images/ruoyi-vue-pro/个人中心.jpg?imageView2/2/format/webp/w/1280) |
| 用户 & 应用 | ![用户管理](https://static.iocoder.cn/images/ruoyi-vue-pro/用户管理.jpg?imageView2/2/format/webp/w/1280) | ![令牌管理](https://static.iocoder.cn/images/ruoyi-vue-pro/令牌管理.jpg?imageView2/2/format/webp/w/1280) | ![应用管理](https://static.iocoder.cn/images/ruoyi-vue-pro/应用管理.jpg?imageView2/2/format/webp/w/1280) |
| 租户 & 套餐 | ![租户管理](https://static.iocoder.cn/images/ruoyi-vue-pro/租户管理.jpg?imageView2/2/format/webp/w/1280) | ![租户套餐](https://static.iocoder.cn/images/ruoyi-vue-pro/租户套餐.png) | - |
| 部门 & 岗位 | ![部门管理](https://static.iocoder.cn/images/ruoyi-vue-pro/部门管理.jpg?imageView2/2/format/webp/w/1280) | ![岗位管理](https://static.iocoder.cn/images/ruoyi-vue-pro/岗位管理.jpg?imageView2/2/format/webp/w/1280) | - |
| 菜单 & 角色 | ![菜单管理](https://static.iocoder.cn/images/ruoyi-vue-pro/菜单管理.jpg?imageView2/2/format/webp/w/1280) | ![角色管理](https://static.iocoder.cn/images/ruoyi-vue-pro/角色管理.jpg?imageView2/2/format/webp/w/1280) | - |
| 审计日志 | ![操作日志](https://static.iocoder.cn/images/ruoyi-vue-pro/操作日志.jpg?imageView2/2/format/webp/w/1280) | ![登录日志](https://static.iocoder.cn/images/ruoyi-vue-pro/登录日志.jpg?imageView2/2/format/webp/w/1280) | - |
| 短信 | ![短信渠道](https://static.iocoder.cn/images/ruoyi-vue-pro/短信渠道.jpg?imageView2/2/format/webp/w/1280) | ![短信模板](https://static.iocoder.cn/images/ruoyi-vue-pro/短信模板.jpg?imageView2/2/format/webp/w/1280) | ![短信日志](https://static.iocoder.cn/images/ruoyi-vue-pro/短信日志.jpg?imageView2/2/format/webp/w/1280) |
| 字典 & 敏感词 | ![字典类型](https://static.iocoder.cn/images/ruoyi-vue-pro/字典类型.jpg?imageView2/2/format/webp/w/1280) | ![字典数据](https://static.iocoder.cn/images/ruoyi-vue-pro/字典数据.jpg?imageView2/2/format/webp/w/1280) | ![敏感词](https://static.iocoder.cn/images/ruoyi-vue-pro/敏感词.jpg?imageView2/2/format/webp/w/1280) |
| 错误码 & 通知 | ![错误码管理](https://static.iocoder.cn/images/ruoyi-vue-pro/错误码管理.jpg?imageView2/2/format/webp/w/1280) | ![通知公告](https://static.iocoder.cn/images/ruoyi-vue-pro/通知公告.jpg?imageView2/2/format/webp/w/1280) | - |
| 模块 | biu | biu | biu |
|----------|-----------------------------|---------------------------|--------------------------|
| 登录 & 首页 | ![登录](/.image/登录.jpg) | ![首页](/.image/首页.jpg) | ![个人中心](/.image/个人中心.jpg) |
| 用户 & 应用 | ![用户管理](/.image/用户管理.jpg) | ![令牌管理](/.image/令牌管理.jpg) | ![应用管理](/.image/应用管理.jpg) |
| 租户 & 套餐 | ![租户管理](/.image/租户管理.jpg) | ![租户套餐](/.image/租户套餐.png) | - |
| 部门 & 岗位 | ![部门管理](/.image/部门管理.jpg) | ![岗位管理](/.image/岗位管理.jpg) | - |
| 菜单 & 角色 | ![菜单管理](/.image/菜单管理.jpg) | ![角色管理](/.image/角色管理.jpg) | - |
| 审计日志 | ![操作日志](/.image/操作日志.jpg) | ![登录日志](/.image/登录日志.jpg) | - |
| 短信 | ![短信渠道](/.image/短信渠道.jpg) | ![短信模板](/.image/短信模板.jpg) | ![短信日志](/.image/短信日志.jpg) |
| 字典 & 敏感词 | ![字典类型](/.image/字典类型.jpg) | ![字典数据](/.image/字典数据.jpg) | ![敏感词](/.image/敏感词.jpg) |
| 错误码 & 通知 | ![错误码管理](/.image/错误码管理.jpg) | ![通知公告](/.image/通知公告.jpg) | - |
### 工作流程
| 模块 | biu | biu | biu |
|---------|------------------------------------------------------------------------|------------------------------------------------------------------------|------------------------------------------------------------------------|
| 流程模型 | ![流程模型-列表](https://static.iocoder.cn/images/ruoyi-vue-pro/流程模型-列表.jpg?imageView2/2/format/webp/w/1280) | ![流程模型-设计](https://static.iocoder.cn/images/ruoyi-vue-pro/流程模型-设计.jpg?imageView2/2/format/webp/w/1280) | ![流程模型-定义](https://static.iocoder.cn/images/ruoyi-vue-pro/流程模型-定义.jpg?imageView2/2/format/webp/w/1280) |
| 表单 & 分组 | ![流程表单](https://static.iocoder.cn/images/ruoyi-vue-pro/流程表单.jpg?imageView2/2/format/webp/w/1280) | ![用户分组](https://static.iocoder.cn/images/ruoyi-vue-pro/用户分组.jpg?imageView2/2/format/webp/w/1280) | - |
| 我的流程 | ![我的流程-列表](https://static.iocoder.cn/images/ruoyi-vue-pro/我的流程-列表.jpg?imageView2/2/format/webp/w/1280) | ![我的流程-发起](https://static.iocoder.cn/images/ruoyi-vue-pro/我的流程-发起.jpg?imageView2/2/format/webp/w/1280) | ![我的流程-详情](https://static.iocoder.cn/images/ruoyi-vue-pro/我的流程-详情.jpg?imageView2/2/format/webp/w/1280) |
| 待办 & 已办 | ![任务列表-审批](https://static.iocoder.cn/images/ruoyi-vue-pro/任务列表-审批.jpg?imageView2/2/format/webp/w/1280) | ![任务列表-待办](https://static.iocoder.cn/images/ruoyi-vue-pro/任务列表-待办.jpg?imageView2/2/format/webp/w/1280) | ![任务列表-已办](https://static.iocoder.cn/images/ruoyi-vue-pro/任务列表-已办.jpg?imageView2/2/format/webp/w/1280) |
| OA 请假 | ![OA请假-列表](https://static.iocoder.cn/images/ruoyi-vue-pro/OA请假-列表.jpg?imageView2/2/format/webp/w/1280) | ![OA请假-发起](https://static.iocoder.cn/images/ruoyi-vue-pro/OA请假-发起.jpg?imageView2/2/format/webp/w/1280) | ![OA请假-详情](https://static.iocoder.cn/images/ruoyi-vue-pro/OA请假-详情.jpg?imageView2/2/format/webp/w/1280) |
| 模块 | biu | biu | biu |
|---------|---------------------------------|---------------------------------|---------------------------------|
| 流程模型 | ![流程模型-列表](/.image/流程模型-列表.jpg) | ![流程模型-设计](/.image/流程模型-设计.jpg) | ![流程模型-定义](/.image/流程模型-定义.jpg) |
| 表单 & 分组 | ![流程表单](/.image/流程表单.jpg) | ![用户分组](/.image/用户分组.jpg) | - |
| 我的流程 | ![我的流程-列表](/.image/我的流程-列表.jpg) | ![我的流程-发起](/.image/我的流程-发起.jpg) | ![我的流程-详情](/.image/我的流程-详情.jpg) |
| 待办 & 已办 | ![任务列表-审批](/.image/任务列表-审批.jpg) | ![任务列表-待办](/.image/任务列表-待办.jpg) | ![任务列表-已办](/.image/任务列表-已办.jpg) |
| OA 请假 | ![OA请假-列表](/.image/OA请假-列表.jpg) | ![OA请假-发起](/.image/OA请假-发起.jpg) | ![OA请假-详情](/.image/OA请假-详情.jpg) |
### 基础设施
| 模块 | biu | biu | biu |
|---------------|----------------------------------------------------------------------|--------------------------------------------------------------------|------------------------------------------------------------------|
| 代码生成 | ![代码生成](https://static.iocoder.cn/images/ruoyi-vue-pro/代码生成.jpg?imageView2/2/format/webp/w/1280) | ![生成效果](https://static.iocoder.cn/images/ruoyi-vue-pro/生成效果.jpg?imageView2/2/format/webp/w/1280) | - |
| 文档 | ![系统接口](https://static.iocoder.cn/images/ruoyi-vue-pro/系统接口.jpg?imageView2/2/format/webp/w/1280) | ![数据库文档](https://static.iocoder.cn/images/ruoyi-vue-pro/数据库文档.jpg?imageView2/2/format/webp/w/1280) | - |
| 文件 & 配置 | ![文件配置](https://static.iocoder.cn/images/ruoyi-vue-pro/文件配置.jpg?imageView2/2/format/webp/w/1280) | ![文件管理](https://static.iocoder.cn/images/ruoyi-vue-pro/文件管理2.jpg?imageView2/2/format/webp/w/1280) | ![配置管理](https://static.iocoder.cn/images/ruoyi-vue-pro/配置管理.jpg?imageView2/2/format/webp/w/1280) |
| 定时任务 | ![定时任务](https://static.iocoder.cn/images/ruoyi-vue-pro/定时任务.jpg?imageView2/2/format/webp/w/1280) | ![任务日志](https://static.iocoder.cn/images/ruoyi-vue-pro/任务日志.jpg?imageView2/2/format/webp/w/1280) | - |
| API 日志 | ![访问日志](https://static.iocoder.cn/images/ruoyi-vue-pro/访问日志.jpg?imageView2/2/format/webp/w/1280) | ![错误日志](https://static.iocoder.cn/images/ruoyi-vue-pro/错误日志.jpg?imageView2/2/format/webp/w/1280) | - |
| MySQL & Redis | ![MySQL](https://static.iocoder.cn/images/ruoyi-vue-pro/MySQL.jpg?imageView2/2/format/webp/w/1280) | ![Redis](https://static.iocoder.cn/images/ruoyi-vue-pro/Redis.jpg?imageView2/2/format/webp/w/1280) | - |
| 监控平台 | ![Java监控](https://static.iocoder.cn/images/ruoyi-vue-pro/Java监控.jpg?imageView2/2/format/webp/w/1280) | ![链路追踪](https://static.iocoder.cn/images/ruoyi-vue-pro/链路追踪.jpg?imageView2/2/format/webp/w/1280) | ![日志中心](https://static.iocoder.cn/images/ruoyi-vue-pro/日志中心.jpg?imageView2/2/format/webp/w/1280) |
| 模块 | biu | biu | biu |
|---------------|-------------------------------|-----------------------------|---------------------------|
| 代码生成 | ![代码生成](/.image/代码生成.jpg) | ![生成效果](/.image/生成效果.jpg) | - |
| 文档 | ![系统接口](/.image/系统接口.jpg) | ![数据库文档](/.image/数据库文档.jpg) | - |
| 文件 & 配置 | ![文件配置](/.image/文件配置.jpg) | ![文件管理](/.image/文件管理2.jpg) | ![配置管理](/.image/配置管理.jpg) |
| 定时任务 | ![定时任务](/.image/定时任务.jpg) | ![任务日志](/.image/任务日志.jpg) | - |
| API 日志 | ![访问日志](/.image/访问日志.jpg) | ![错误日志](/.image/错误日志.jpg) | - |
| MySQL & Redis | ![MySQL](/.image/MySQL.jpg) | ![Redis](/.image/Redis.jpg) | - |
| 监控平台 | ![Java监控](/.image/Java监控.jpg) | ![链路追踪](/.image/链路追踪.jpg) | ![日志中心](/.image/日志中心.jpg) |
### 支付系统
| 模块 | biu | biu | biu |
|---------|------------------------------------------------------------------|------------------------------------------------------------------------|------------------------------------------------------------------------|
| 商家 & 应用 | ![商户信息](https://static.iocoder.cn/images/ruoyi-vue-pro/商户信息.jpg?imageView2/2/format/webp/w/1280) | ![应用信息-列表](https://static.iocoder.cn/images/ruoyi-vue-pro/应用信息-列表.jpg?imageView2/2/format/webp/w/1280) | ![应用信息-编辑](https://static.iocoder.cn/images/ruoyi-vue-pro/应用信息-编辑.jpg?imageView2/2/format/webp/w/1280) |
| 支付 & 退款 | ![支付订单](https://static.iocoder.cn/images/ruoyi-vue-pro/支付订单.jpg?imageView2/2/format/webp/w/1280) | ![退款订单](https://static.iocoder.cn/images/ruoyi-vue-pro/退款订单.jpg?imageView2/2/format/webp/w/1280) | --- |
| 模块 | biu | biu | biu |
|---------|---------------------------|---------------------------------|---------------------------------|
| 商家 & 应用 | ![商户信息](/.image/商户信息.jpg) | ![应用信息-列表](/.image/应用信息-列表.jpg) | ![应用信息-编辑](/.image/应用信息-编辑.jpg) |
| 支付 & 退款 | ![支付订单](/.image/支付订单.jpg) | ![退款订单](/.image/退款订单.jpg) | --- |
### 数据报表
| 模块 | biu | biu | biu |
|-------|--------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------|
| 报表设计器 | ![数据报表](https://static.iocoder.cn/images/ruoyi-vue-pro/报表设计器-数据报表.jpg?imageView2/2/format/webp/w/1280) | ![图形报表](https://static.iocoder.cn/images/ruoyi-vue-pro/报表设计器-图形报表.jpg?imageView2/2/format/webp/w/1280) | ![报表设计器-打印设计](https://static.iocoder.cn/images/ruoyi-vue-pro/报表设计器-打印设计.jpg?imageView2/2/format/webp/w/1280) |
| 大屏设计器 | ![大屏列表](https://static.iocoder.cn/images/ruoyi-vue-pro/大屏设计器-列表.jpg?imageView2/2/format/webp/w/1280) | ![大屏预览](https://static.iocoder.cn/images/ruoyi-vue-pro/大屏设计器-预览.jpg?imageView2/2/format/webp/w/1280) | ![大屏编辑](https://static.iocoder.cn/images/ruoyi-vue-pro/大屏设计器-编辑.jpg?imageView2/2/format/webp/w/1280) |
| 模块 | biu | biu | biu |
|-------|---------------------------------|---------------------------------|---------------------------------------|
| 报表设计器 | ![数据报表](/.image/报表设计器-数据报表.jpg) | ![图形报表](/.image/报表设计器-图形报表.jpg) | ![报表设计器-打印设计](/.image/报表设计器-打印设计.jpg) |
| 大屏设计器 | ![大屏列表](/.image/大屏设计器-列表.jpg) | ![大屏预览](/.image/大屏设计器-预览.jpg) | ![大屏编辑](/.image/大屏设计器-编辑.jpg) |
### 移动端(管理后台)
| biu | biu | biu |
|------------------------------------------------------------------|------------------------------------------------------------------------|------------------------------------------------------------------------|
| ![](https://static.iocoder.cn/images/ruoyi-vue-pro/admin-uniapp/01.png?imageView2/2/format/webp) | ![](https://static.iocoder.cn/images/ruoyi-vue-pro/admin-uniapp/02.png?imageView2/2/format/webp) | ![](https://static.iocoder.cn/images/ruoyi-vue-pro/admin-uniapp/03.png?imageView2/2/format/webp) |
| ![](https://static.iocoder.cn/images/ruoyi-vue-pro/admin-uniapp/04.png?imageView2/2/format/webp) | ![](https://static.iocoder.cn/images/ruoyi-vue-pro/admin-uniapp/05.png?imageView2/2/format/webp) | ![](https://static.iocoder.cn/images/ruoyi-vue-pro/admin-uniapp/06.png?imageView2/2/format/webp) |
| ![](https://static.iocoder.cn/images/ruoyi-vue-pro/admin-uniapp/07.png?imageView2/2/format/webp) | ![](https://static.iocoder.cn/images/ruoyi-vue-pro/admin-uniapp/08.png?imageView2/2/format/webp) | ![](https://static.iocoder.cn/images/ruoyi-vue-pro/admin-uniapp/09.png?imageView2/2/format/webp) |
| biu | biu | biu |
|----------------------------------|----------------------------------|----------------------------------|
| ![](/.image/admin-uniapp/01.png) | ![](/.image/admin-uniapp/02.png) | ![](/.image/admin-uniapp/03.png) |
| ![](/.image/admin-uniapp/04.png) | ![](/.image/admin-uniapp/05.png) | ![](/.image/admin-uniapp/06.png) |
| ![](/.image/admin-uniapp/07.png) | ![](/.image/admin-uniapp/08.png) | ![](/.image/admin-uniapp/09.png) |
目前已经实现登录、我的、工作台、编辑资料、头像修改、密码修改、常见问题、关于我们等基础功能。

57
pom.xml
View File

@ -13,16 +13,18 @@
<!-- Server 主项目 -->
<module>yudao-server</module>
<!-- 各种 module 拓展 -->
<module>yudao-module-member</module>
<module>yudao-module-system</module>
<module>yudao-module-infra</module>
<module>yudao-module-pay</module>
<!-- <module>yudao-module-member</module>-->
<!-- <module>yudao-module-bpm</module>-->
<!-- <module>yudao-module-report</module>-->
<!-- <module>yudao-module-mp</module>-->
<!-- <module>yudao-module-pay</module>-->
<!-- <module>yudao-module-mall</module>-->
<!-- <module>yudao-module-crm</module>-->
<!-- <module>yudao-module-erp</module>-->
<!-- 示例项目 -->
<module>yudao-example</module>
<!-- <module>yudao-example</module>-->
</modules>
<name>${project.artifactId}</name>
@ -30,17 +32,18 @@
<url>https://github.com/YunaiV/ruoyi-vue-pro</url>
<properties>
<revision>1.7.1-snapshot</revision>
<revision>2.0.1-jdk8-snapshot</revision>
<!-- Maven 相关 -->
<java.version>1.8</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
<flatten-maven-plugin.version>1.5.0</flatten-maven-plugin.version>
<!-- 看看咋放到 bom 里 -->
<lombok.version>1.18.24</lombok.version>
<spring.boot.version>2.7.8</spring.boot.version>
<mapstruct.version>1.5.3.Final</mapstruct.version>
<lombok.version>1.18.30</lombok.version>
<spring.boot.version>2.7.18</spring.boot.version>
<mapstruct.version>1.5.5.Final</mapstruct.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
@ -92,12 +95,50 @@
</annotationProcessorPaths>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<!-- 统一 revision 版本 -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>${flatten-maven-plugin.version}</version>
<configuration>
<flattenMode>resolveCiFriendliesOnly</flattenMode>
<updatePomFile>true</updatePomFile>
</configuration>
<executions>
<execution>
<goals>
<goal>flatten</goal>
</goals>
<id>flatten</id>
<phase>process-resources</phase>
</execution>
<execution>
<goals>
<goal>clean</goal>
</goals>
<id>flatten.clean</id>
<phase>clean</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
<!-- 使用 aliyun 的 Maven 源,提升下载速度 -->
<!-- 使用 huawei / aliyun 的 Maven 源,提升下载速度 -->
<repositories>
<repository>
<id>huaweicloud</id>
<name>huawei</name>
<url>https://mirrors.huaweicloud.com/repository/maven/</url>
</repository>
<repository>
<id>aliyunmaven</id>
<name>aliyun</name>

View File

@ -0,0 +1,49 @@
# Docker Build & Up
目标: 快速部署体验系统,帮助了解系统之间的依赖关系。
依赖docker compose v2删除`name: yudao-system`,降低`version`版本为`3.3`以下,支持`docker-compose`
## 功能文件列表
```text
.
├── Docker-HOWTO.md
├── docker-compose.yml
├── docker.env <-- 提供docker-compose环境变量配置
├── yudao-server
│ └── Dockerfile
└── yudao-ui-admin
├── .dockerignore
├── Dockerfile
└── nginx.conf <-- 提供基础配置gzip压缩、api转发
```
## 构建 jar 包
```shell
# 创建maven缓存volume
docker volume create --name yudao-maven-repo
docker run -it --rm --name yudao-maven \
-v yudao-maven-repo:/root/.m2 \
-v $PWD:/usr/src/mymaven \
-w /usr/src/mymaven \
maven mvn clean install package '-Dmaven.test.skip=true'
```
## 构建启动服务
```shell
docker compose --env-file docker.env up -d
```
首次运行会自动构建容器。可以通过`docker compose build [service]`来手动构建所有或某个docker镜像
`--env-file docker.env`为可选参数,只是展示了通过`.env`文件配置容器启动的环境变量,`docker-compose.yml`本身已经提供足够的默认参数来正常运行系统。
## 服务器的宿主机端口映射
- admin ui: http://localhost:8080
- api server: http://localhost:48080
- mysql: root/123456, port: 3306
- redis: port: 6379

View File

@ -0,0 +1,84 @@
version: "3.4"
name: yudao-system
services:
mysql:
container_name: yudao-mysql
image: mysql:8
restart: unless-stopped
tty: true
ports:
- "3306:3306"
environment:
MYSQL_DATABASE: ${MYSQL_DATABASE:-ruoyi-vue-pro}
MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD:-123456}
volumes:
- mysql:/var/lib/mysql/
- ./sql/mysql/ruoyi-vue-pro.sql:/docker-entrypoint-initdb.d/ruoyi-vue-pro.sql:ro
redis:
container_name: yudao-redis
image: redis:6-alpine
restart: unless-stopped
ports:
- "6379:6379"
volumes:
- redis:/data
server:
container_name: yudao-server
build:
context: ./yudao-server/
image: yudao-server
restart: unless-stopped
ports:
- "48080:48080"
environment:
# https://github.com/polovyivan/docker-pass-configs-to-container
SPRING_PROFILES_ACTIVE: local
JAVA_OPTS:
${JAVA_OPTS:-
-Xms512m
-Xmx512m
-Djava.security.egd=file:/dev/./urandom
}
ARGS:
--spring.datasource.dynamic.datasource.master.url=${MASTER_DATASOURCE_URL:-jdbc:mysql://yudao-mysql:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true}
--spring.datasource.dynamic.datasource.master.username=${MASTER_DATASOURCE_USERNAME:-root}
--spring.datasource.dynamic.datasource.master.password=${MASTER_DATASOURCE_PASSWORD:-123456}
--spring.datasource.dynamic.datasource.slave.url=${SLAVE_DATASOURCE_URL:-jdbc:mysql://yudao-mysql:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true}
--spring.datasource.dynamic.datasource.slave.username=${SLAVE_DATASOURCE_USERNAME:-root}
--spring.datasource.dynamic.datasource.slave.password=${SLAVE_DATASOURCE_PASSWORD:-123456}
--spring.redis.host=${REDIS_HOST:-yudao-redis}
depends_on:
- mysql
- redis
admin:
container_name: yudao-admin
build:
context: ./yudao-ui-admin
args:
NODE_ENV:
ENV=${NODE_ENV:-production}
PUBLIC_PATH=${PUBLIC_PATH:-/}
VUE_APP_TITLE=${VUE_APP_TITLE:-芋道管理系统}
VUE_APP_BASE_API=${VUE_APP_BASE_API:-/prod-api}
VUE_APP_APP_NAME=${VUE_APP_APP_NAME:-/}
VUE_APP_TENANT_ENABLE=${VUE_APP_TENANT_ENABLE:-true}
VUE_APP_CAPTCHA_ENABLE=${VUE_APP_CAPTCHA_ENABLE:-true}
VUE_APP_DOC_ENABLE=${VUE_APP_DOC_ENABLE:-true}
VUE_APP_BAIDU_CODE=${VUE_APP_BAIDU_CODE:-fadc1bd5db1a1d6f581df60a1807f8ab}
image: yudao-admin
restart: unless-stopped
ports:
- "8080:80"
depends_on:
- server
volumes:
mysql:
driver: local
redis:
driver: local

25
script/docker/docker.env Normal file
View File

@ -0,0 +1,25 @@
## mysql
MYSQL_DATABASE=ruoyi-vue-pro
MYSQL_ROOT_PASSWORD=123456
## server
JAVA_OPTS=-Xms512m -Xmx512m -Djava.security.egd=file:/dev/./urandom
MASTER_DATASOURCE_URL=jdbc:mysql://yudao-mysql:3306/${MYSQL_DATABASE}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
MASTER_DATASOURCE_USERNAME=root
MASTER_DATASOURCE_PASSWORD=${MYSQL_ROOT_PASSWORD}
SLAVE_DATASOURCE_URL=${MASTER_DATASOURCE_URL}
SLAVE_DATASOURCE_USERNAME=${MASTER_DATASOURCE_USERNAME}
SLAVE_DATASOURCE_PASSWORD=${MASTER_DATASOURCE_PASSWORD}
REDIS_HOST=yudao-redis
## admin
NODE_ENV=production
PUBLIC_PATH=/
VUE_APP_TITLE=芋道管理系统
VUE_APP_BASE_API=/prod-api
VUE_APP_APP_NAME=/
VUE_APP_TENANT_ENABLE=true
VUE_APP_CAPTCHA_ENABLE=true
VUE_APP_DOC_ENABLE=true
VUE_APP_BAIDU_CODE=fadc1bd5db1a1d6f581df60a1807f8ab

View File

@ -74,7 +74,7 @@ function stop() {
if [ -n "$PID" ]; then
echo -e ".\c"
else
echo '[stop] 停止 $BASE_PATH/$SERVER_NAME 成功'
echo "[stop] 停止 $BASE_PATH/$SERVER_NAME 成功"
break
fi
done

View File

@ -1,3 +0,0 @@
暂未适配国产 DM 数据库,如果你有需要,可以微信联系 wangwenbin-server 一起建设。
你需要把表结构与数据导入到 DM 数据库,我来测试与适配代码。

View File

@ -0,0 +1,598 @@
package liquibase.database.core;
import java.lang.reflect.Method;
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import liquibase.CatalogAndSchema;
import liquibase.Scope;
import liquibase.database.AbstractJdbcDatabase;
import liquibase.database.DatabaseConnection;
import liquibase.database.OfflineConnection;
import liquibase.database.jvm.JdbcConnection;
import liquibase.exception.DatabaseException;
import liquibase.exception.UnexpectedLiquibaseException;
import liquibase.exception.ValidationErrors;
import liquibase.executor.ExecutorService;
import liquibase.statement.DatabaseFunction;
import liquibase.statement.SequenceCurrentValueFunction;
import liquibase.statement.SequenceNextValueFunction;
import liquibase.statement.core.RawCallStatement;
import liquibase.statement.core.RawSqlStatement;
import liquibase.structure.DatabaseObject;
import liquibase.structure.core.Catalog;
import liquibase.structure.core.Index;
import liquibase.structure.core.PrimaryKey;
import liquibase.structure.core.Schema;
import liquibase.util.JdbcUtils;
import liquibase.util.StringUtil;
public class DmDatabase extends AbstractJdbcDatabase {
private static final String PRODUCT_NAME = "DM DBMS";
@Override
protected String getDefaultDatabaseProductName() {
return PRODUCT_NAME;
}
/**
* Is this AbstractDatabase subclass the correct one to use for the given connection.
*
* @param conn
*/
@Override
public boolean isCorrectDatabaseImplementation(DatabaseConnection conn) throws DatabaseException {
return PRODUCT_NAME.equalsIgnoreCase(conn.getDatabaseProductName());
}
/**
* If this database understands the given url, return the default driver class name. Otherwise return null.
*
* @param url
*/
@Override
public String getDefaultDriver(String url) {
if(url.startsWith("jdbc:dm")) {
return "dm.jdbc.driver.DmDriver";
}
return null;
}
/**
* Returns an all-lower-case short name of the product. Used for end-user selecting of database type
* such as the DBMS precondition.
*/
@Override
public String getShortName() {
return "dm";
}
@Override
public Integer getDefaultPort() {
return 5236;
}
/**
* Returns whether this database support initially deferrable columns.
*/
@Override
public boolean supportsInitiallyDeferrableColumns() {
return true;
}
@Override
public boolean supportsTablespaces() {
return true;
}
@Override
public int getPriority() {
return PRIORITY_DEFAULT;
}
private static final Pattern PROXY_USER = Pattern.compile(".*(?:thin|oci)\\:(.+)/@.*");
protected final int SHORT_IDENTIFIERS_LENGTH = 30;
protected final int LONG_IDENTIFIERS_LEGNTH = 128;
public static final int ORACLE_12C_MAJOR_VERSION = 12;
private Set<String> reservedWords = new HashSet<>();
private Set<String> userDefinedTypes;
private Map<String, String> savedSessionNlsSettings;
private Boolean canAccessDbaRecycleBin;
private Integer databaseMajorVersion;
private Integer databaseMinorVersion;
/**
* Default constructor for an object that represents the Oracle Database DBMS.
*/
public DmDatabase() {
super.unquotedObjectsAreUppercased = true;
//noinspection HardCodedStringLiteral
super.setCurrentDateTimeFunction("SYSTIMESTAMP");
// Setting list of Oracle's native functions
//noinspection HardCodedStringLiteral
dateFunctions.add(new DatabaseFunction("SYSDATE"));
//noinspection HardCodedStringLiteral
dateFunctions.add(new DatabaseFunction("SYSTIMESTAMP"));
//noinspection HardCodedStringLiteral
dateFunctions.add(new DatabaseFunction("CURRENT_TIMESTAMP"));
//noinspection HardCodedStringLiteral
super.sequenceNextValueFunction = "%s.nextval";
//noinspection HardCodedStringLiteral
super.sequenceCurrentValueFunction = "%s.currval";
}
private void tryProxySession(final String url, final Connection con) {
Matcher m = PROXY_USER.matcher(url);
if (m.matches()) {
Properties props = new Properties();
props.put("PROXY_USER_NAME", m.group(1));
try {
Method method = con.getClass().getMethod("openProxySession", int.class, Properties.class);
method.setAccessible(true);
method.invoke(con, 1, props);
} catch (Exception e) {
Scope.getCurrentScope().getLog(getClass()).info("Could not open proxy session on OracleDatabase: " + e.getCause().getMessage());
}
}
}
@Override
public int getDatabaseMajorVersion() throws DatabaseException {
if (databaseMajorVersion == null) {
return super.getDatabaseMajorVersion();
} else {
return databaseMajorVersion;
}
}
@Override
public int getDatabaseMinorVersion() throws DatabaseException {
if (databaseMinorVersion == null) {
return super.getDatabaseMinorVersion();
} else {
return databaseMinorVersion;
}
}
@Override
public String getJdbcCatalogName(CatalogAndSchema schema) {
return null;
}
@Override
public String getJdbcSchemaName(CatalogAndSchema schema) {
return correctObjectName((schema.getCatalogName() == null) ? schema.getSchemaName() : schema.getCatalogName(), Schema.class);
}
@Override
protected String getAutoIncrementClause(final String generationType, final Boolean defaultOnNull) {
if (StringUtil.isEmpty(generationType)) {
return super.getAutoIncrementClause();
}
String autoIncrementClause = "GENERATED %s AS IDENTITY"; // %s -- [ ALWAYS | BY DEFAULT [ ON NULL ] ]
String generationStrategy = generationType;
if (Boolean.TRUE.equals(defaultOnNull) && generationType.toUpperCase().equals("BY DEFAULT")) {
generationStrategy += " ON NULL";
}
return String.format(autoIncrementClause, generationStrategy);
}
@Override
public String generatePrimaryKeyName(String tableName) {
if (tableName.length() > 27) {
//noinspection HardCodedStringLiteral
return "PK_" + tableName.toUpperCase(Locale.US).substring(0, 27);
} else {
//noinspection HardCodedStringLiteral
return "PK_" + tableName.toUpperCase(Locale.US);
}
}
@Override
public boolean isReservedWord(String objectName) {
return reservedWords.contains(objectName.toUpperCase());
}
@Override
public boolean supportsSequences() {
return true;
}
/**
* Oracle supports catalogs in liquibase terms
*
* @return false
*/
@Override
public boolean supportsSchemas() {
return false;
}
@Override
protected String getConnectionCatalogName() throws DatabaseException {
if (getConnection() instanceof OfflineConnection) {
return getConnection().getCatalog();
}
try {
//noinspection HardCodedStringLiteral
return Scope.getCurrentScope().getSingleton(ExecutorService.class).getExecutor("jdbc", this).queryForObject(new RawCallStatement("select sys_context( 'userenv', 'current_schema' ) from dual"), String.class);
} catch (Exception e) {
//noinspection HardCodedStringLiteral
Scope.getCurrentScope().getLog(getClass()).info("Error getting default schema", e);
}
return null;
}
@Override
public String getDefaultCatalogName() {//NOPMD
return (super.getDefaultCatalogName() == null) ? null : super.getDefaultCatalogName().toUpperCase(Locale.US);
}
/**
* <p>Returns an Oracle date literal with the same value as a string formatted using ISO 8601.</p>
*
* <p>Convert an ISO8601 date string to one of the following results:
* to_date('1995-05-23', 'YYYY-MM-DD')
* to_date('1995-05-23 09:23:59', 'YYYY-MM-DD HH24:MI:SS')</p>
* <p>
* Implementation restriction:<br>
* Currently, only the following subsets of ISO8601 are supported:<br>
* <ul>
* <li>YYYY-MM-DD</li>
* <li>YYYY-MM-DDThh:mm:ss</li>
* </ul>
*/
@Override
public String getDateLiteral(String isoDate) {
String normalLiteral = super.getDateLiteral(isoDate);
if (isDateOnly(isoDate)) {
return "TO_DATE(" + normalLiteral + ", 'YYYY-MM-DD')";
} else if (isTimeOnly(isoDate)) {
return "TO_DATE(" + normalLiteral + ", 'HH24:MI:SS')";
} else if (isTimestamp(isoDate)) {
return "TO_TIMESTAMP(" + normalLiteral + ", 'YYYY-MM-DD HH24:MI:SS.FF')";
} else if (isDateTime(isoDate)) {
int seppos = normalLiteral.lastIndexOf('.');
if (seppos != -1) {
normalLiteral = normalLiteral.substring(0, seppos) + "'";
}
return "TO_DATE(" + normalLiteral + ", 'YYYY-MM-DD HH24:MI:SS')";
}
return "UNSUPPORTED:" + isoDate;
}
@Override
public boolean isSystemObject(DatabaseObject example) {
if (example == null) {
return false;
}
if (this.isLiquibaseObject(example)) {
return false;
}
if (example instanceof Schema) {
//noinspection HardCodedStringLiteral,HardCodedStringLiteral,HardCodedStringLiteral,HardCodedStringLiteral
if ("SYSTEM".equals(example.getName()) || "SYS".equals(example.getName()) || "CTXSYS".equals(example.getName()) || "XDB".equals(example.getName())) {
return true;
}
//noinspection HardCodedStringLiteral,HardCodedStringLiteral,HardCodedStringLiteral,HardCodedStringLiteral
if ("SYSTEM".equals(example.getSchema().getCatalogName()) || "SYS".equals(example.getSchema().getCatalogName()) || "CTXSYS".equals(example.getSchema().getCatalogName()) || "XDB".equals(example.getSchema().getCatalogName())) {
return true;
}
} else if (isSystemObject(example.getSchema())) {
return true;
}
if (example instanceof Catalog) {
//noinspection HardCodedStringLiteral,HardCodedStringLiteral,HardCodedStringLiteral,HardCodedStringLiteral
if (("SYSTEM".equals(example.getName()) || "SYS".equals(example.getName()) || "CTXSYS".equals(example.getName()) || "XDB".equals(example.getName()))) {
return true;
}
} else if (example.getName() != null) {
//noinspection HardCodedStringLiteral
if (example.getName().startsWith("BIN$")) { //oracle deleted table
boolean filteredInOriginalQuery = this.canAccessDbaRecycleBin();
if (!filteredInOriginalQuery) {
filteredInOriginalQuery = StringUtil.trimToEmpty(example.getSchema().getName()).equalsIgnoreCase(this.getConnection().getConnectionUserName());
}
if (filteredInOriginalQuery) {
return !((example instanceof PrimaryKey) || (example instanceof Index) || (example instanceof
liquibase.statement.UniqueConstraint));
} else {
return true;
}
} else //noinspection HardCodedStringLiteral
if (example.getName().startsWith("AQ$")) { //oracle AQ tables
return true;
} else //noinspection HardCodedStringLiteral
if (example.getName().startsWith("DR$")) { //oracle index tables
return true;
} else //noinspection HardCodedStringLiteral
if (example.getName().startsWith("SYS_IOT_OVER")) { //oracle system table
return true;
} else //noinspection HardCodedStringLiteral,HardCodedStringLiteral
if ((example.getName().startsWith("MDRT_") || example.getName().startsWith("MDRS_")) && example.getName().endsWith("$")) {
// CORE-1768 - Oracle creates these for spatial indices and will remove them when the index is removed.
return true;
} else //noinspection HardCodedStringLiteral
if (example.getName().startsWith("MLOG$_")) { //Created by materliaized view logs for every table that is part of a materialized view. Not available for DDL operations.
return true;
} else //noinspection HardCodedStringLiteral
if (example.getName().startsWith("RUPD$_")) { //Created by materialized view log tables using primary keys. Not available for DDL operations.
return true;
} else //noinspection HardCodedStringLiteral
if (example.getName().startsWith("WM$_")) { //Workspace Manager backup tables.
return true;
} else //noinspection HardCodedStringLiteral
if ("CREATE$JAVA$LOB$TABLE".equals(example.getName())) { //This table contains the name of the Java object, the date it was loaded, and has a BLOB column to store the Java object.
return true;
} else //noinspection HardCodedStringLiteral
if ("JAVA$CLASS$MD5$TABLE".equals(example.getName())) { //This is a hash table that tracks the loading of Java objects into a schema.
return true;
} else //noinspection HardCodedStringLiteral
if (example.getName().startsWith("ISEQ$$_")) { //System-generated sequence
return true;
} else //noinspection HardCodedStringLiteral
if (example.getName().startsWith("USLOG$")) { //for update materialized view
return true;
} else if (example.getName().startsWith("SYS_FBA")) { //for Flashback tables
return true;
}
}
return super.isSystemObject(example);
}
@Override
public boolean supportsAutoIncrement() {
// Oracle supports Identity beginning with version 12c
boolean isAutoIncrementSupported = false;
try {
if (getDatabaseMajorVersion() >= 12) {
isAutoIncrementSupported = true;
}
// Returning true will generate create table command with 'IDENTITY' clause, example:
// CREATE TABLE AutoIncTest (IDPrimaryKey NUMBER(19) GENERATED BY DEFAULT AS IDENTITY NOT NULL, TypeID NUMBER(3) NOT NULL, Description NVARCHAR2(50), CONSTRAINT PK_AutoIncTest PRIMARY KEY (IDPrimaryKey));
// While returning false will continue to generate create table command without 'IDENTITY' clause, example:
// CREATE TABLE AutoIncTest (IDPrimaryKey NUMBER(19) NOT NULL, TypeID NUMBER(3) NOT NULL, Description NVARCHAR2(50), CONSTRAINT PK_AutoIncTest PRIMARY KEY (IDPrimaryKey));
} catch (DatabaseException ex) {
isAutoIncrementSupported = false;
}
return isAutoIncrementSupported;
}
// public Set<UniqueConstraint> findUniqueConstraints(String schema) throws DatabaseException {
// Set<UniqueConstraint> returnSet = new HashSet<UniqueConstraint>();
//
// List<Map> maps = new Executor(this).queryForList(new RawSqlStatement("SELECT UC.CONSTRAINT_NAME, UCC.TABLE_NAME, UCC.COLUMN_NAME FROM USER_CONSTRAINTS UC, USER_CONS_COLUMNS UCC WHERE UC.CONSTRAINT_NAME=UCC.CONSTRAINT_NAME AND CONSTRAINT_TYPE='U' ORDER BY UC.CONSTRAINT_NAME"));
//
// UniqueConstraint constraint = null;
// for (Map map : maps) {
// if (constraint == null || !constraint.getName().equals(constraint.getName())) {
// returnSet.add(constraint);
// Table table = new Table((String) map.get("TABLE_NAME"));
// constraint = new UniqueConstraint(map.get("CONSTRAINT_NAME").toString(), table);
// }
// }
// if (constraint != null) {
// returnSet.add(constraint);
// }
//
// return returnSet;
// }
@Override
public boolean supportsRestrictForeignKeys() {
return false;
}
@Override
public int getDataTypeMaxParameters(String dataTypeName) {
//noinspection HardCodedStringLiteral
if ("BINARY_FLOAT".equals(dataTypeName.toUpperCase())) {
return 0;
}
//noinspection HardCodedStringLiteral
if ("BINARY_DOUBLE".equals(dataTypeName.toUpperCase())) {
return 0;
}
return super.getDataTypeMaxParameters(dataTypeName);
}
public String getSystemTableWhereClause(String tableNameColumn) {
List<String> clauses = new ArrayList<String>(Arrays.asList("BIN$",
"AQ$",
"DR$",
"SYS_IOT_OVER",
"MLOG$_",
"RUPD$_",
"WM$_",
"ISEQ$$_",
"USLOG$",
"SYS_FBA"));
for (int i = 0;i<clauses.size(); i++) {
clauses.set(i, tableNameColumn+" NOT LIKE '"+clauses.get(i)+"%'");
}
return "("+ StringUtil.join(clauses, " AND ") + ")";
}
@Override
public boolean jdbcCallsCatalogsSchemas() {
return true;
}
public Set<String> getUserDefinedTypes() {
if (userDefinedTypes == null) {
userDefinedTypes = new HashSet<>();
if ((getConnection() != null) && !(getConnection() instanceof OfflineConnection)) {
try {
try {
//noinspection HardCodedStringLiteral
userDefinedTypes.addAll(Scope.getCurrentScope().getSingleton(ExecutorService.class).getExecutor("jdbc", this).queryForList(new RawSqlStatement("SELECT DISTINCT TYPE_NAME FROM ALL_TYPES"), String.class));
} catch (DatabaseException e) { //fall back to USER_TYPES if the user cannot see ALL_TYPES
//noinspection HardCodedStringLiteral
userDefinedTypes.addAll(Scope.getCurrentScope().getSingleton(ExecutorService.class).getExecutor("jdbc", this).queryForList(new RawSqlStatement("SELECT TYPE_NAME FROM USER_TYPES"), String.class));
}
} catch (DatabaseException e) {
//ignore error
}
}
}
return userDefinedTypes;
}
@Override
public String generateDatabaseFunctionValue(DatabaseFunction databaseFunction) {
//noinspection HardCodedStringLiteral
if ((databaseFunction != null) && "current_timestamp".equalsIgnoreCase(databaseFunction.toString())) {
return databaseFunction.toString();
}
if ((databaseFunction instanceof SequenceNextValueFunction) || (databaseFunction instanceof
SequenceCurrentValueFunction)) {
String quotedSeq = super.generateDatabaseFunctionValue(databaseFunction);
// replace "myschema.my_seq".nextval with "myschema"."my_seq".nextval
return quotedSeq.replaceFirst("\"([^\\.\"]+)\\.([^\\.\"]+)\"", "\"$1\".\"$2\"");
}
return super.generateDatabaseFunctionValue(databaseFunction);
}
@Override
public ValidationErrors validate() {
ValidationErrors errors = super.validate();
DatabaseConnection connection = getConnection();
if ((connection == null) || (connection instanceof OfflineConnection)) {
//noinspection HardCodedStringLiteral
Scope.getCurrentScope().getLog(getClass()).info("Cannot validate offline database");
return errors;
}
if (!canAccessDbaRecycleBin()) {
errors.addWarning(getDbaRecycleBinWarning());
}
return errors;
}
public String getDbaRecycleBinWarning() {
//noinspection HardCodedStringLiteral,HardCodedStringLiteral,HardCodedStringLiteral,HardCodedStringLiteral,
// HardCodedStringLiteral
//noinspection HardCodedStringLiteral,HardCodedStringLiteral,HardCodedStringLiteral
return "Liquibase needs to access the DBA_RECYCLEBIN table so we can automatically handle the case where " +
"constraints are deleted and restored. Since Oracle doesn't properly restore the original table names " +
"referenced in the constraint, we use the information from the DBA_RECYCLEBIN to automatically correct this" +
" issue.\n" +
"\n" +
"The user you used to connect to the database (" + getConnection().getConnectionUserName() +
") needs to have \"SELECT ON SYS.DBA_RECYCLEBIN\" permissions set before we can perform this operation. " +
"Please run the following SQL to set the appropriate permissions, and try running the command again.\n" +
"\n" +
" GRANT SELECT ON SYS.DBA_RECYCLEBIN TO " + getConnection().getConnectionUserName() + ";";
}
public boolean canAccessDbaRecycleBin() {
if (canAccessDbaRecycleBin == null) {
DatabaseConnection connection = getConnection();
if ((connection == null) || (connection instanceof OfflineConnection)) {
return false;
}
Statement statement = null;
try {
statement = ((JdbcConnection) connection).createStatement();
@SuppressWarnings("HardCodedStringLiteral") ResultSet resultSet = statement.executeQuery("select 1 from dba_recyclebin where 0=1");
resultSet.close(); //don't need to do anything with the result set, just make sure statement ran.
this.canAccessDbaRecycleBin = true;
} catch (Exception e) {
//noinspection HardCodedStringLiteral
if ((e instanceof SQLException) && e.getMessage().startsWith("ORA-00942")) { //ORA-00942: table or view does not exist
this.canAccessDbaRecycleBin = false;
} else {
//noinspection HardCodedStringLiteral
Scope.getCurrentScope().getLog(getClass()).warning("Cannot check dba_recyclebin access", e);
this.canAccessDbaRecycleBin = false;
}
} finally {
JdbcUtils.close(null, statement);
}
}
return canAccessDbaRecycleBin;
}
@Override
public boolean supportsNotNullConstraintNames() {
return true;
}
/**
* Tests if the given String would be a valid identifier in Oracle DBMS. In Oracle, a valid identifier has
* the following form (case-insensitive comparison):
* 1st character: A-Z
* 2..n characters: A-Z0-9$_#
* The maximum length of an identifier differs by Oracle version and object type.
*/
public boolean isValidOracleIdentifier(String identifier, Class<? extends DatabaseObject> type) {
if ((identifier == null) || (identifier.length() < 1))
return false;
if (!identifier.matches("^(i?)[A-Z][A-Z0-9\\$\\_\\#]*$"))
return false;
/*
* @todo It seems we currently do not have a class for tablespace identifiers, and all other classes
* we do know seem to be supported as 12cR2 long identifiers, so:
*/
return (identifier.length() <= LONG_IDENTIFIERS_LEGNTH);
}
/**
* Returns the maximum number of bytes (NOT: characters) for an identifier. For Oracle <=12c Release 20, this
* is 30 bytes, and starting from 12cR2, up to 128 (except for tablespaces, PDB names and some other rather rare
* object types).
*
* @return the maximum length of an object identifier, in bytes
*/
public int getIdentifierMaximumLength() {
try {
if (getDatabaseMajorVersion() < ORACLE_12C_MAJOR_VERSION) {
return SHORT_IDENTIFIERS_LENGTH;
} else if ((getDatabaseMajorVersion() == ORACLE_12C_MAJOR_VERSION) && (getDatabaseMinorVersion() <= 1)) {
return SHORT_IDENTIFIERS_LENGTH;
} else {
return LONG_IDENTIFIERS_LEGNTH;
}
} catch (DatabaseException ex) {
throw new UnexpectedLiquibaseException("Cannot determine the Oracle database version number", ex);
}
}
}

View File

@ -0,0 +1,165 @@
package liquibase.datatype.core;
import liquibase.change.core.LoadDataChange;
import liquibase.database.Database;
import liquibase.database.core.*;
import liquibase.datatype.DataTypeInfo;
import liquibase.datatype.DatabaseDataType;
import liquibase.datatype.LiquibaseDataType;
import liquibase.exception.UnexpectedLiquibaseException;
import liquibase.statement.DatabaseFunction;
import liquibase.util.StringUtil;
import java.util.Locale;
import java.util.regex.Pattern;
@DataTypeInfo(name = "boolean", aliases = {"java.sql.Types.BOOLEAN", "java.lang.Boolean", "bit", "bool"}, minParameters = 0, maxParameters = 0, priority = LiquibaseDataType.PRIORITY_DEFAULT)
public class BooleanType extends LiquibaseDataType {
@Override
public DatabaseDataType toDatabaseDataType(Database database) {
String originalDefinition = StringUtil.trimToEmpty(getRawDefinition());
if ((database instanceof Firebird3Database)) {
return new DatabaseDataType("BOOLEAN");
}
if ((database instanceof Db2zDatabase) || (database instanceof FirebirdDatabase)) {
return new DatabaseDataType("SMALLINT");
} else if (database instanceof MSSQLDatabase) {
return new DatabaseDataType(database.escapeDataTypeName("bit"));
} else if (database instanceof MySQLDatabase) {
if (originalDefinition.toLowerCase(Locale.US).startsWith("bit")) {
return new DatabaseDataType("BIT", getParameters());
}
return new DatabaseDataType("BIT", 1);
} else if (database instanceof OracleDatabase) {
return new DatabaseDataType("NUMBER", 1);
} else if ((database instanceof SybaseASADatabase) || (database instanceof SybaseDatabase)) {
return new DatabaseDataType("BIT");
} else if (database instanceof DerbyDatabase) {
if (((DerbyDatabase) database).supportsBooleanDataType()) {
return new DatabaseDataType("BOOLEAN");
} else {
return new DatabaseDataType("SMALLINT");
}
} else if (database instanceof DB2Database) {
if (((DB2Database) database).supportsBooleanDataType())
return new DatabaseDataType("BOOLEAN");
else
return new DatabaseDataType("SMALLINT");
} else if (database instanceof HsqlDatabase) {
return new DatabaseDataType("BOOLEAN");
} else if (database instanceof PostgresDatabase) {
if (originalDefinition.toLowerCase(Locale.US).startsWith("bit")) {
return new DatabaseDataType("BIT", getParameters());
}
} else if (database instanceof DmDatabase) { // dhb52: DM Support
return new DatabaseDataType("bit");
}
return super.toDatabaseDataType(database);
}
@Override
public String objectToSql(Object value, Database database) {
if ((value == null) || "null".equals(value.toString().toLowerCase(Locale.US))) {
return null;
}
String returnValue;
if (value instanceof String) {
value = ((String) value).replaceAll("'", "");
if ("true".equals(((String) value).toLowerCase(Locale.US)) || "1".equals(value) || "b'1'".equals(((String) value).toLowerCase(Locale.US)) || "t".equals(((String) value).toLowerCase(Locale.US)) || ((String) value).toLowerCase(Locale.US).equals(this.getTrueBooleanValue(database).toLowerCase(Locale.US))) {
returnValue = this.getTrueBooleanValue(database);
} else if ("false".equals(((String) value).toLowerCase(Locale.US)) || "0".equals(value) || "b'0'".equals(
((String) value).toLowerCase(Locale.US)) || "f".equals(((String) value).toLowerCase(Locale.US)) || ((String) value).toLowerCase(Locale.US).equals(this.getFalseBooleanValue(database).toLowerCase(Locale.US))) {
returnValue = this.getFalseBooleanValue(database);
} else if (database instanceof PostgresDatabase && Pattern.matches("b?([01])\\1*(::bit|::\"bit\")?", (String) value)) {
returnValue = "b'"
+ value.toString()
.replace("b", "")
.replace("\"", "")
.replace("::it", "")
+ "'::\"bit\"";
} else {
throw new UnexpectedLiquibaseException("Unknown boolean value: " + value);
}
} else if (value instanceof Long) {
if (Long.valueOf(1).equals(value)) {
returnValue = this.getTrueBooleanValue(database);
} else {
returnValue = this.getFalseBooleanValue(database);
}
} else if (value instanceof Number) {
if (value.equals(1) || "1".equals(value.toString()) || "1.0".equals(value.toString())) {
returnValue = this.getTrueBooleanValue(database);
} else {
returnValue = this.getFalseBooleanValue(database);
}
} else if (value instanceof DatabaseFunction) {
return value.toString();
} else if (value instanceof Boolean) {
if (((Boolean) value)) {
returnValue = this.getTrueBooleanValue(database);
} else {
returnValue = this.getFalseBooleanValue(database);
}
} else {
throw new UnexpectedLiquibaseException("Cannot convert type " + value.getClass() + " to a boolean value");
}
return returnValue;
}
protected boolean isNumericBoolean(Database database) {
if (database instanceof Firebird3Database) {
return false;
}
if (database instanceof DerbyDatabase) {
return !((DerbyDatabase) database).supportsBooleanDataType();
} else if (database instanceof DB2Database) {
return !((DB2Database) database).supportsBooleanDataType();
}
return (database instanceof Db2zDatabase)
|| (database instanceof FirebirdDatabase)
|| (database instanceof MSSQLDatabase)
|| (database instanceof MySQLDatabase)
|| (database instanceof OracleDatabase)
|| (database instanceof SQLiteDatabase)
|| (database instanceof SybaseASADatabase)
|| (database instanceof SybaseDatabase)
|| (database instanceof DmDatabase); // dhb52: DM Support
}
/**
* The database-specific value to use for "false" "boolean" columns.
*/
public String getFalseBooleanValue(Database database) {
if (isNumericBoolean(database)) {
return "0";
}
if (database instanceof InformixDatabase) {
return "'f'";
}
return "FALSE";
}
/**
* The database-specific value to use for "true" "boolean" columns.
*/
public String getTrueBooleanValue(Database database) {
if (isNumericBoolean(database)) {
return "1";
}
if (database instanceof InformixDatabase) {
return "'t'";
}
return "TRUE";
}
@Override
public LoadDataChange.LOAD_DATA_TYPE getLoadTypeName() {
return LoadDataChange.LOAD_DATA_TYPE.BOOLEAN;
}
}

View File

@ -0,0 +1 @@
防止IDEA将`.``/`混为一谈

View File

@ -0,0 +1,21 @@
liquibase.database.core.CockroachDatabase
liquibase.database.core.DB2Database
liquibase.database.core.Db2zDatabase
liquibase.database.core.DerbyDatabase
liquibase.database.core.Firebird3Database
liquibase.database.core.FirebirdDatabase
liquibase.database.core.H2Database
liquibase.database.core.HsqlDatabase
liquibase.database.core.InformixDatabase
liquibase.database.core.Ingres9Database
liquibase.database.core.MSSQLDatabase
liquibase.database.core.MariaDBDatabase
liquibase.database.core.MockDatabase
liquibase.database.core.MySQLDatabase
liquibase.database.core.OracleDatabase
liquibase.database.core.PostgresDatabase
liquibase.database.core.SQLiteDatabase
liquibase.database.core.SybaseASADatabase
liquibase.database.core.SybaseDatabase
liquibase.database.core.DmDatabase
liquibase.database.core.UnsupportedDatabase

Some files were not shown because too many files have changed in this diff Show More