szz
/
ShiShiYiBan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,233 Commits 13 Branches 41 Tags 242 MiB
Commit Graph

1372 Commits

Author SHA1 Message Date
YunaiV d621d8254d 【同步】jdk21 和 jdk8 的代码 2025-04-12 12:06:00 +08:00
YunaiV d8451b004e Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/kefu/KeFuMessageServiceImpl.java
 2025-04-12 11:56:35 +08:00
YunaiV be416b7d78 【代码优化】MALL：在线客服的注释 2025-04-03 23:33:21 +08:00
YunaiV 1e4e02ec2f Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17 2025-04-01 19:16:02 +08:00
puhui999 40b6e5a3bb 【缺陷修复】商城：检查是否包邮 2025-04-01 18:04:17 +08:00
puhui999 81124292fd 【代码优化】商城：客服消息携带用户头像信息 2025-04-01 16:28:02 +08:00
YunaiV 7609c74c8b Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/BpmHttpRequestUtils.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java
 2025-03-16 17:22:39 +08:00
YunaiV 8ccc55d1aa 【功能优化】商城：KdNiaoExpressClient 增加 requestType 配置，使用免费版，还是增值版 2025-03-16 16:45:48 +08:00
YunaiV 2dc8071faa 【功能优化】全局：增加 selectFirstOne 方法，解决容易出现并发场景下的查询 2025-03-16 16:31:36 +08:00
芋道源码 0debd8e069
!1247 【bugfix】新人券已关闭但是注册时仍然发放了update module/promotion/dal/mysql/coupon/CouponTemplateMapper.java. 
Merge pull request !1247 from 山野羡民/N/A
 2025-03-15 13:18:36 +00:00
YunaiV a4815b30d0 【缺陷修复】商城：修正商城中将会员等级关闭，还继续计算折扣价格 2025-03-15 21:16:53 +08:00
YunaiV 41640642d4 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java
 2025-03-15 06:56:16 +08:00
山野羡民 db9534073b
【bugfix】新人券已关闭但是注册时仍然发放了update module/promotion/dal/mysql/coupon/CouponTemplateMapper.java. 
Signed-off-by: 山野羡民 <liyujiang_tk@yeah.net>
 2025-02-20 02:43:13 +00:00
山野羡民 12170402e2
【性能优化】循环中减少不必要的查询 update r/yudao/module/promotion/service/coupon/CouponServiceImpl.java. 
Signed-off-by: 山野羡民 <liyujiang_tk@yeah.net>
 2025-02-20 02:39:48 +00:00
YunaiV 21a9d37f97 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2025-02-15 10:03:12 +08:00
YunaiV 3c10dcf392 【功能修复】MALL：管理后台，无法查询到订单的情况 2025-02-15 10:02:48 +08:00
YunaiV a44a45a2cb Merge branch 'master-jdk17' 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
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/trigger/BpmHttpRequestTrigger.java
 2025-02-09 11:36:21 +08:00
YunaiV d75d71d7d0 1218 如果没查到用户也有可能是空结果集，不一定是null 2025-02-09 07:26:30 +08:00
mcwindy 4e43958fe3 fix typo: adminTenentId -> adminTenantId, appTenentId -> appTenantId 2025-02-05 11:42:59 +08:00
YunaiV aab61f7963 【代码评审】Bpm：更多设置-摘要设置 2025-01-24 21:03:55 +08:00
YunaiV 0911d42e49 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/validation/InEnum.java
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/validation/InEnumCollectionValidator.java
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/validation/InEnumValidator.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/BrokerageUserController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java
 2025-01-24 20:56:26 +08:00
YunaiV 295fad7d97 Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17 2025-01-24 20:17:17 +08:00
puhui999 d83b7cd5b9 【代码优化】InEnum 不必须指定 int 类型，通过泛型指定 2025-01-24 17:31:41 +08:00
puhui999 e89e3c946d 【缺陷修复】商城：虚拟成团后所有成员添加虚拟成团标记 2025-01-23 12:08:05 +08:00
puhui999 30a24601cd 【缺陷修复】商城：修复积分不够还能兑换商品的 bug 2025-01-23 11:55:30 +08:00
puhui999 d3352308d4 【代码优化】积分商城 2025-01-23 10:49:08 +08:00
YunaiV 2725376b91 【缺陷修复】商城：分销用户累计已提现查询使用 WITHDRAW_SUCCESS 体现成功状态查询 2025-01-17 20:04:09 +08:00
puhui999 2451942cf2 【代码优化】商城：分销用户绑定移除 try catch，错误消息由前端进行特殊处理 2025-01-10 16:24:36 +08:00
puhui999 b1c115d221 【代码优化】商城：分销用户累计已提现查询 2025-01-10 15:50:15 +08:00
puhui999 adff185716 【缺陷修复】商城：分销用户累计已提现查询使用 WITHDRAW_SUCCESS 体现成功状态查询 2025-01-07 17:00:01 +08:00
puhui999 1d597403c9 【缺陷修复】商城：绑定分享人失败记录 log error 日志, 前端不提示错误信息 2025-01-07 11:05:38 +08:00
壁虎 39ac9053fd 【缺陷修复】退款回收优惠券错误 2025-01-05 16:19:40 +08:00
YunaiV 3871a1f83f Merge branch 'master-jdk17' 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/service/task/BpmProcessInstanceServiceImpl.java
 2024-12-31 09:22:59 +08:00
YunaiV cdb31679da 【功能修复】商城：限时折扣在 activityIds、skuIds 为空时，报 SQL 不正确的问题 2024-12-28 19:30:57 +08:00
YunaiV d676dcc525 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelSaveReqVO.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
 2024-12-27 21:46:30 +08:00
YunaiV b1b74cf14a 【漏洞修复】由于自增id可猜测，需避免别有用心之人删除别人的购物车 update /yudao/module/trade/service/cart/CartServiceImpl 2024-12-27 21:46:01 +08:00
芋道源码 8c4f906da4
!1168 【漏洞修复】由于自增id可猜测，需避免别有用心之人删除别人的购物车 update /yudao/module/trade/service/cart/CartServiceImpl.java. 
Merge pull request !1168 from 山野羡民/N/A
 2024-12-27 13:45:35 +00:00
YunaiV 5998df0119 【同步】jdk21 和 jdk8 的代码 2024-12-27 21:41:39 +08:00
YunaiV 9039af46d4 Merge branch 'master-jdk17' 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/brokerage/BrokerageRecordServiceImpl.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserService.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeCouponOrderHandler.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/level/MemberLevelApiImpl.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/point/MemberPointApiImpl.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/point/MemberPointRecordServiceImpl.java
 2024-12-27 21:30:31 +08:00
YunaiV fa526a98c0 Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17 2024-12-27 21:29:41 +08:00
山野羡民 fb436ac189
【漏洞修复】由于自增id可猜测，需避免别有用心之人删除别人的购物车 update /yudao/module/trade/service/cart/CartServiceImpl.java. 
Signed-off-by: 山野羡民 <liyujiang_tk@yeah.net>
 2024-12-21 06:55:11 +00:00
YunaiV 50536f1af0 Merge branch 'master-jdk17' 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
 2024-12-19 21:27:52 +08:00
山野羡民 797d8f32dc
接口文档标签错误 update /trade/controller/app/aftersale/AppAfterSaleLogController.java. 
Signed-off-by: 山野羡民 <liyujiang_tk@yeah.net>
 2024-12-15 03:32:52 +00:00
芋道源码 87b75e18f0
!1150 【轻量级 PR】：修复订单改价后退款时，退款金额异常问题（提交版本master-jdk17） 
Merge pull request !1150 from RLgitee7311/master-jdk17
 2024-12-15 03:02:16 +00:00
YunaiV 6ffb4ed116 【缺陷修复】商城: 订单支付后记录 log error 日志，保证订单最大化可推导。 2024-12-11 12:59:10 +08:00
芋道源码 01fca4e9c7
!1151 【缺陷修复】商城：订单支付后 
Merge pull request !1151 from puhui999/develop2
 2024-12-11 04:53:46 +00:00
puhui999 313494400e 【缺陷修复】商城: 订单支付后记录 log error 日志，保证订单最大化可推导。 2024-12-09 14:43:46 +08:00
puhui999 4b0459501f 【缺陷修复】商城: 返回 spu 配送方式 2024-12-09 12:05:58 +08:00
RL1127 50b2a1d53f (提交版本master-jdk17)问题：订单正在待支付的时候，连续更改多次价格，如果更改次数超过两次，在订单结束后，客户想退款，会发现退款金额显示的不是最后更改的金额，而是原始金额。 
修复：确保每次更新时，adjustPrice 和 payPrice 都是累加的
 2024-12-08 20:09:57 +08:00
芋道源码 79c9b114d9
!1149 【缺陷修复】商城: spu 更新会重置实际销量和浏览量的问题 
Merge pull request !1149 from puhui999/develop2
 2024-12-07 02:21:20 +00:00