linweidong
/
besure_server
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,843 Commits
3 Branches
0 Tags
333 MiB
main
hhk
plp
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '039a2b1278'
${ noResults }
Commit Graph

447 Commits (039a2b1278d8c5d73fafadebb401ec7ef9130598)

Author SHA1 Message Date
YunaiV 973b710992 code review：crm 商机 2 years ago
YunaiV d1978d318b code review：crm 合同 2 years ago
YunaiV fe50356ae8 code review：crm 客户模块的实现 2 years ago
YunaiV 0657c357bf Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm 2 years ago
Wanwan 3af9688383 feat: 调整客户表的字段 2 years ago
Wanwan c18f5baa4b feat: 调整客户表的字段 2 years ago
YunaiV bf247a6626 Merge branch 'feature/crm' of https://gitee.com/ljlleo/ruoyi-vue-pro into feature/crm 
# Conflicts:
#	sql/mysql/crm.sql
 2 years ago
芋道源码 0719efb4c2
!695 feat: 客户表的 crud 
Merge pull request !695 from wanwan/feature/crm
 2 years ago
owen 3a2ccc9d6b 营销：装修模板、装修页面 2 years ago
ljlleo 75115bcc48 1、商机前端页面； 
2、商机状态类型和商机状态字段的处理；
 2 years ago
jason 626bd0bd55 转账 - code review 修改 2 years ago
Wanwan 04613af0cd feat: 客户表的 crud 2 years ago
YunaiV 3fdc132c17 1.8.3 版本发布 2 years ago
YunaiV df00126fa4 统一 boot 和 cloud 代码 2 years ago
jason 86598dd177 转账 - 动态收款人字段修改 2 years ago
zyna 918ffc40ae crm联系人前端init 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 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 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
jason 89e847c8cd 钱包，转账 review 修改 2 years ago
913752709@qq.com e4eeaa1d69 feat: crm 线索表完善 review 提到的问题 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
芋道源码 8bd1942083
!676 交易：核销订单 
Merge pull request !676 from 疯狂的世界/feature/mall_product
 2 years ago
YunaiV f8e4aece31 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 2 years ago
wanwan 48661f980c !679 feat: CRM 线索表 crud 
* feat: CRM 线索表 crud
* feat: CRM 线索表 crud
 2 years ago
YunaiV d256275099 saas：支持社交应用的多租户配置 2 years ago
913752709@qq.com a09ee495b6 feat: CRM 线索表 crud 2 years ago
zhijiantianya@gmail.com 00e18a480f code review：钱包、充值、转账的实现 2 years ago
owen 0c4713b7e0 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 
# Conflicts:
#	sql/mysql/mall.sql
 2 years ago
YunaiV 5842a361e2 同步最新 SQL 脚本 2 years ago
owen 0612a13cce 交易：核销订单 2 years ago
dhb52 164be5732b feat: CRM/合同管理 - SQL 2 years ago
YunaiV d2112458d2 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2 years ago
YunaiV 1ff9bc6a71 code review：文章管理 2 years ago
jason 34210d3534 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2 years ago
jason 7d0bcf5d3b wallet - 管理端钱包余额菜单脚本 2 years ago
owen 6f08645f61 会员：增加字段【注册终端】 2 years ago
owen df70402484 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2 years ago
owen f5dac38ca5 商城：增加商城首页 2 years ago
jason 3db7b30e66 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2 years ago
jason fcbbbc737d wallet - 管理端, 充值套餐脚本 2 years ago
YunaiV ca5e3f7bd1 优化最新的商城的 sql 2 years ago
jason 2e207019b3 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2 years ago
jason 571961b4da 充值套餐修改 2 years ago
owen df16278a03 统计：会员统计 2 years ago
YunaiV 6a04d6c458 promotion：新增助力记录列表 2 years ago
YunaiV d4417d2474 code review：积分、优惠劵、佣金等逻辑 2 years ago
YunaiV 057952bdeb Merge branch 'feature/mall_product' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product 
# Conflicts:
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/LocalDateTimeUtils.java
 2 years ago
YunaiV b74169acfc trade：优化订单列表的查询 2 years ago
owen 2168145c3e 会员：会员配置的积分相关字段加上point前缀 2 years ago
owen ab35fcbe9b 会员：积分配置改为会员配置 2 years ago
owen 4f03635fcd 签到：签到后增加用户积分、经验 2 years ago
owen e7876b1520 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2 years ago
YunaiV 16cea61435 wallet：增加充值套餐 2 years ago
owen 42a899c5d3 交易：订单增加字段 推广人编号 2 years ago
owen 497ea2eee8 会员详情，修改会员积分 2 years ago
owen 929ff4286a Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2 years ago
owen 171161e6c7 统计：交易统计 2 years ago
jason 57d782bc94 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 
# Conflicts:
#	yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java
 2 years ago
jason ce6f7ab1b1 Pay: 新增转账示例单 2 years ago
YunaiV 5913ee0706 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
#	yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityDetailRespVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityRespVO.java
#	yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementReqVO.java
#	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
#	yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java
#	yudao-server/src/main/resources/application-local.yaml
 2 years ago
YunaiV eeb8873b1d trade：微调交易配置的注释 2 years ago
owen 0a3a6825d5 优惠券：完善APP优惠券查询接口 2 years ago
YunaiV 9b7c757942 1.8.2 版本发布 2 years ago
owen 0b84c18736 分销：修正分享海报 2 years ago
owen 967e578d54 分销：重命名提现类型字段 2 years ago
dhb52 2a9aa357cb fix: 对具有软删除的表去除UNIQUE INDEX 2 years ago
owen 052328c5fa 积分：完善积分获得、退还、使用 相关逻辑 2 years ago
owen dc46dff62c Merge remote-tracking branch 'origin/feature/mall_product' into brokerate 2 years ago
owen bbd18afbcc 分佣: 简化推广用户关系树查询方式 2 years ago
owen 6e6486ccae Trade: 完善配置 2 years ago
jason 910ffa7a5a 钱包充值退款 2 years ago
owen a7de955926 trade: 分销业务 - 提现申请 2 years ago
jason c880dbfa60 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2 years ago
jason dbd7ab5f23 code review 修改 2 years ago
owen 32e1fc66ce trade: 分销业务 - 佣金提现后台管理 2 years ago
owen a3e8b42be6 trade: 分销业务review代码修改 2 years ago
jason 0e1b8126dd 新增钱包充值。启动报错修复 2 years ago
jason bcb3b19418 钱包充值 表结构设计 2 years ago
YunaiV 8b50cd9661 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
 Conflicts:
	yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationRecordController.java
	yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java
	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
	yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java
 2 years ago
owen cddeb37289 Merge remote-tracking branch 'origin/feature/mall_product' into brokerate 
# Conflicts:
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/record/BrokerageRecordConvert.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/user/BrokerageUserConvert.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/record/BrokerageRecordServiceImpl.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/user/BrokerageUserServiceImpl.java
 2 years ago
owen 6c193f723f trade: 分销业务后台功能：推广订单列表 2 years ago
jason 5858f57fe9 钱包 review 修改 2 years ago
owen ca55e61dd2 trade: 分销业务后台功能：清除推广员、修改推广资格 2 years ago
owen 1ead368595 trade: 优化分销用户佣金字段名称 2 years ago
owen 4b43304c76 trade: 优化分销用户绑定用户编号、绑定时间字段名称 2 years ago
owen 1cc2dfc963 trade: 分销Review代码修改 2 years ago
owen 166b1b31c0 trade: 分销用户管理 2 years ago
samisgod a4d6d5e6c3 fix db creation error 2 years ago
YunaiV eb342d5abf Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 
# Conflicts:
#	yudao-module-member/yudao-module-member-biz/src/test/resources/sql/create_tables.sql
 2 years ago
YunaiV bf92727b27 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 
 Conflicts:
	yudao-module-member/yudao-module-member-biz/src/test/resources/sql/create_tables.sql
 2 years ago
owen fa53a3b15e trade: MemberBrokerageRecord 重命名为 TradeBrokerageRecord 2 years ago
owen a68691f2d9 trade: 增加分销用户表 2 years ago
owen 6474502738 trade: 增加交易中心配置表 2 years ago
芋道源码 a58d7d63ed
!606 会员：分销佣金计算 
Merge pull request !606 from 疯狂的世界/brokerage
 2 years ago
owen c7ef8519c8 member: 分销增加佣金 2 years ago
jason cc4c924717 钱包 review DO 类修改 2 years ago