lxd/FlowPacs
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,849 Commits 2 Branches 0 Tags 165 MiB
8cbf9d7c8a
Commit Graph

6849 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
puhui999
0043d02d0a fix：商机 api 文档生成不对的问题 2024-03-09 14:31:43 +08:00
YunaiV
89fc83c419 CRM：code review 客户权限的实现 2024-03-09 11:58:05 +08:00
芋道源码
e2ec426a9f
!900 CRM：完善数据权限，实现数据权限同时添加、同时转移 
Merge pull request !900 from puhui999/develop
 2024-03-09 03:18:12 +00:00
芋道源码
271610bf6b
!899 fix:包冲突 积木报表 导出Excel报错 
Merge pull request !899 from 李占宏/develop
 2024-03-09 03:13:03 +00:00
芋道源码
d4e39dfc40
!904 feat: MapUtils.findAndThen，key 为 null 时, 不处理 
Merge pull request !904 from dhb52/N/A
 2024-03-09 03:10:16 +00:00
芋道源码
8faae78bfe
!903 fix: 使用convertSetByFlatMap避免 ID 重复 
Merge pull request !903 from dhb52/N/A
 2024-03-09 03:09:35 +00:00
芋道源码
7aa930c89f
Merge pull request #414 from iridescentGray/master 
fix: 错误码bug
 2024-03-09 11:08:18 +08:00
YunaiV
d30700d060 【修复】微信支付时，无法保证父线程的 ThreadLocal 传入子线程 2024-03-09 11:03:17 +08:00
YunaiV
37a05871fd 清理 pay 目录 2024-03-09 10:54:06 +08:00
scholar
e86059ed80 CRM员工业绩统计PR v1.0 2024-03-08 10:11:47 +08:00
dhb52
0386820a1c feat: 增加[客户行业、客户来源]等字段显示，重构代码 2024-03-05 23:16:16 +08:00
dhb52
f4b1e9ca4a
feat: MapUtils.findAndThen，key 为 null 时, 不处理 
Signed-off-by: dhb52 <dhb52@126.com>
 2024-03-05 15:13:53 +00:00
dhb52
06c0d86544
fix: 使用convertSetByFlatMap避免 ID 重复 
Signed-off-by: dhb52 <dhb52@126.com>
 2024-03-05 15:08:40 +00:00
dhb52
a23ea45632 fix: [CRM-客户统计]根据Code-Review 修改 2024-03-04 23:51:25 +08:00
puhui999
ba1b028001 CRM：完善数据权限，实现数据权限同时添加、同时转移 2024-03-03 20:10:30 +08:00
E1
79c51c6433
修复 Java21版本下docker-compose中Redis Host参数名称不正确的问题 
Signed-off-by: E1 <876394202@qq.com>
 2024-03-03 10:26:28 +00:00
puhui999
f56fab932a CRM：完善 excel 导出 review 提到的问题 2024-03-02 23:24:42 +08:00
zhanhong
29b7106985 fix:包冲突 积木报表 导出Excel报错 2024-03-02 13:26:05 +08:00
zhanhong
1e13365ef4 pom 2024-03-02 13:23:54 +08:00
zhanhong
e7cc305362 Merge remote-tracking branch 'origin/develop' into develop 2024-03-02 13:23:05 +08:00
YunaiV
1f35ef59d1 CRM：code review excel 导出的重构 2024-03-02 00:25:51 +08:00
YunaiV
fc7734319b Merge branch 'develop' of https://gitee.com/puhui999/ruoyi-vue-pro into develop 
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableServiceImpl.java
 2024-03-01 23:46:50 +08:00
YunaiV
379bd95840 CRM：code review 客户分析（客户总量分析） 2024-03-01 23:37:07 +08:00
芋道源码
2bf5c7a701
!889 feat: CRM/数据统计/员工客户分析 初稿 
Merge pull request !889 from dhb52/develop
 2024-03-01 14:21:40 +00:00
YunaiV
bb0d0e5ed5 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-module-bpm/yudao-module-bpm-biz/src/test/java/cn/iocoder/yudao/module/bpm/service/candidate/BpmCandidateSourceInfoProcessorChainTest.java
#	yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/product/CrmProductStatusEnum.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/followup/CrmFollowUpRecordController.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/product/CrmProductController.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/product/CrmProductServiceImpl.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableServiceImpl.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/controller/app/order/vo/AppTradeOrderDetailRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/aftersale/AfterSaleServiceImpl.java
#	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/main/java/cn/iocoder/yudao/module/pay/dal/mysql/order/PayOrderExtensionMapper.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceImpl.java
#	yudao-module-pay/yudao-module-pay-biz/src/test/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceTest.java
#	yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/PayClientFactoryImpl.java
#	yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayWapPayClient.java
#	yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/enums/channel/PayChannelEnum.java
#	yudao-module-report/yudao-module-report-biz/src/test/java/cn/iocoder/yudao/module/report/service/ureport/UReportDataServiceImplTest.java
 2024-03-01 20:04:31 +08:00
YunaiV
e091b077a8 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-03-01 20:01:38 +08:00
YunaiV
dda0909843 🎉 2.0.1 版本发布！ 2024-03-01 20:01:16 +08:00
YunaiV
d3f3584132 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-03-01 19:40:52 +08:00
YunaiV
835bbe7e42 🎉 2.0.1 版本发布！ 2024-03-01 19:40:37 +08:00
YunaiV
7ef7228f65 MALL：增加返回 vipPrice 减免金额 2024-03-01 19:21:03 +08:00
zhanhong
ca7b19c40b pom 2024-03-01 19:06:24 +08:00
zhanhong
0bd7d310a1 pom 2024-03-01 19:05:54 +08:00
zhanhong
7841fba59b fix:积木报表导出Excel报错（包冲突） 2024-03-01 19:00:10 +08:00
zhanhong
6846d429c0 re 2024-03-01 18:59:49 +08:00
zhanhong
01695567a1 re 2024-03-01 18:59:11 +08:00
zhanhong
a787f2a0cd fix:积木报表导出Excel报错（包冲突） 2024-03-01 18:57:12 +08:00
YunaiV
6b06bf8a3d bugfix MALL：已过期的优惠劵，还显示可以使用 2024-03-01 13:55:37 +08:00
YunaiV
f1ff656282 bugfix：运行失败的单测 
bugfix：PayOrderExtensionMapper 的 selectListByStatusAndCreateTimeGe 查询时间范围不对的问题
 2024-03-01 12:35:00 +08:00
YunaiV
831cf33e95 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
#	yudao-module-pay/yudao-module-pay-biz/src/test/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceTest.java
 2024-03-01 12:26:40 +08:00
YunaiV
da6e01f6b5 bugfix：运行失败的单测 
bugfix：PayOrderExtensionMapper 的 selectListByStatusAndCreateTimeGe 查询时间范围不对的问题
 2024-03-01 12:26:05 +08:00
YunaiV
bbdedd08f1 Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/redis/RedisController.java
 2024-03-01 09:39:55 +08:00
YunaiV
d8bfed5c87 fix: 获取redis命令统计指令有误 2024-03-01 09:39:27 +08:00
YunaiV
8a93a4d988 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop 2024-03-01 09:32:25 +08:00
芋道源码
a4c7946830
!887 fix: 获取redis命令统计指令有误 
Merge pull request !887 from dhb52/N/A
 2024-03-01 01:32:08 +00:00
芋道源码
9b7f71c203
!896 fix:跟进记录分页不显示商机 
Merge pull request !896 from 李占宏/develop
 2024-03-01 01:30:49 +00:00
zhanhong
814acb83ae fix:跟进记录分页不显示商机 2024-03-01 09:28:06 +08:00
YunaiV
257127df5b Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceImpl.java
 2024-03-01 09:26:04 +08:00
YunaiV
d5aa827b86 !895 新增支持微信H5网页支付 2024-03-01 09:25:47 +08:00
YunaiV
10cc9fa77f Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-03-01 09:01:05 +08:00
YunaiV
8ff710e49d ✨ 同步 master 的一些 pr 代码变更 2024-03-01 09:00:43 +08:00