tangweijie/xlcp-backend
1
0
Fork 0
Code Issues 5 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Commit Graph

  • edc5d0f1d0 promotion：增加获得优惠劵匹配结果的列表 YunaiV 2022-11-08 00:40:53 +08:00
  • fb45f22533 Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp LAPTOP-CNV4CMCJ\cheng 2022-11-08 00:16:15 +08:00
  • ea5e6b2c0e 新增了订单详情 LAPTOP-CNV4CMCJ\cheng 2022-11-08 00:16:08 +08:00
  • dc84ebde9d perf: vxe demo xingyu4j 2022-11-07 18:13:04 +08:00
  • 1a45526a9d fix: page loading xingyu4j 2022-11-07 15:10:48 +08:00
  • efb4cf0c66 fix: print Params xingyu4j 2022-11-07 14:58:53 +08:00
  • 4bc7645850 feat: vxe 全局滚动条样式 xingyu4j 2022-11-07 14:39:15 +08:00
  • b1d0fe7599 style: post button xingyu4j 2022-11-07 14:12:16 +08:00
  • 111488e5d6 refactor: codegen xingyu4j 2022-11-07 14:02:48 +08:00
  • cb6a9a1282
         !288 修复vue3 部分bug 重构axios 完善vxe demo Merge pull request !288 from xingyu/dev 芋道源码 2022-11-07 05:35:51 +00:00
  • 4b7e7d61f7 fix: bugs xingyu4j 2022-11-07 13:25:23 +08:00
  • 77067a11bb chore: update deps xingyu4j 2022-11-07 09:39:44 +08:00
  • 05614cc0b8 trade：完善 TradeOrderItemDO 字段 YunaiV 2022-11-06 23:55:59 +08:00
  • d10f49b6a7 promotion：优化价格计算的接口，增加 orderPrice 字段 YunaiV 2022-11-06 22:25:02 +08:00
  • 636cc794dd promotion：完善价格计算，重新接入限时折扣的多种优惠方式 YunaiV 2022-11-06 18:41:27 +08:00
  • c87bc084e6 promotion：RewardActivityServiceImpl 的 getMatchRewardActivities 逻辑 YunaiV 2022-11-06 16:36:14 +08:00
  • 941782fb10 promotion：完善限时折扣的修改逻辑 YunaiV 2022-11-06 12:38:13 +08:00
  • 6d48bd1ed8 promotion：完善限时折扣的添加逻辑 YunaiV 2022-11-06 00:48:07 +08:00
  • 544597d6e2 promotion：完善限时折扣，补充相关的单元测试 YunaiV 2022-11-05 19:57:50 +08:00
  • d4b7f4aaa0 promotion：增加限时折扣的基础代码 YunaiV 2022-11-05 19:13:43 +08:00
  • 00f90e75d9 promotion：增加满减送活动的关闭功能 YunaiV 2022-11-05 10:52:09 +08:00
  • 79304b3a73 promotion：增加满减送活动的排重校验、单元测试 YunaiV 2022-11-05 09:57:45 +08:00
  • 74b6ff1eef promotion：增加满减送活动的前端 50% YunaiV 2022-11-05 00:14:02 +08:00
  • 0e5b7734ac promotion：增加满减送活动的后端 20% YunaiV 2022-11-04 23:19:28 +08:00
  • 873b530652 promotion：增加优惠劵的回收操作 YunaiV 2022-11-04 21:17:37 +08:00
  • 47c2dfa623 promotion：增加优惠劵的前端分页界面 100% YunaiV 2022-11-04 19:17:17 +08:00
  • 6c499faafd fix: button error xingyu4j 2022-11-04 18:19:11 +08:00
  • bca13b1961 feat: xbutton xingyu4j 2022-11-04 18:01:46 +08:00
  • d79b23c8a2 feat: add modal component xingyu4j 2022-11-04 16:43:11 +08:00
  • 1c1cafdc7f feat: vxe tree table xingyu4j 2022-11-04 10:54:52 +08:00
  • 86b6b85934 promotion：增加优惠劵的前端分页界面 80% YunaiV 2022-11-04 00:27:37 +08:00
  • a89d5a83db promotion：增加优惠劵的后端分页接口 YunaiV 2022-11-03 22:40:19 +08:00
  • eb5870f35e feat: menu vxe table xingyu4j 2022-11-03 18:09:55 +08:00
  • fc8a233552 feat: menu vxe table xingyu4j 2022-11-03 18:09:40 +08:00
  • b5a4a5446e fix: vue3 代码生成错误 xingyu4j 2022-11-03 17:01:37 +08:00
  • 3eb11e2658 refactor: refactor axios xingyu4j 2022-11-03 16:55:01 +08:00
  • 9adc84c396 Merge remote-tracking branch 'origin/master' into dev xingyu4j 2022-11-03 14:34:55 +08:00
  • 49237ad966 feat: add vxe crud schemas xingyu4j 2022-11-03 14:33:30 +08:00
  • ee3ac7b663
         !282 修复 vue3 部分问题，引入 vxe-table Merge pull request !282 from xingyu/dev 芋道源码 2022-11-03 04:32:34 +00:00
  • e1b4ab2d1b fix: jsencrypt error xingyu4j 2022-11-03 10:47:21 +08:00
  • 87c40a4ab1 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro shizhong 2022-11-03 09:44:48 +08:00
  • 2c39405bce promotion：完善的优惠卷的实体 YunaiV 2022-11-03 00:05:13 +08:00
  • 8ae8a4a652 promotion：完善优惠劵模板的单元测试、禁用功能 YunaiV 2022-11-02 22:44:37 +08:00
  • e3a700b2d2 Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp YunaiV 2022-11-02 22:19:40 +08:00
  • bd661296c0 promotion：完善优惠劵模板的功能 YunaiV 2022-11-02 22:19:33 +08:00
  • 3537672a52 fix: captcha enable xingyu4j 2022-11-02 13:50:41 +08:00
  • ad42eca847 feat: vxe demo xingyu4j 2022-11-02 11:12:47 +08:00
  • a33120c5d5 Merge remote-tracking branch 'origin/master' into dev xingyu4j 2022-11-02 11:11:09 +08:00
  • 63cb9eb47e Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp LAPTOP-CNV4CMCJ\cheng 2022-11-02 10:46:58 +08:00
  • 89fefc5f81 处理了商品订单的TODO LAPTOP-CNV4CMCJ\cheng 2022-11-02 10:46:42 +08:00
  • ce33b5c219
         !283 fix:vue3 bug Merge pull request !283 from weikun/master 芋道源码 2022-11-02 02:01:54 +00:00
  • 2aaeb7af88 promotion：实现部分优惠劵模板的前端表单 80% YunaiV 2022-11-02 00:35:53 +08:00
  • dc51a93533 promotion：实现部分优惠劵模板的前端列表 YunaiV 2022-11-01 22:31:07 +08:00
  • 3cd6bb3148 fix: seach xingyu4j 2022-11-01 17:35:36 +08:00
  • 8917dcf6bf perf: vxe demo xingyu4j 2022-11-01 17:12:26 +08:00
  • a95694ae6b perf: vxe demo xingyu4j 2022-11-01 15:56:40 +08:00
  • 38161f05ac fix:（同步失败，不存在改变）代码生成，修改字段注解都不能修改 https://gitee.com/zhijiantianya/ruoyi-vue-pro/issues/I5WP5M huyuehua 2022-11-01 14:50:27 +08:00
  • 220e0316e0 feat: vxe demo xingyu4j 2022-11-01 14:36:18 +08:00
  • 5596984e32 fix: 修改密码api weikun 2022-11-01 14:07:42 +08:00
  • 2e2cd448bd chore: update devs xingyu4j 2022-11-01 10:04:15 +08:00
  • 6a542b6104 perf: 优化描述组件 xingyu4j 2022-11-01 09:46:13 +08:00
  • 983a636928 Merge remote-tracking branch 'origin/master' into dev xingyu4j 2022-11-01 09:25:02 +08:00
  • 9745682598
         !286 修复代码生成选择父菜单无效，修复生成的前端代码缺少字段以及格式错误 Merge pull request !286 from 绝影jy/fixed 芋道源码 2022-11-01 01:19:24 +00:00
  • 3c10058dbd promotion：实现部分优惠劵模板的前端逻辑 YunaiV 2022-11-01 00:37:07 +08:00
  • 979ba0f916 promotion：实现优惠劵模板的逻辑 YunaiV 2022-10-31 23:47:06 +08:00
  • 035c2cf28c promotion：完善 优惠劵模板 表~ YunaiV 2022-10-31 21:19:18 +08:00
  • faea04546e 修复代码生成父菜单选择无效，前端代码缺少字段，格式错误 jueying 2022-10-31 17:13:05 +08:00
  • cca27636b7 code review 订单列表.vue 界面 YunaiV 2022-10-31 10:09:10 +08:00
  • e6acdf7098 将 market 模块，调整成 promotion 模块 YunaiV 2022-10-30 17:37:07 +08:00
  • 829bbf58b5 price：完成优惠劵的价格计算~ YunaiV 2022-10-30 17:32:59 +08:00
  • 160d619d59 price：完成满减送的价格计算~ YunaiV 2022-10-30 13:20:07 +08:00
  • 4e9fe4bc54 price：完成限时折扣的价格计算~ YunaiV 2022-10-29 22:23:48 +08:00
  • 084d4baba2 price：完成会员价格的计算~ YunaiV 2022-10-29 21:46:19 +08:00
  • a88eda340b 调整 price 接口，参考 taobao 的技术文档 YunaiV 2022-10-28 23:49:15 +08:00
  • 3b506006dd Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp YunaiV 2022-10-28 22:44:18 +08:00
  • 5c4b61f5ff 暂存调整 Price 接口 YunaiV 2022-10-28 22:44:12 +08:00
  • 26c728b050
         bugfix: 当修改保存模型，再发布时，提示"流程定义部署失败，原因：信息未发生变化" SuperHao 2022-10-28 09:04:41 +00:00
  • 04fb4c0365 fix: 路由顶级非目录菜单直接显示 weikun 2022-10-28 10:55:51 +08:00
  • 74dfc60ef0 fix :token刷新、rememberMe 、暗黑模式保存 、验证码开关 bug add: 字体抗锯齿 魏坤 2022-10-28 09:28:20 +08:00
  • e035e66ffd Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp LAPTOP-CNV4CMCJ\cheng 2022-10-27 16:49:53 +08:00
  • dcb3f1c8f0 新增订单管理页面 LAPTOP-CNV4CMCJ\cheng 2022-10-27 16:49:47 +08:00
  • d91655f3c4 feature(商城): 修改单元测试 luowenfeng 2022-10-27 11:00:14 +08:00
  • 7dd12a3e81 Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp luowenfeng 2022-10-27 10:30:27 +08:00
  • e1d5cfe8fe 微调 trade 交易表的设计 YunaiV 2022-10-26 21:25:29 +08:00
  • 20c79b7053 Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp luowenfeng 2022-10-26 14:57:45 +08:00
  • 3b3404747e chore: update deps xingyu 2022-10-26 09:44:07 +08:00
  • 97cab05df2 feat: 升级依赖 xingyu 2022-10-26 09:16:26 +08:00
  • 70fab167be feat: 升级依赖 xingyu 2022-10-26 09:02:51 +08:00
  • d87dc01dc8 Merge remote-tracking branch 'origin/master' into dev xingyu 2022-10-26 09:00:08 +08:00
  • 356642ecea review 商品的 save 界面 YunaiV 2022-10-25 22:13:31 +08:00
  • d92d257619 Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp luowenfeng 2022-10-25 11:15:17 +08:00
  • 7bf37fcb64 优化管理后台的商品分页的查询 YunaiV 2022-10-24 22:12:47 +08:00
  • c00ded3ed3 优化商品的 index 界面 YunaiV 2022-10-24 21:27:13 +08:00
  • bb8204b5a7
         fix WXLitePayClient.java 中copy应忽略的字段 小程序支付，copy应忽略 "privateKeyContent","privateCertContent"，而不是“KeyContent” chenlei65368 2022-10-24 10:43:04 +00:00
  • dc4e3fcd6e feature(商城): 商城review改 luowenfeng 2022-10-24 10:30:47 +08:00
  • 8c4e3db32b feature(商城): 商城review改 luowenfeng 2022-10-24 10:28:07 +08:00
  • 2bd2cb56a1 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp YunaiV 2022-10-23 22:16:54 +08:00
  • 412c017f21 code review 商品模块 YunaiV 2022-10-23 22:15:26 +08:00
  • 3cee922e69 优化 permission 相关的注释 YunaiV 2022-10-23 20:21:04 +08:00
  • 69c87f8b24 Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp luowenfeng 2022-10-22 17:51:45 +08:00