hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-08-24 07:02:22 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Commit Graph

  • fcf8ec98a0 !608 Date转localDateTime Merge pull request !608 from GamePlayer-Joker/master 芋道源码 2023-09-09 02:22:13 +00:00
  • 5719b7df06 !612 使用下划线分隔ErrorCodeConstants的ErrorCode Merge pull request !612 from dhb52/master 芋道源码 2023-09-09 02:20:55 +00:00
  • 5d4a750dfb !609 ID列存在换行符造成SQL Server建库时列名异常，并造成后续相关命令执行失败 Merge pull request !609 from samisgod/master 芋道源码 2023-09-09 02:20:03 +00:00
  • 7bf21fb02d Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro YunaiV 2023-09-09 10:14:11 +08:00
  • 57d2b7e3be Merge pull request #342 from Lemon-cc-hang/social 芋道源码 2023-09-09 10:13:54 +08:00
  • 557b09a157 code review：分销逻辑 YunaiV 2023-09-09 09:41:57 +08:00
  • 3b5215db21 !611 分销用户管理、Review代码修改 Merge pull request !611 from 疯狂的世界/brokerate 芋道源码 2023-09-09 00:48:00 +00:00
  • 4e9be7a181 trade: 分销业务后台功能：修改推广资格 owen 2023-09-09 01:58:46 +08:00
  • 259734964d trade: 分销业务后台功能：清除推广员、修改推广员 owen 2023-09-09 01:54:48 +08:00
  • f97c7a0f6e trade: 分销业务绑定推广员 owen 2023-09-09 01:46:42 +08:00
  • d7488e70b0 使用下划线分割ErrorCodeConstants的ErrorCode dhb52 2023-09-09 01:30:51 +08:00
  • 87c55784c4 code review：营销活动+订单 YunaiV 2023-09-09 01:27:55 +08:00
  • 5235aff8ad !610 营销活动+订单：完善大部分 TODO 提到的问题 Merge pull request !610 from puhui999/feature/mall_product 芋道源码 2023-09-08 15:36:51 +00:00
  • 6ef36d5ca6 trade: 增加分销 API owen 2023-09-08 23:33:02 +08:00
  • 1ead368595 trade: 优化分销用户佣金字段名称 owen 2023-09-08 23:10:04 +08:00
  • 4b43304c76 trade: 优化分销用户绑定用户编号、绑定时间字段名称 owen 2023-09-08 22:51:05 +08:00
  • 3e09da0128 code review：支付钱包 YunaiV 2023-09-08 22:47:00 +08:00
  • f36a6c5d6c trade: 优化修改推广员接口字段名称 owen 2023-09-08 22:40:49 +08:00
  • b85d660a5c trade: 分销业务完善校验 owen 2023-09-08 22:33:44 +08:00
  • 2fd201c7fa 🌈 style: 描述错误, 社交类型的枚举为 SocialTypeEnum 而不是 SysUserSocialTypeEnum lemoncc 2023-09-08 16:33:49 +08:00
  • 0a0c3c0ede trade: 分销业务相关类型移除Trade前缀 owen 2023-09-08 12:56:34 +08:00
  • ddcebb1986 common: MoneyUtils 移到 common 模块 owen 2023-09-08 12:46:43 +08:00
  • 1cc2dfc963 trade: 分销Review代码修改 owen 2023-09-08 12:29:38 +08:00
  • 166b1b31c0 trade: 分销用户管理 owen 2023-09-08 10:59:06 +08:00
  • 5d6bb84d25 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product puhui999 2023-09-08 00:59:53 +08:00
  • 0e8755972c 营销活动+订单：完善大部分 TODO 提到的问题 puhui999 2023-09-08 00:35:54 +08:00
  • 5808f77ade code review：订单分佣 YunaiV 2023-09-08 00:29:25 +08:00
  • a4d6d5e6c3 fix db creation error samisgod 2023-09-07 16:18:24 +08:00
  • b3d3efc8c4 升级 springdoc、knife4j 版本 YunaiV 2023-09-07 12:59:36 +08:00
  • b8a4d8cab2 分销：避免报错 YunaiV 2023-09-07 12:29:50 +08:00
  • 1bf182c341 补充 GamePlayer-Joker 2023-09-07 02:18:41 +00:00
  • 76a8fb8a0a AppCombinationRecordRespVO中的expireTime过期时间是LocalDateTime, 现在用的是new Date() GamePlayer-Joker 2023-09-07 01:41:46 +00:00
  • eb342d5abf Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product YunaiV 2023-09-06 23:50:55 +08:00
  • 62a4e8242b 分销：增加提现接口 YunaiV 2023-09-06 23:50:23 +08:00
  • ea26691967 !607 member: 佣金解冻 Merge pull request !607 from 疯狂的世界/brokerate_unfreeze 芋道源码 2023-09-06 15:49:39 +00:00
  • bf92727b27 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product YunaiV 2023-09-06 21:40:53 +08:00
  • fcca69d243 修复 revision 在 Maven install、deploy 时，不替换为版本号的问题 YunaiV 2023-09-06 20:41:52 +08:00
  • beb385aab4 修复 revision 在 Maven install、deploy 时，不替换为版本号的问题 zhijiantianya@gmail.com 2023-09-06 20:04:29 +08:00
  • 2591ab5d36 订单中心+营销活动：完善部分 TODO 提到的问题 puhui999 2023-09-06 11:29:51 +08:00
  • 9074312fe3 后台接入钱包支付 jason 2023-09-06 10:34:24 +08:00
  • 4a0fa2a3a4 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product jason 2023-09-06 08:50:33 +08:00
  • 3f51be6a2d 钱包。删除不需要的类 jason 2023-09-06 08:50:22 +08:00
  • fa53a3b15e trade: MemberBrokerageRecord 重命名为 TradeBrokerageRecord owen 2023-09-06 00:35:40 +08:00
  • 9336a0a102 trade: 分销业务从 member 模块 转移到 trade模块 owen 2023-09-06 00:16:47 +08:00
  • e4b153a866 分佣：增加获得分销排行分页 API mock YunaiV 2023-09-05 23:49:35 +08:00
  • a68691f2d9 trade: 增加分销用户表 owen 2023-09-05 23:45:53 +08:00
  • 6474502738 trade: 增加交易中心配置表 owen 2023-09-05 22:31:36 +08:00
  • 0329f13fbf 分佣：增加获得分销排行分页 API mock YunaiV 2023-09-05 21:32:34 +08:00
  • 9eb7837b67 member: 佣金失效 owen 2023-09-05 19:43:07 +08:00
  • a708521b9d member: 佣金解冻 owen 2023-09-05 19:05:01 +08:00
  • 2f6092005b member: 佣金解冻 owen 2023-09-05 18:54:00 +08:00
  • f99e2aec2d Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product jason 2023-09-05 12:44:43 +08:00
  • f3ca0f066b 会员钱包 查询订单和查询退款单的实现 jason 2023-09-05 12:44:34 +08:00
  • a58d7d63ed !606 会员：分销佣金计算 Merge pull request !606 from 疯狂的世界/brokerage 芋道源码 2023-09-05 01:58:11 +00:00
  • 090058a2ba member: 佣金不冻结时，直接就是结算状态 owen 2023-09-05 09:27:12 +08:00
  • c7ef8519c8 member: 分销增加佣金 owen 2023-09-05 08:56:39 +08:00
  • eae8218f0d 分佣：增加获得分销排行分页 API mock YunaiV 2023-09-05 00:11:41 +08:00
  • 7389e4fb65 分佣：增加获得分销记录分页 API mock YunaiV 2023-09-04 22:48:26 +08:00
  • fc56a15f76 分佣：增加用户分销记录、提现 API mock YunaiV 2023-09-04 21:00:03 +08:00
  • cc4c924717 钱包 review DO 类修改 jason 2023-09-04 14:54:38 +08:00
  • 91b03e7c93 钱包 review 修改 jason 2023-09-04 12:18:56 +08:00
  • 6a819da0b6 分佣：增加用户分销统计 API mock YunaiV 2023-09-03 21:21:33 +08:00
  • 991b53649b member: 分销配置 owen 2023-09-03 21:19:42 +08:00
  • 36b3cfafd2 同步 v1.8.1 SQL 脚本 YunaiV 2023-09-03 19:15:18 +08:00
  • 5308e309ea 同步 https://gitee.com/zhijiantianya/yudao-cloud/pulls/51/files YunaiV 2023-09-03 18:44:03 +08:00
  • 379c143dbb 修复：#320 支付手续费计算不正确，超过付款金额 #334 YunaiV 2023-09-03 18:39:51 +08:00
  • a532ba0579 Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro YunaiV 2023-09-03 18:38:02 +08:00
  • 05fc322919 Merge pull request #334 from freesme/fix-master-#320-calculation-error 芋道源码 2023-09-03 18:37:52 +08:00
  • 0cb7d8a29a Merge pull request #335 from freesme/master-fix-#330wx-mini-jump-failed 芋道源码 2023-09-03 18:34:33 +08:00
  • 4db3de8d86 Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro YunaiV 2023-09-03 18:30:46 +08:00
  • a1f6826e14 Merge pull request #337 from freesme/fix-master-#319-wx-pay-client-error 芋道源码 2023-09-03 18:30:32 +08:00
  • 4809e9b462 修复单元测试报错的问题 YunaiV 2023-09-03 18:28:29 +08:00
  • 8f86f65884 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro YunaiV 2023-09-03 18:07:05 +08:00
  • 482a84a6f1 603 mall: 优惠券退还优化 YunaiV 2023-09-03 18:06:15 +08:00
  • 670f2ef5da !603 mall: 优惠券退还优化 Merge pull request !603 from 疯狂的世界/mall_order_cancel 芋道源码 2023-09-03 10:04:41 +00:00
  • 8321d14b0b !599 Crontab组件radio的label类型不一致 Merge pull request !599 from 高小牛/master 芋道源码 2023-09-03 10:02:32 +00:00
  • b69d4e0852 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product YunaiV 2023-09-03 17:59:50 +08:00
  • 80a5889757 !565 vben代码生成模版 Merge pull request !565 from xingyu/feature/vben_codegen 芋道源码 2023-09-03 09:58:56 +00:00
  • 7870283bfa !594 兼容spring web 配置上下文根路径的情况 Merge pull request !594 from suyh/master 芋道源码 2023-09-03 09:55:39 +00:00
  • e67b62f2f6 !604 优惠券优化 Merge pull request !604 from 疯狂的世界/coupon 芋道源码 2023-09-03 09:48:21 +00:00
  • 9148170926 调整 mapper 命名，避免可能的冲突 YunaiV 2023-09-02 19:23:09 +08:00
  • 71efa0ed6f promotion: 订单使用品类券时，根据品类过滤可用商品 owen 2023-09-02 10:05:56 +08:00
  • 8bbaaf1ce9 promotion: 优惠券模板 productSpuIds 改成 productScopeValues owen 2023-09-02 09:53:37 +08:00
  • 6a7be19d3a common: 增加InEnumCollectionValidator，用于校验枚举值列表参数的取值范围是否有䇅 owen 2023-09-02 08:44:02 +08:00
  • 11ad7ad5e4 mall: 优惠券退还优化 owen 2023-09-02 07:44:16 +08:00
  • c25bf38f50 code review：交易订单的取消 YunaiV 2023-09-02 00:52:31 +08:00
  • 9c0d0c809a Merge branch 'mall_order_cancel' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product YunaiV 2023-09-02 00:45:26 +08:00
  • 68c1113ed1 code review：优惠劵发放 YunaiV 2023-09-02 00:32:16 +08:00
  • a6ec3fefcf code review：优惠劵发放 YunaiV 2023-09-02 00:31:23 +08:00
  • c06d3c3d26 !602 mall: 发送优惠券功能优化 Merge pull request !602 from 疯狂的世界/mall_coupon_take 芋道源码 2023-09-01 16:19:40 +00:00
  • 3fbce643ee mall: 发送优惠券功能优化 owen 2023-09-01 23:45:50 +08:00
  • 76f510f247 code review：优惠劵发放 YunaiV 2023-09-01 22:51:28 +08:00
  • b3fcefa677 trade: 会员取消订单 owen 2023-09-01 20:37:20 +08:00
  • af0771a175 !597 优惠券 Merge pull request !597 from 疯狂的世界/owen_dev 芋道源码 2023-09-01 12:12:02 +00:00
  • 28adfff10e code review：订单逻辑 YunaiV 2023-09-01 20:00:04 +08:00
  • 8dd600a300 !600 订单中心：修改获取售后订单详情接口，修改订单管理后台物流获取接口 Merge pull request !600 from puhui999/feature/mall_product 芋道源码 2023-09-01 11:49:23 +00:00
  • dd6adb8ee6 code review order zhijiantianya@gmail.com 2023-09-01 19:08:27 +08:00
  • e26814be31 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product puhui999 2023-09-01 12:13:11 +08:00
  • 1f9968d784 订单中心：修改获取售后订单详情接口，修改订单管理后台物流获取接口 puhui999 2023-09-01 12:12:15 +08:00
  • 1ca5dd7e93 Crontab组件radio的label类型不一致 gaoxiaoniu 2023-09-01 08:48:07 +08:00