Commit Graph

627 Commits (master)

Author SHA1 Message Date
tangqian c923cc93f0 fix:推广员导出 2023-06-16 10:53:43 +08:00
tangqian 3a9b7376f2 fix:推广员导出 2023-06-16 10:37:28 +08:00
tangqian 72beac0b3a fix:修改充值订单导出(未退款但是退款金额显示有金额) 2023-06-14 18:17:21 +08:00
perry 74a33ecb85 配置文件修改 2023-05-26 15:01:46 +08:00
perry 8cfba0d856 商户id 2023-05-26 10:24:35 +08:00
perry a6eb645d54 订单退款 2023-05-22 12:55:07 +08:00
perry 263ec59f24 微信支付 2023-05-19 18:25:00 +08:00
tangqian 3a209f056b feat: 支付宝相关支付 2023-05-19 16:45:37 +08:00
tangqian adcb6d26f2 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java
2023-05-16 18:19:55 +08:00
tangqian 26a8631927 feat: 会员充值,退款 2023-05-16 18:19:33 +08:00
perry 72645b9dfc 商户管理 2023-05-16 18:17:54 +08:00
perry 9b9af448fc 支付 2023-05-16 12:33:49 +08:00
perry ca7f62f924 支付 2023-05-15 23:40:57 +08:00
js199000131 d624879f22 商品和支付 2023-05-14 15:44:42 +08:00
perry 3f213a4ae6 商品管理 2023-05-14 13:33:10 +08:00
小小张 693839a486 订单管理 2023-05-11 18:06:00 +08:00
perry 3e6f21dadd 商品管理 2023-05-10 22:49:41 +08:00
小小张 ae226440a5 物流管理 2023-05-10 15:20:38 +08:00
perry b815ee0374 请求方法修改 2023-05-10 10:07:43 +08:00
perry 90e04bb0d1 Merge branch 'master' into feature/mall_product 2023-05-08 14:45:39 +08:00
perry f8ff46de27 Merge remote-tracking branch 'origin/feature/mall_product' 2023-05-08 14:43:08 +08:00
perry 1120764e70 商城 2023-05-08 14:19:01 +08:00
YunaiV da162853ec 商城:完善购物车的逻辑 2023-04-30 20:32:01 +08:00
YunaiV 91f63ff813 尝试修复项目第一次打包失败报Failed to execute goal org.apache.maven.plugins:maven-jar-plugin:3.3.0:jar 2023-04-22 19:44:03 +08:00
YunaiV 8ce8f4e3a8 尝试修复项目第一次打包失败报Failed to execute goal org.apache.maven.plugins:maven-jar-plugin:3.3.0:jar 2023-04-22 19:41:30 +08:00
YunaiV e5fcc7a387 boot3:适合 ServletUtils 2023-04-16 21:40:56 +08:00
YunaiV fdea0ae0ea 优化请求头的 tenant-id 的解析逻辑,避免前端传错类型 2023-04-15 09:48:21 +08:00
YunaiV d2ba90db5d 修复单元测试报错 2023-04-14 22:59:45 +08:00
xingyuv e3d74b1713 chore: 升级最新依赖 2023-04-13 15:44:20 +08:00
YunaiV 5c0161d762 修复租户名的重复问题 2023-04-09 11:12:24 +08:00
芋道源码 aa16b8279f
!446 配合周建进行测试所提bug的后端修改
Merge pull request !446 from clockdotnet/master_pr
2023-04-09 02:30:08 +00:00
zhangxingjia bc6eaea2b4 fix xss请求Wrapper getAttribute方法 问题修复 2023-04-07 19:07:33 +08:00
shizhong 2b1e5f1a3a 解决登录时输入无效租户名称登录失败提示不友好问题,还原修改 2023-04-03 12:56:25 +08:00
YunaiV 09afdaafcf !24 【轻量级 PR】:PasswordEncoder 加密复杂度自定义 2023-04-02 19:12:32 +08:00
YunaiV b9ba17a477 !31 IP查询导致异常问题 2023-04-02 19:01:46 +08:00
芋道源码 bb0110656b
!440 test: job 租户单元测试
Merge pull request !440 from 与或非/test/tenant-job
2023-04-02 04:13:36 +00:00
冰是睡着的水 fbbd3bc66c
优化大陆手机号验证。以19013896321为例,原来的正则匹配结果为false。
Signed-off-by: 冰是睡着的水 <850083043@qq.com>
2023-04-01 03:34:22 +00:00
shizhong 8d2c33e9b0 解决字符串型字段等值查询条件前端传空字符串不能正常忽略问题 2023-03-29 21:19:18 +08:00
shizhong 37fcc5cbe7 解决登录时输入无效租户名称登录失败提示不友好问题 2023-03-29 21:14:05 +08:00
gaibu 348a0ff02a test: 修复 code view 存在的问题 2023-03-20 21:50:53 +08:00
gaibu b54c5eaa45 test: job 租户单元测试 2023-03-18 20:53:33 +08:00
YunaiV 467170d3de Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro 2023-03-16 22:43:58 +08:00
wangzhs f9569f910f 切换 Mybatis-plus-join 依赖 2023-03-13 18:32:43 +08:00
wangzhs 95159b0257 调整Mybaits Plus Join的SQL注入器到YudaoMybatisAutoConfiguration 2023-03-13 09:52:27 +08:00
wangzhs 7e0fb6cb56 调整Mybaits Plus Join的SQL注入器到YudaoMybatisAutoConfiguration 2023-03-12 17:43:42 +08:00
YunaiV ef510f9478 增加 mybatis plus join 集成的修改建议 2023-03-11 18:23:07 +08:00
wangzhs 670f67e551 新增 mybatis-plus-join 2023-03-11 17:47:15 +08:00
Xuing eed3d8b18d
修复ContextHolder的NPE异常 2023-03-08 20:16:19 +08:00
芋道源码 a31887568a
!422 feat: 修改错误注释
Merge pull request !422 from 与或非/feat/20230224
2023-02-28 16:49:52 +00:00
zhangxingjia 911040492e fix: 去掉Swagger自动配置类中的冗余配置 2023-02-28 19:02:51 +08:00