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 |
|
卢越
|
96bffc4199
|
【功能修复】快递鸟顺丰查询需要CustomerName
|
2024-08-22 14:47:32 +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 |