YunaiV
|
6f740fab7c
|
【代码优化】商城：完善满减送的计算逻辑
|
2024-09-15 20:57:37 +08:00 |
|
YunaiV
|
190c75f4ac
|
【代码优化】商城：完善满减送的计算逻辑
|
2024-09-15 20:27:46 +08:00 |
|
YunaiV
|
222aa33f3e
|
【代码优化】商城：完善满减送的计算逻辑
|
2024-09-15 20:04:40 +08:00 |
|
YunaiV
|
cb995ba047
|
【代码优化】商城：价格计算相关逻辑
|
2024-09-15 16:58:13 +08:00 |
|
YunaiV
|
fee7267799
|
【代码优化】商城：价格计算相关逻辑
|
2024-09-15 15:38:38 +08:00 |
|
YunaiV
|
2876c7ce16
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop-tmp
# Conflicts:
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/coupon/AppCouponController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/coupon/CouponMapper.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponService.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/SeckillActivityServiceImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeRewardActivityPriceCalculator.java
|
2024-09-15 11:24:32 +08:00 |
痴货
|
ee7d1d5017
|
【BUG】解决运费计算错误的问题
|
2024-09-14 20:04:48 +08:00 |
|
痴货
|
2bca9ef490
|
【BUG】解决会员计算时，金额太大int类型装不下的问题
|
2024-09-14 20:02:29 +08:00 |
|
痴货
|
7ef329f57a
|
【功能】添加满送包邮功能
|
2024-09-14 20:01:34 +08:00 |
|
痴货
|
b69ba94660
|
【BUG】如果没有限时优惠就不展示会员价的问题
|
2024-09-14 19:43:45 +08:00 |
|
痴货
|
085b94f0d0
|
【BUG】修改结算页面选择电子券全部都是不可用的问题
|
2024-09-14 19:42:04 +08:00 |
|
痴货
|
1301eb1c83
|
【BUG】解决会员价计算错误的问题
|
2024-09-14 19:21:33 +08:00 |
|
痴货
|
0a23b57c15
|
【BUG】解决退款时找不到appkey的问题
|
2024-09-14 19:20:58 +08:00 |
|
痴货
|
b48d0edef0
|
【BUG】解决退款时找不到appkey的问题
|
2024-09-14 19:19:13 +08:00 |
|
痴货
|
51b8fe2eca
|
【BUG】修改限时优惠和会员优惠显示最便宜相反的问题
|
2024-09-14 19:16:48 +08:00 |
|
痴货
|
0496ac237c
|
【优化】优化代码
|
2024-09-14 19:15:42 +08:00 |
|
痴货
|
a9241cfbf4
|
【功能优化】优化商品列表页或者详情页会员价和限时优惠价，那个便宜展示那个
|
2024-09-14 19:12:35 +08:00 |
|
痴货
|
cb7634ecb4
|
【功能优化】优化限时满减的金额数据库保存为分
|
2024-09-14 19:11:44 +08:00 |
|
痴货
|
86b02b698a
|
【功能】完成下单确认页价格计算功能（只做了满减，还没做满送）
|
2024-09-14 19:10:21 +08:00 |
|
痴货
|
e44c0e668e
|
【功能】完成商品列表价格计算时，需要支持减免金额的功能
|
2024-09-14 19:01:57 +08:00 |
puhui999
|
d9856ff79b
|
【代码优化】商城: 满减送活动
|
2024-09-10 11:46:21 +08:00 |
|
YunaiV
|
19c4a5c961
|
【功能优化】商城：秒杀装修重构（PC端）
|
2024-09-09 09:16:56 +08:00 |
|
YunaiV
|
a6338b8635
|
【代码优化】增强 JDK17、JDK8 之间的兼容性
|
2024-09-07 20:52:28 +08:00 |
|
YunaiV
|
8024d0af3f
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/config/YudaoApiLogAutoConfiguration.java
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/YudaoWebAutoConfiguration.java
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java
# yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/logger/ApiAccessLogApi.java
# yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/logger/ApiErrorLogApi.java
# yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/api/combination/CombinationRecordApi.java
# yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/api/coupon/CouponApi.java
# yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/api/coupon/dto/CouponValidReqDTO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/combination/CombinationRecordApiImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/coupon/CouponApiImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/combination/CombinationActivityController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/reward/RewardActivityController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/reward/vo/RewardActivityBaseVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/activity/AppActivityController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationActivityController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/coupon/AppCouponController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/coupon/vo/coupon/AppCouponMatchReqVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/coupon/vo/coupon/AppCouponRespVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/reward/RewardActivityServiceImplTest.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApiImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/aftersale/AppAfterSaleController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateService.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeCouponOrderHandler.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeCouponPriceCalculator.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDeliveryPriceCalculator.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeRewardActivityPriceCalculator.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletServiceImpl.java
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/OperateLogApi.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/logger/OperateLogApiImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/sms/core/client/impl/TencentSmsClient.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsChannelServiceImpl.java
|
2024-09-07 20:45:32 +08:00 |
|
YunaiV
|
75ed4486c4
|
【功能优化】商城：拼团中时，禁止发起售后
|
2024-09-07 14:07:07 +08:00 |
|
YunaiV
|
840cfad84a
|
【功能优化】商城：价格计算时，返回可用 + 不可用的优惠劵
|
2024-09-07 12:05:42 +08:00 |
|
YunaiV
|
30fd7996f6
|
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17
|
2024-09-07 08:47:56 +08:00 |
heyho
|
819323d3db
|
小程序端采用银行卡提现，提交后报：请求参数bankName类型错误。
原因：yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/vo/withdraw/AppBrokerageWithdrawCreateReqVO.java中的字段：private Integer bankName实际应为String型，因为无论是用户手动输入银行名字，或是采用查询字典表类型"brokerage_bank_name"提交字典值"value"，都应该是String型。
经检查其相所有相关的DO，VO的属性bankName均为String，所以AppBrokerageWithdrawCreateReqVO的bankName改为String为宜。
Signed-off-by: heyho <heywsk@qq.com>
|
2024-09-04 05:24:04 +00:00 |
|
YunaiV
|
5692571a9c
|
【功能优化】商城：价格计算时，增加“该优惠劵无法使用，原因：优惠金额超过订单金额”提示
|
2024-09-03 10:47:20 +08:00 |
|
芋道源码
|
bb7e56e28e
|
!1068 【修复】驳回佣金提现时,报'模板参数(reason)缺失'&【修复】用户购买一件以上数量时推广者返佣金额就出错(翻倍)&【优化】分后设置为“指定分销”时，让普通用户无需成为推广者也可以绑定成为 推广者的下级以便让指定的推广者赚取佣金
Merge pull request !1068 from heyho/master-jdk17
|
2024-09-03 02:39:32 +00:00 |
|
YunaiV
|
e5453028f1
|
【代码评审】商城：满减送订单
|
2024-09-02 21:53:41 +08:00 |
|
puhui999
|
79cb96702a
|
【代码优化】商城: 满减送活动
|
2024-09-02 17:20:41 +08:00 |
|
heyho
|
d1fc18a409
|
用户购买一件以上数量时推广者返佣金额计算出错
Signed-off-by: heyho <heywsk@qq.com>
|
2024-09-02 05:08:17 +00:00 |
|
YunaiV
|
39f71168eb
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
|
2024-09-02 12:27:03 +08:00 |
|
YunaiV
|
eaeeb34e74
|
【代码评审】商城：满减送订单
|
2024-09-02 12:25:53 +08:00 |
|
heyho
|
ae26ca5d00
|
后台驳回佣金提现时,报"模板参数(reason)缺失"
Signed-off-by: heyho <heywsk@qq.com>
|
2024-09-02 03:57:11 +00:00 |
|
heyho
|
98e6124c2f
|
用户购买一件以上数量时推广者返佣金额就出错(翻倍)
Signed-off-by: heyho <heywsk@qq.com>
|
2024-09-02 03:55:45 +00:00 |
|
heyho
|
0ddee90366
|
后后设置为“指定分销”时，让普通用户无需成为推广者也可以绑定成为 推广者的下级以便让指定的推广者赚取佣金
Signed-off-by: heyho <heywsk@qq.com>
|
2024-09-02 03:52:29 +00:00 |
|
puhui999
|
5ea3e5db0d
|
【代码优化】商城: 满减送活动
|
2024-09-02 11:23:13 +08:00 |
|
YunaiV
|
87adf15a93
|
【功能修复】商城：App 接口增加部分需要登录的校验
|
2024-09-01 09:38:45 +08:00 |
|
YunaiV
|
f00b3005c7
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
# Conflicts:
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/framework/sms/core/client/impl/SmsClientTests.java
|
2024-08-31 08:53:45 +08:00 |
|
YunaiV
|
88cc4c987b
|
【代码评审】商城：满减送订单
|
2024-08-30 21:37:51 +08:00 |
|
puhui999
|
d26ef6b89e
|
【代码优化】商城: TradeRewardActivityPriceCalculatorTest
|
2024-08-30 16:17:19 +08:00 |
|
puhui999
|
806c828bb5
|
【代码优化】商城: 满减送活动优惠券相关
|
2024-08-30 14:58:22 +08:00 |
|
YunaiV
|
d60374d646
|
【代码评审】商城：满减送订单
|
2024-08-29 23:30:59 +08:00 |
|
puhui999
|
3e66a922bf
|
【功能新增】商城: 满减送活动下单后，赠送优惠劵
|
2024-08-29 21:45:44 +08:00 |
|
puhui999
|
e0d9f7cfba
|
【功能新增】商城: 满减送活动下单后，赠送积分、优惠劵、包邮
|
2024-08-29 18:19:54 +08:00 |
|
YunaiV
|
cccad2c6c1
|
【代码评审】商城：取消拼团的支付单
|
2024-08-28 13:19:36 +08:00 |
|
puhui999
|
63fcc69930
|
【代码优化】商城: 取消支付订单
|
2024-08-27 16:49:02 +08:00 |
|
puhui999
|
710f29d911
|
【代码优化】商城: 满减送活动 CRUD 部分
|
2024-08-27 16:46:04 +08:00 |
|
YunaiV
|
7efa6fe57d
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/member/MemberStatisticsServiceImpl.java
|
2024-08-26 12:33:30 +08:00 |
|
YunaiV
|
9bb231eb73
|
【代码优化】商城：查询 SF 物流，需要 CustomerName 的情况
|
2024-08-25 11:00:45 +08:00 |
卢越
|
d4e4207ae9
|
【代码优化】对customerName内部屏蔽
|
2024-08-25 08:39:44 +08:00 |
|
YunaiV
|
0f51229954
|
【代码评审】商城：快递鸟相关的修复代码
|
2024-08-23 20:16:24 +08:00 |
|
卢越
|
427cf8e4f6
|
【功能优化】订单日志根据创建时间倒序
|
2024-08-23 16:42:06 +08:00 |
|
卢越
|
94effa87a3
|
【功能优化】订单日志根据创建时间倒序
|
2024-08-23 16:32:25 +08:00 |
|
卢越
|
76f0bd816c
|
【功能修复】修复退款时应用AppKey为空的问题
|
2024-08-23 15:24:41 +08:00 |
|
卢越
|
8de0de615f
|
【功能优化】售后退货退款时首先返还抵扣积分，然后再扣减赠送积分
|
2024-08-23 15:23:51 +08:00 |
|
puhui999
|
32e25cf4a2
|
【代码优化】商城: 满减送活动
|
2024-08-22 18:23:54 +08:00 |
|
卢越
|
96bffc4199
|
【功能修复】快递鸟顺丰查询需要CustomerName
|
2024-08-22 14:47:32 +08:00 |
|
YunaiV
|
2b681f90ca
|
【代码评审】商城：拼团失败的取消支付逻辑
|
2024-08-20 21:18:56 +08:00 |
|
puhui999
|
aff0446a38
|
【代码优化】商城: 完成取消支付订单
|
2024-08-20 16:12:24 +08:00 |
|
puhui999
|
91240351ed
|
【代码优化】商城: 完成代码评审 TODO
|
2024-08-20 15:50:07 +08:00 |
|
芋道源码
|
b353aa8508
|
!1045 完善一些 MALL TODO
Merge pull request !1045 from puhui999/develop
|
2024-08-19 11:46:47 +00:00 |
|
puhui999
|
c7ccb8286a
|
【代码优化】MALL: 售后订单增加 userId 检索条件
|
2024-08-19 11:32:53 +08:00 |
|
YunaiV
|
13be8f3a05
|
【功能优化】支付：支付应用，增加 appKey 标识，用于不同接入方的标识
|
2024-08-18 17:29:20 +08:00 |
|
YunaiV
|
e2197551ec
|
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/app/combination/AppCombinationRecordController.java
# yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/job/product/ProductStatisticsJob.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/order/config/TradeOrderProperties.java
# yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/order/dto/PayOrderCreateReqDTO.java
# yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/refund/dto/PayRefundCreateReqDTO.java
# yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/transfer/dto/PayTransferCreateReqDTO.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/app/PayAppService.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/app/PayAppServiceImpl.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/refund/PayRefundServiceImpl.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/transfer/PayTransferServiceImpl.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletTransactionServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/sms/core/client/impl/TencentSmsClient.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/framework/sms/core/client/impl/SmsClientTests.java
|
2024-08-18 17:22:47 +08:00 |
|
YunaiV
|
1dadfb8fba
|
【功能优化】支付：支付应用，增加 appKey 标识，用于不同接入方的标识
|
2024-08-18 15:30:35 +08:00 |
陈玄礼
|
6eb40aa544
|
!1041 支付应用，增加 appKey 标识，用于不同接入方的标识
* feat[yudao-module-pay]: 更新新增和更新支付应用时校验逻辑
* fix[yudao-module-trade]: 为支付应用标识提供缺省值
* fix[yudao-module-pay]: appKey注释应用编码更新为应用标识
* feat[yudao-module-pay]: 为支付应用新增支付编码属性
|
2024-08-18 07:02:09 +00:00 |
|
YunaiV
|
6a80d7c75f
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
|
2024-08-18 14:59:56 +08:00 |
|
YunaiV
|
d2c7ec2445
|
【功能新增】商城：售后分页查询，支持 userId 过滤
|
2024-08-18 13:02:14 +08:00 |
Ordinary
|
9af286693f
|
【功能修复】商城：解决商品项图片为空串时，订单项没有使用SPU图片的问题。
|
2024-08-14 19:34:16 +08:00 |
|
YunaiV
|
fa585578a0
|
【代码评审】商城：移除已经搞定的 TODO
|
2024-08-10 12:24:49 +08:00 |
|
YunaiV
|
387ef6f396
|
【功能简化】商城：1）拼团活动，移除用户主动取消，不常用；2）review 拼团相关的逻辑
|
2024-08-10 12:15:57 +08:00 |
|
YunaiV
|
d076cffdb5
|
【代码优化】SYSTEM：移除阿里云、腾讯云 maven 依赖，直接 HTTP 对接
|
2024-08-09 22:01:59 +08:00 |
|
YunaiV
|
ae7323cbe0
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponServiceImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradePointUsePriceCalculator.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/sms/core/client/impl/HuaweiSmsClient.java
|
2024-08-09 21:52:44 +08:00 |
|
YunaiV
|
6e67120b8e
|
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17
|
2024-08-09 21:48:24 +08:00 |
|
卢越
|
17fa59249b
|
购物车查询添加返回商品类别ID
|
2024-08-08 09:33:07 +08:00 |
|
YunaiV
|
8775472af7
|
【代码评审】门店自提：相关代码的优化、以及 todo 评审
|
2024-08-07 22:09:31 +08:00 |
|
puhui999
|
cd03ddddb3
|
Merge remote-tracking branch 'refs/remotes/yudao/develop' into develop
|
2024-08-07 17:09:36 +08:00 |
|
puhui999
|
24b1594976
|
【代码优化】MALL-TRADE：订单结算信息返回积分相关信息
|
2024-08-07 17:09:16 +08:00 |
|
YunaiV
|
f3a8d6f06c
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/history/ProductBrowseHistoryController.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/social/AppSocialUserController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletRechargeServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/social/SocialClientApiImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/socail/SocialClientController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
|
2024-07-31 23:49:21 +08:00 |
|
YunaiV
|
abe2f8580b
|
【代码优化】SYSTEM：微信小程序的订阅
|
2024-07-31 23:47:02 +08:00 |
|
YunaiV
|
ba18788517
|
【代码优化】SYSTEM：微信小程序的订阅
|
2024-07-31 19:48:02 +08:00 |
|
puhui999
|
2bc96fe521
|
【代码优化】SYSTEM：订阅消息跳转小程序类型
|
2024-07-31 12:58:06 +08:00 |
|
YunaiV
|
0e24994c92
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
|
2024-07-30 23:12:18 +08:00 |
|
YunaiV
|
7782b36f90
|
【代码优化】SYSTEM：微信小程序的订阅
|
2024-07-30 23:12:06 +08:00 |
|
puhui999
|
0cca6be63a
|
【新增】MALL: 订单发货订阅消息
|
2024-07-30 16:55:58 +08:00 |
|
YunaiV
|
7c54204716
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm
|
2024-07-28 20:44:58 +08:00 |
|
YunaiV
|
3d9ec1966f
|
【功能修复】MALL：优惠劵的折扣计算不正确
|
2024-07-28 20:01:54 +08:00 |
|
YunaiV
|
63dd0905d3
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-07-26 21:07:50 +08:00 |
|
YunaiV
|
94f9d35410
|
【功能修复】MALL：支付超时时间返回不正确的问题
|
2024-07-26 12:47:34 +08:00 |
|
YunaiV
|
a131434f94
|
【同步】jdk21 和 jdk8 的代码
|
2024-07-24 18:55:24 +08:00 |
|
YunaiV
|
257acba31e
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/interceptor/ApiAccessLogInterceptor.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserService.java
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/security/config/SecurityConfiguration.java
|
2024-07-24 18:46:33 +08:00 |
|
YunaiV
|
cf6f3eaa41
|
【代码修复】MALL：修复订单项取消时，分销未取消所有推广员的推广记录问题
|
2024-07-22 18:12:44 +08:00 |
|
YunaiV
|
a210210b20
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/wallet/PayWalletController.java
|
2024-07-21 11:15:04 +08:00 |
|
YunaiV
|
e052ddab2f
|
【代码代码】PAY：移除对 member 的依赖
|
2024-07-21 11:13:11 +08:00 |
|
YunaiV
|
76a7b5e401
|
【缺陷修复】MALL：物流信息的缓存不生效的问题
|
2024-07-20 22:45:08 +08:00 |
|
YunaiV
|
3e3407eb99
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/file/FileConfigDO.java
# yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/dal/dataobject/message/MpMessageDO.java
|
2024-07-13 22:43:33 +08:00 |
|
YunaiV
|
2b39b434fa
|
【依赖】mybatis-plus from 3.5.5 to 3.5.7
|
2024-07-13 22:42:54 +08:00 |
|
YunaiV
|
e591c1869a
|
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/KeFuConversationServiceImpl.java
|
2024-07-13 16:31:40 +08:00 |
|
YunaiV
|
aff7919780
|
【同步】Boot 和 Cloud 的功能同步
|
2024-07-13 12:55:56 +08:00 |
|
YunaiV
|
03e07a2902
|
【功能新增】MALL：新增 mall 客服
|
2024-07-13 12:24:49 +08:00 |
|
YunaiV
|
ce1940e4f3
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsPerformanceServiceImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/AppBrokerageUserController.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/brokerage/BrokerageUserServiceImpl.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/social/AppSocialUserController.java
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/social/SocialUserApi.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialClientService.java
|
2024-07-13 12:14:46 +08:00 |
|
芋道源码
|
b586a09b90
|
!1011 新增 mall 客服
Merge pull request !1011 from 芋道源码/develop
|
2024-07-13 04:11:46 +00:00 |
|
YunaiV
|
92810bf028
|
对齐 jdk8、jdk17 的代码实现
|
2024-07-07 17:04:22 +08:00 |
|
YunaiV
|
a19bd126e1
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-07-07 17:00:16 +08:00 |
|
YunaiV
|
2f49ad31f4
|
!124 【修复】分销用户绑定时判断是否为新用户逻辑错误问题
|
2024-07-07 11:07:21 +08:00 |
|
YunaiV
|
5d3bb791fd
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceTest.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java
|
2024-07-07 09:14:36 +08:00 |
|
YunaiV
|
f2b7ad5092
|
【修复】MALL：TradeOrderUpdateService 的单元测试
|
2024-06-15 17:33:54 +08:00 |
DevDengChao
|
919066dbf0
|
refactor: 使用 IdUtil.randomUUID 代替 UUID.randomUUID()
|
2024-06-07 10:49:11 +08:00 |
|
DevDengChao
|
d1c6d741c3
|
Revert "fix: 修复创建 DeliveryExpressDO 时提示 id 过大的问题"
This reverts commit 5632c51527.
|
2024-06-07 10:47:28 +08:00 |
|
YunaiV
|
d89a19a92b
|
【代码评审】商城：客服功能
|
2024-06-04 20:25:24 +08:00 |
|
puhui999
|
ae493e66df
|
MALL-TRADE：新增 BrokerageUserService#getOrCreateBrokerageUser 获得或创建分销用户方法，解决父级推广人不存在的问题
|
2024-05-27 16:24:07 +08:00 |
|
puhui999
|
b073c1d37f
|
fix: 修复获得个人分销统计 NPE 异常
|
2024-05-25 22:06:55 +08:00 |
|
DevDengChao
|
9c111acfbe
|
fix: 修复 TradeOrderUpdateServiceTest
|
2024-05-15 13:44:57 +08:00 |
|
DevDengChao
|
c68f32cefe
|
chore: 备注团长翻译问题
|
2024-05-15 13:44:39 +08:00 |
|
DevDengChao
|
5632c51527
|
fix: 修复创建 DeliveryExpressDO 时提示 id 过大的问题
|
2024-05-15 13:44:18 +08:00 |
|
YunaiV
|
9f63e1e294
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# pom.xml
# yudao-dependencies/pom.xml
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/statistics/vo/portrait/CrmStatisticsPortraitReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsPerformanceServiceImpl.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/db/DatabaseTableServiceImpl.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/job/JobServiceImpl.java
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/service/JmReportTokenServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java
|
2024-05-04 09:39:07 +08:00 |
|
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
|
8e86706d50
|
同步 develop 最新代码
|
2024-04-12 20:31:33 +08:00 |
|
YunaiV
|
b44eab7f93
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessTransferReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/vo/CrmContactTransferReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractTransferReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerTransferReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/permission/CrmPermissionController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/permission/CrmPermissionServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivablePlanServiceImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppCartAddReqVO.java
|
2024-04-12 19:18:30 +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
|
1904f8ca88
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-04-11 22:52:53 +08:00 |
|
YunaiV
|
1e348dbf83
|
【优化】将项目的 annotations 统一修改成 annotation 包
|
2024-04-11 22:52:34 +08:00 |
|
YunaiV
|
cc9b2e86b6
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java
|
2024-04-10 20:58:35 +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
|
83623a024f
|
【重构】V2 操作日志转正，基于注解的可使用变量、可以自定义函数的通用操作日志组件
|
2024-04-04 02:21:03 +08:00 |
|
YunaiV
|
01cfa60a64
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/aop/OperateLogAspect.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo01/Demo01ContactController.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo02/Demo02CategoryController.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo03/Demo03StudentController.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/JobController.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/JobLogController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/DeliveryExpressController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/order/PayOrderController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/refund/PayRefundController.java
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/OperateLogApi.java
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/dto/OperateLogCreateReqDTO.java
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/dto/OperateLogV2CreateReqDTO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictDataController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictTypeController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/ErrorCodeController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/LoginLogController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/RoleController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/SensitiveWordController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsLogController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/TenantController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/logger/OperateLogServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/logger/OperateLogServiceImplTest.java
|
2024-04-04 02:14:02 +08:00 |
|
YunaiV
|
20583417a4
|
【重构】V2 操作日志转正，基于注解的可使用变量、可以自定义函数的通用操作日志组件
|
2024-04-04 01:49:49 +08:00 |
|
YunaiV
|
1761495bce
|
【优化】增强访问日志，支持是否记录、脱敏、操作信息等功能
|
2024-04-03 20:02:05 +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 |
|
芋道源码
|
9b85a9617d
|
!915 添加加入购物车商品数量不可为0或更低数量的限制
Merge pull request !915 from 风狗/N/A
|
2024-03-28 10:58:24 +00:00 |
|
芋道源码
|
830485911b
|
!924 取消订单同步取消分销问题
Merge pull request !924 from wangxiaorui/N/A
|
2024-03-28 10:53:06 +00:00 |
wangxiaorui
|
85f994f643
|
取消订单同步取消分销问题
创建分销单的时候是按照OrderItem的主键来创建，取消的时候应该按照OrderItem的主键来取消，否则会导致无法取消分销单
Signed-off-by: wangxiaorui <742397974@qq.com>
|
2024-03-26 01:19:48 +00:00 |
liyujiang
|
53f2d4cfd1
|
fix(trade): 发货日志无需发货时的描述改为“已发货，快递公司：无，快递单号：无”
|
2024-03-23 10:16:47 +08:00 |
风狗
|
c4dedf4d48
|
添加加入购物车商品数量不可为0或更低数量的限制
Signed-off-by: 风狗 <909275705@qq.com>
|
2024-03-15 02:22:39 +00: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
|
e091b077a8
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-03-01 20:01:38 +08:00 |
|
YunaiV
|
dda0909843
|
🎉 2.0.1 版本发布！
|
2024-03-01 20:01:16 +08:00 |
|
YunaiV
|
d3f3584132
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-03-01 19:40:52 +08:00 |
|
YunaiV
|
7ef7228f65
|
MALL：增加返回 vipPrice 减免金额
|
2024-03-01 19:21:03 +08:00 |
|
YunaiV
|
f1ff656282
|
bugfix：运行失败的单测
bugfix：PayOrderExtensionMapper 的 selectListByStatusAndCreateTimeGe 查询时间范围不对的问题
|
2024-03-01 12:35:00 +08:00 |
|
YunaiV
|
831cf33e95
|
Merge branch 'master-jdk21' 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/order/TradeOrderUpdateServiceImpl.java
# yudao-module-pay/yudao-module-pay-biz/src/test/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceTest.java
|
2024-03-01 12:26:40 +08:00 |