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

499 Commits

Author SHA1 Message Date
YunaiV
f9a50116bc 【修复】商城系统：管理后台修改待支付订单，调整价格取值错误 2024-05-02 09:13:31 +08:00
YunaiV
ab00986a1d Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17 2024-05-01 08:37:56 +08:00
YunaiV
9ae7001095 【修复】mall：配送模版更新时，diff 比较的 id 不正确，导致未完全使用增量更新 2024-04-24 13:06:34 +08:00
YunaiV
9cba258d8f Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21 2024-04-12 19:14:56 +08:00
YunaiV
1e348dbf83 【优化】将项目的 annotations 统一修改成 annotation 包 2024-04-11 22:52:34 +08:00
YunaiV
2e03dcba69 移除 resilience4j 组件 2024-04-10 20:57:44 +08:00
YunaiV
9b9f54bb03 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop 
# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
#	yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java
 2024-04-05 13:32:17 +08:00
YunaiV
20583417a4 【重构】V2 操作日志转正，基于注解的可使用变量、可以自定义函数的通用操作日志组件 2024-04-04 01:49:49 +08:00
YunaiV
5faa006dd0 bugfix：修复拼团详情错误传递 groupon_id 的问题 2024-03-30 15:28:46 +08:00
YunaiV
3b379d8cc0 Merge branch 'develop' of https://gitee.com/puhui999/ruoyi-vue-pro into develop 
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/statistics/CrmStatisticsCustomerController.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsCustomerServiceImpl.java
 2024-03-30 11:54:27 +08:00
YunaiV
a80ba48889 bugfix：同步 master 修改的 bug 2024-03-28 19:05:16 +08:00
puhui999
0dd36f6c5c MALL: fix 订单价格分摊 2024-03-10 19:07:24 +08:00
YunaiV
d556b29214 CRM：code review 权限的优化 2024-03-09 18:27:58 +08:00
YunaiV
dda0909843 🎉 2.0.1 版本发布！ 2024-03-01 20:01:16 +08:00
YunaiV
7ef7228f65 MALL：增加返回 vipPrice 减免金额 2024-03-01 19:21:03 +08:00
YunaiV
da6e01f6b5 bugfix：运行失败的单测 
bugfix：PayOrderExtensionMapper 的 selectListByStatusAndCreateTimeGe 查询时间范围不对的问题
 2024-03-01 12:26:05 +08:00
YunaiV
8ff710e49d ✨ 同步 master 的一些 pr 代码变更 2024-03-01 09:00:43 +08:00
YunaiV
1f4889c68e ✨ 全局：将 dict 组件，融合到 excel 组件里，减少 starter 2024-02-28 21:42:32 +08:00
YunaiV
6dcb1277b3 ✨ 全局：迁移 pay 组件到 pay 模块，迁移 flowable 组件到 bpm 模块 2024-02-28 21:03:40 +08:00
YunaiV
023a7b14d8 ✨ 统一 JDK8 和 JDK21 相关代码 2024-01-19 12:38:57 +08:00
YunaiV
6dbc942cdd ✨ MALL：修复售后确认退款时，缺少退款描述信息 2024-01-16 22:41:37 +08:00
YunaiV
bbee720710 📖 CRM：code review 拼团记录的实现 2024-01-13 19:34:49 +08:00
YunaiV
df9ff3fc5c 🐛 MALL：修复 issue 提到的 bug 2024-01-07 20:51:57 +08:00
YunaiV
f73cb540cf ✨ MALL：去除分销提现的银行配置 2024-01-05 22:46:35 +08:00
YunaiV
33c3686bef ✨ MALL：合并订单和售后订单的数量接口 2023-12-28 23:15:25 +08:00
YunaiV
c019136f07 ✨ Member：增加积分记录的时间筛选 2023-12-27 20:39:14 +08:00
YunaiV
d65c28d7f7 ✨ Member：社交登录逻辑调整，如果登录时无用户，则自动创建用户，保持和各 App 统一逻辑 2023-12-23 09:59:58 +08:00
YunaiV
07e610b3f7 🔥 MALL：移除商品收藏的批量操作接口，由前端自身 for 处理 2023-12-15 00:02:40 +08:00
YunaiV
c1429dd3a0 ✨ 增加售后日志列表 API 2023-12-14 20:07:35 +08:00
YunaiV
98697ee075 ⬆️ 2023-12-07 20:48:11 +08:00
YunaiV
eeeafcc10c 1.9.0 版本发布 2023-11-30 21:14:13 +08:00
YunaiV
126dc610b1 1.8.3 版本发布 2023-10-24 23:14:14 +08:00
YunaiV
7bff98b658 统一 boot 和 cloud 代码 2023-10-23 23:48:06 +08:00
YunaiV
728308cbc0 member：优化部分变量的命名 2023-10-22 16:35:48 +08:00
YunaiV
6c8e82ca5a code review：自提统计 2023-10-20 00:30:27 +08:00
芋道源码
8bd1942083
!676 交易：核销订单 
Merge pull request !676 from 疯狂的世界/feature/mall_product
 2023-10-19 15:59:00 +00:00
YunaiV
d256275099 saas：支持社交应用的多租户配置 2023-10-18 23:48:14 +08:00
owen
0c4713b7e0 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 
# Conflicts:
#	sql/mysql/mall.sql
 2023-10-17 23:29:11 +08:00
owen
0612a13cce 交易：核销订单 2023-10-17 23:18:08 +08:00
zhijiantianya@gmail.com
4b0333f3e9 code review：订单统计 2023-10-17 20:42:22 +08:00
owen
b1e0129046 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 
# Conflicts:
#	sql/mysql/statistics.sql
 2023-10-17 16:13:46 +08:00
owen
5e65512a92 交易：订单核销 2023-10-17 16:09:37 +08:00
YunaiV
1ff9bc6a71 code review：文章管理 2023-10-16 22:51:19 +08:00
芋道源码
cebdc190b6
!668 营销活动：完善文章相关 app 端接口，完善 review 提到的问题 
Merge pull request !668 from puhui999/feature/mall_product
 2023-10-16 13:55:47 +00:00
owen
6fbb7d6d6d 终端类型参数改为从Controller传入 2023-10-16 21:01:01 +08:00
zhijiantianya@gmail.com
b6e63e885d code review：商城统计 2023-10-16 20:01:25 +08:00
puhui999
4273b8f09c 营销活动：完善 review 提到的问题 2023-10-16 18:53:25 +08:00
owen
76f512fc7a 1. APP增加终端Header[terminal] 
2. 订单、会员注册记录来源终端
 2023-10-16 15:06:59 +08:00
YunaiV
4359c584bb code review：拼团逻辑 2023-10-16 09:07:02 +08:00
puhui999
1fe6c82899 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-10-15 16:17:14 +08:00