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

1097 Commits

Author SHA1 Message Date
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 b678da810e 【新增】MALL：拼团结果通知订阅消息 2024-07-31 16:26:08 +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 f46d47a966 Merge branch 'develop' of https://gitee.com/puhui999/ruoyi-vue-pro into develop 
# Conflicts:
#	yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/MessageTemplateConstants.java
#	yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/MessageTemplateConstants.java
 2024-07-29 19:09:08 +08:00
YunaiV 512d68f793 【代码评审】SYSTEM：订阅消息 2024-07-29 19:03:18 +08:00
puhui999 9a926e251b 【新增】mall: 钱包充值成功发送订阅消息 2024-07-29 17:14:41 +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
puhui999 4696105210 【优化】SYSTEM: 根据代码评审优化小程序的订阅消息 2024-07-25 17:37:50 +08:00
YunaiV 7f87f26f3a 【代码评审】SYSTEM：微信小程序的订阅消息 2024-07-24 19:30:28 +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
puhui999 8054847b05 【新增】SYSTEM: 发送微信小程序订阅消息测试接口 2024-07-24 17:18:48 +08:00
YunaiV e2f3491295 【代码修复】MALL：更新库存时，同时更新销量，和 taobao 保持一致的逻辑 2024-07-23 12:43:49 +08:00
YunaiV 714f0be547 【代码修复】MALL：更新库存时，同时更新销量，和 taobao 保持一致的逻辑 2024-07-23 12:39:04 +08:00
YunaiV a55ca87709 【代码修复】MALL：秒杀活动的商品拼接不正确的问题 2024-07-22 22:16:10 +08:00
YunaiV cf6f3eaa41 【代码修复】MALL：修复订单项取消时，分销未取消所有推广员的推广记录问题 2024-07-22 18:12:44 +08:00
YunaiV 4959479ac6 【代码修复】MALL：拼团活动的商品拼接不正确的问题 2024-07-21 18:23:19 +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 2658898138 【缺陷修复】MALL：修复优惠劵过期时，update 失败的情况 2024-07-20 22:54:08 +08:00
YunaiV 76a7b5e401 【缺陷修复】MALL：物流信息的缓存不生效的问题 2024-07-20 22:45:08 +08:00
YunaiV 002daeae7a 【功能修复】MALL：CombinationRecordReqPageVO 的 status 枚举校验范围不正确的问题 2024-07-20 18:03:55 +08:00
YunaiV 401de30344 【代码优化】MALL：完善管理端获得商品浏览记录分页接口 2024-07-17 20:07:01 +08:00
YunaiV 65ef6ff5ed Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop 2024-07-17 20:05:07 +08:00
puhui999 c4ab00eabb mall: kefu 包名更正 2024-07-17 18:42:45 +08:00
puhui999 1ecc50b3c9 mall: 完善管理端获得商品浏览记录分页接口 2024-07-17 18:36:48 +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 da4679e247 【依赖】druid from 1.2.21 to 1.2.23 2024-07-13 16:48:16 +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
puhui999 b5528bfc15 MALL-KEFU: 发送消息通知所有管理员更新对话 2024-07-09 15:21:56 +08: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
puhui999 4a39595576 MALL-KEFU: 优化管理员会话处理逻辑 2024-07-05 17:59:47 +08:00
puhui999 19e7763440 MALL-KEFU: 优化消息已读处理逻辑 2024-07-05 16:30:38 +08:00
YunaiV b7e4f8e460 【代码评审】MALL：review 客服的实现 2024-07-02 20:59:29 +08:00