liuhongfeng
|
301f497527
|
【新增】回款计划-审批枚举类
【新增】回款计划-回款方式枚举类
【新增】回款计划-枚举类校验
【修改】回款计划-错误码调整
【修改】修改回款计划-创建逻辑，添加合同数据的校验
|
2 years ago |
YunaiV
|
55f9e0131c
|
code review：CRM 客户联系人的管理
|
2 years ago |
|
YunaiV
|
723707c7ed
|
Merge branch 'feature/crm' of https://gitee.com/zyna/ruoyi-vue-pro into feature/crm
# Conflicts:
# sql/mysql/crm.sql
# yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
|
2 years ago |
|
YunaiV
|
b5560fa0be
|
code review：CRM 线索表的逻辑
|
2 years ago |
|
YunaiV
|
9cf4cfca86
|
Merge branch 'feature/crm' of https://gitee.com/jiangwanwan/ruoyi-vue-pro into feature/crm
# Conflicts:
# sql/mysql/crm.sql
|
2 years ago |
|
YunaiV
|
f942e2c7f2
|
code review：CRM 回款计划的逻辑
|
2 years ago |
|
YunaiV
|
56b59cf383
|
Merge branch 'feature/crm' of https://gitee.com/souvc/ruoyi-vue-pro into feature/crm
# Conflicts:
# sql/mysql/crm.sql
# sql/mysql/crm_menu.sql
# yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
|
2 years ago |
|
YunaiV
|
6f8fd383f7
|
code review：CRM 商机的逻辑
|
2 years ago |
|
芋道源码
|
24e6deb82b
|
!682 商机
Merge pull request !682 from 刘先生/feature/crm
|
2 years ago |
913752709@qq.com
|
e4eeaa1d69
|
feat: crm 线索表完善 review 提到的问题
|
2 years ago |
|
913752709@qq.com
|
435d7dcfca
|
Merge remote-tracking branch 'origin/feature/crm' into feature/crm
# Conflicts:
# yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/CrmClueController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmClueBaseVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmCluePageReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/clue/CrmClueDO.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/clue/CrmClueServiceImplTest.java
|
2 years ago |
|
liuhongfeng
|
34a5785768
|
【新增】回款计划 功能
|
2 years ago |
zyna
|
e4943f0dfa
|
crm联系人
|
2 years ago |
|
liuhongfeng
|
73f4fc8ceb
|
【新增】回款管理 功能
|
2 years ago |
ljlleo
|
01490c879c
|
商机sql
|
2 years ago |
|
ljlleo
|
bee6f41211
|
商机
|
2 years ago |
|
YunaiV
|
439edcd1be
|
code review：crm 线索的 crud
|
2 years ago |
|
wanwan
|
48661f980c
|
!679 feat: CRM 线索表 crud
* feat: CRM 线索表 crud
* feat: CRM 线索表 crud
|
2 years ago |
|
913752709@qq.com
|
1b6c8574cd
|
feat: CRM 线索表 crud
|
2 years ago |
|
913752709@qq.com
|
a09ee495b6
|
feat: CRM 线索表 crud
|
2 years ago |
|
YunaiV
|
b133acd8cd
|
code review：crm 合同流程
|
2 years ago |
|
芋道源码
|
07f3d09e38
|
!671 CRM/合同管理 CRUD初稿
Merge pull request !671 from dhb52/feature/crm
|
2 years ago |
dhb52
|
164be5732b
|
feat: CRM/合同管理 - SQL
|
2 years ago |
|
dhb52
|
eedb528412
|
feat: CRM/合同管理 - crud
|
2 years ago |
|
dhb52
|
e26bd20a5b
|
feat:添加测试配置及excel依赖
|
2 years ago |
|
YunaiV
|
7e312aae02
|
初始化 crm 模块
|
2 years ago |
|
芋道源码
|
82fd800ad2
|
!641 操作日志搜索参数名修改
Merge pull request !641 from ligitee/N/A
|
2 years ago |
|
芋道源码
|
fa600dbb44
|
!662 【工作流】添加vue2版本的退回和委派前端代码
Merge pull request !662 from LiuMoffett/moffett
|
2 years ago |
|
YunaiV
|
82545ddaac
|
优化 README.md，减少静态资源加载
|
2 years ago |
|
YunaiV
|
04d491b90d
|
优化 README.md，减少静态资源加载
|
2 years ago |
|
YunaiV
|
625504333b
|
优化 README.md
|
2 years ago |
|
YunaiV
|
3105d86b7d
|
优化 README.md
|
2 years ago |
|
YunaiV
|
7a9dbfe41d
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
YunaiV
|
b30754a0a4
|
同步最新 mall 代码
|
2 years ago |
|
YunaiV
|
a72869b97e
|
code review：修复部分统计报错
|
2 years ago |
liuxiaolu
|
9a876cff3d
|
feat:【工作流】添加vue2版本的退回和委派前端代码
|
2 years ago |
|
YunaiV
|
fef808d88c
|
code review：统计代码
|
2 years ago |
|
YunaiV
|
704087ce86
|
Merge branch 'feature/mall_product' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product
# Conflicts:
# yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApi.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApiImpl.java
|
2 years ago |
|
YunaiV
|
670a098aa8
|
code review：拼团记录流程
|
2 years ago |
|
芋道源码
|
708af92a0f
|
!660 优化订单 OrderHandler 实现
Merge pull request !660 from 芋道源码/feature/mall_product_tmp
|
2 years ago |
|
YunaiV
|
b0179457ce
|
重构：将订单的分支流程，抽到 TradeOrderHandler 实现类中（补全各种排重逻辑）
|
2 years ago |
|
YunaiV
|
41e5cf5285
|
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product_tmp
# Conflicts:
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeBargainOrderHandler.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeCombinationOrderHandler.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeSeckillOrderHandler.java
|
2 years ago |
|
芋道源码
|
7181ccbcef
|
!657 营销活动：完成砍价、秒杀库存回滚。完成拼团过期和虚拟成团处理
Merge pull request !657 from puhui999/feature/mall_product
|
2 years ago |
|
YunaiV
|
150a1c9771
|
重构：将订单的分支流程，抽到 TradeOrderHandler 实现类中（取消的排重逻辑）
|
2 years ago |
|
YunaiV
|
2e5cc0537b
|
重构：将订单的分支流程，抽到 TradeOrderHandler 实现类中
|
2 years ago |
puhui999
|
cfbc8b4849
|
拼团记录（admin-api）：增加 page-by-headId 接口获取指定 headId 完整拼团列表分页
|
2 years ago |
|
puhui999
|
bccd270fc7
|
营销活动：完成砍价、秒杀库存回滚。完成拼团过期和虚拟成团处理
|
2 years ago |
|
puhui999
|
fdbebc406c
|
秒杀活动：纠正秒杀库存和秒杀总库存扣减错误的问题
|
2 years ago |
|
puhui999
|
42fcbe0501
|
砍价活动：完成订单取消时恢复活动库存
|
2 years ago |
|
puhui999
|
245f14b8f1
|
秒杀活动：完成订单取消时恢复活动库存和商品库存
|
2 years ago |