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

1340 Commits

Author SHA1 Message Date
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
puhui999 7fb3f9857b 【缺陷修复】商城: spu 更新会重置实际销量和浏览量的问题 2024-12-06 11:00:54 +08:00
山野羡民 c54132fc77
【枚举值错误】update cn/iocoder/yudao/module/product/enums/comment/ProductCommentAuditStatusEnum.java. 
Signed-off-by: 山野羡民 <liyujiang_tk@yeah.net>
 2024-12-02 09:51:39 +00:00
YunaiV 1be6359603 【代码优化】商城：分销用户的创建 2024-12-01 15:00:50 +08:00
芋道源码 844f573bd2
!1142 商城相关完善 
Merge pull request !1142 from puhui999/develop2
 2024-12-01 06:21:45 +00:00
puhui999 33dc329485 【功能新增】商城分销: 创建分销员 2024-11-29 17:35:39 +08:00
puhui999 424750f628 【缺陷修复】商城：赠送的优惠劵相关转换 2024-11-29 14:49:28 +08:00
puhui999 98989912e1 【缺陷修复】商城：全局包邮判断 2024-11-29 14:48:19 +08:00
YunaiV 31ab86dbeb 【同步】jdk21 和 jdk8 的代码 2024-11-25 19:35:57 +08:00
YunaiV bbb1bec1b9 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/controller/admin/kefu/KeFuMessageController.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/kefu/AppKeFuMessageController.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/kefu/KeFuMessageServiceImpl.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/DeliveryPickUpStoreController.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/TradeOrderController.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawServiceImpl.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryPickUpStoreServiceImpl.java
#	yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawServiceImplTest.java
#	yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/transfer/PayTransferApi.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/api/transfer/PayTransferApiImpl.java
#	yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/dto/transfer/PayTransferUnifiedReqDTO.java
 2024-11-25 19:32:10 +08:00
YunaiV 87cee4628a 【代码优化】商城：优化分销提现的逻辑（余额） 2024-11-25 19:30:55 +08:00
YunaiV 396051b41e 【代码合并】商城：合并最新的 master-jdk17 分支 2024-11-19 09:30:40 +08:00
YunaiV c239d9cc56 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop 
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/kefu/AppKeFuMessageController.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/combination/CombinationActivityConvert.java
 2024-11-19 09:26:44 +08:00
puhui999 c501172694 【功能完善】商城：客服消息查询 pageSize 改 limit 2024-11-18 17:20:46 +08:00
YunaiV 36faf88d49 【代码优化】商城：补全 AppProductBrowseHistoryRespVO 注解 2024-11-10 18:48:40 +08:00
芋道源码 2775dbbad1
!1126 【功能完善】商城: 客服 
Merge pull request !1126 from puhui999/develop
 2024-11-10 10:36:32 +00:00
puhui999 43cb8b1f21 【功能完善】商城: 客服 2024-11-10 18:01:58 +08:00
YunaiV e46163cba7 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-dependencies/pom.xml
 2024-11-09 18:38:24 +08:00
puhui999 6695aeeb8f 【功能完善】商城: 客服 2024-11-09 17:35:35 +08:00
杨宇庆 c776371d48
【修复】修复会员取消退款接口中未校验用户ID的漏洞 
Signed-off-by: 杨宇庆 <hiyyq@qq.com>
 2024-11-06 15:21:25 +00:00
YunaiV 71bc5d56f1 【代码评审】商城：消息获取改为游标查询 2024-11-05 20:37:25 +08:00
puhui999 4057c74afd 【功能优化】商城: 积分商城活动排序 2024-11-05 16:15:29 +08:00
puhui999 1285acc49e 【功能优化】商城: 虚拟成团创建团成员时设置团长 ID 2024-11-05 15:36:32 +08:00
puhui999 a2e9eccee7 【功能完善】商城: 客服消息 2024-11-05 15:21:02 +08:00
YunaiV 9bb1052366 【代码评审】商城：消息获取改为游标查询 2024-11-05 09:37:38 +08:00
puhui999 70bc486d36 【功能完善】商城客服: 消息获取改为游标查询 2024-11-04 18:05:15 +08:00
YunaiV d97ba8d4d8 【缺陷修复】商城：活动的库存校验，从 > 改成 >= 2024-11-01 21:22:23 +08:00
YunaiV 8d4cc35cde 【缺陷修复】商城：优惠劵在不限制时，无法发送的问题 2024-10-27 20:33:49 +08:00
YunaiV b1ad2f8176 【缺陷修复】商城：拼团取消已支付的订单时，缺少 ip 和状态检查不正确 2024-10-27 20:00:00 +08:00
YunaiV ac50b4b11c 148 fix：商城系统->营销中心->优惠活动->限时折扣，折扣百分比按正常折扣（比如说90%）填写时，后端报错“折扣百分比需要大于等于 1，小于等于 99” 2024-10-27 17:36:45 +08:00
YunaiV 8e4ba25e84 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/util/MyBatisUtils.java
 2024-10-27 15:14:38 +08:00
杨宇庆 922aa0678d
【修复】修复当不存在优惠价格时，商城却显示优惠价格 
Signed-off-by: 杨宇庆 <hiyyq@qq.com>
 2024-10-16 16:32:50 +00:00
YunaiV 46a0d4f6af Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/db/TenantDatabaseInterceptor.java
 2024-10-13 17:00:43 +08:00