bixuan
/
iot-card-plus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • 16f5d0f5a4 trade：增加优惠劵使用、商品库存的扣减 YunaiV 2022-11-09 23:56:00 +0800
  • 7961c8fa95 fix: button xingyu 2022-11-09 19:41:22 +0800
  • c701cc92c3 perf: add xtextbutton xingyu4j 2022-11-09 16:32:01 +0800
  • 83592ad069 chore: update devs xingyu4j 2022-11-09 16:31:48 +0800
  • b8665a9bc6 perf: add xtextbutton xingyu4j 2022-11-09 16:31:37 +0800
  • 734236df97 trade：创建订单接口的后端实现的单元测试 100% YunaiV 2022-11-09 13:03:57 +0800
  • 9c033d0104 DateUtils ==> LocalDateTime xingyu4j 2022-11-09 12:43:54 +0800
  • cb006ddf2b DateUtils.buildLocalDateTime ==> LocalDateTime.of xingyu4j 2022-11-09 12:38:01 +0800
  • 375229111e docs: update devs xingyu4j 2022-11-09 11:39:45 +0800
  • 9358816ad4 Merge remote-tracking branch 'origin/master' into dev xingyu4j 2022-11-09 11:15:41 +0800
  • 632a132a6a refactor: Date ==> LocalDateTime xingyu4j 2022-11-09 11:14:46 +0800
  • bc2aa78f70 trade：创建订单接口的后端实现的单元测试 50% YunaiV 2022-11-09 01:03:26 +0800
  • bef3511c6e
         !291 升级 vue2 && 完善 vue3 vxe demo Merge pull request !291 from xingyu/dev 芋道源码 2022-11-08 14:51:33 +0000
  • 01d10b518c trade：优化创建订单接口的后端实现 YunaiV 2022-11-08 22:50:03 +0800
  • d7a1c8f7ca promotion：增加获得优惠劵匹配结果的列表的单元测试 YunaiV 2022-11-08 19:32:49 +0800
  • 2c1419fb1a vue3 代码生成 xingyu4j 2022-11-08 13:59:16 +0800
  • 6f1f8d8eaa Merge remote-tracking branch 'origin/master' into dev xingyu4j 2022-11-08 13:45:50 +0800
  • 0f40947721 升级部分依赖 xingyu4j 2022-11-08 13:43:39 +0800
  • 011dc23699 替换var 为const/let 删除未使用import 替换 == 为 === xingyu4j 2022-11-08 13:31:08 +0800
  • c9e11e7636 fix slot-scope xingyu4j 2022-11-08 12:54:57 +0800
  • d730c50dee 修复代码警告 xingyu4j 2022-11-08 12:26:06 +0800
  • fd30368628 update vue 2.7.0 xingyu4j 2022-11-08 12:23:15 +0800
  • 3fa8e69af0 update element-ui 2.15.10 xingyu4j 2022-11-08 11:13:48 +0800
  • 3a7f309866 fix: error xingyu4j 2022-11-08 10:33:14 +0800
  • 84cb1bd4db chore: update 184 xingyu4j 2022-11-08 09:42:22 +0800
  • edc5d0f1d0 promotion：增加获得优惠劵匹配结果的列表 YunaiV 2022-11-08 00:40:53 +0800
  • 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 +0800
  • ea5e6b2c0e 新增了订单详情 LAPTOP-CNV4CMCJ\cheng 2022-11-08 00:16:08 +0800
  • dc84ebde9d perf: vxe demo xingyu4j 2022-11-07 18:13:04 +0800
  • 1a45526a9d fix: page loading xingyu4j 2022-11-07 15:10:48 +0800
  • efb4cf0c66 fix: print Params xingyu4j 2022-11-07 14:58:53 +0800
  • 4bc7645850 feat: vxe 全局滚动条样式 xingyu4j 2022-11-07 14:39:15 +0800
  • b1d0fe7599 style: post button xingyu4j 2022-11-07 14:12:16 +0800
  • 111488e5d6 refactor: codegen xingyu4j 2022-11-07 14:02:48 +0800
  • cb6a9a1282
         !288 修复vue3 部分bug 重构axios 完善vxe demo Merge pull request !288 from xingyu/dev 芋道源码 2022-11-07 05:35:51 +0000
  • 4b7e7d61f7 fix: bugs xingyu4j 2022-11-07 13:25:23 +0800
  • 77067a11bb chore: update deps xingyu4j 2022-11-07 09:39:44 +0800
  • 05614cc0b8 trade：完善 TradeOrderItemDO 字段 YunaiV 2022-11-06 23:55:59 +0800
  • d10f49b6a7 promotion：优化价格计算的接口，增加 orderPrice 字段 YunaiV 2022-11-06 22:25:02 +0800
  • 636cc794dd promotion：完善价格计算，重新接入限时折扣的多种优惠方式 YunaiV 2022-11-06 18:41:27 +0800
  • c87bc084e6 promotion：RewardActivityServiceImpl 的 getMatchRewardActivities 逻辑 YunaiV 2022-11-06 16:36:14 +0800
  • 941782fb10 promotion：完善限时折扣的修改逻辑 YunaiV 2022-11-06 12:38:13 +0800
  • 6d48bd1ed8 promotion：完善限时折扣的添加逻辑 YunaiV 2022-11-06 00:48:07 +0800
  • 544597d6e2 promotion：完善限时折扣，补充相关的单元测试 YunaiV 2022-11-05 19:57:50 +0800
  • d4b7f4aaa0 promotion：增加限时折扣的基础代码 YunaiV 2022-11-05 19:13:43 +0800
  • 00f90e75d9 promotion：增加满减送活动的关闭功能 YunaiV 2022-11-05 10:52:09 +0800
  • 79304b3a73 promotion：增加满减送活动的排重校验、单元测试 YunaiV 2022-11-05 09:57:45 +0800
  • 74b6ff1eef promotion：增加满减送活动的前端 50% YunaiV 2022-11-05 00:14:02 +0800
  • 0e5b7734ac promotion：增加满减送活动的后端 20% YunaiV 2022-11-04 23:19:28 +0800
  • 873b530652 promotion：增加优惠劵的回收操作 YunaiV 2022-11-04 21:17:37 +0800
  • 47c2dfa623 promotion：增加优惠劵的前端分页界面 100% YunaiV 2022-11-04 19:17:17 +0800
  • 6c499faafd fix: button error xingyu4j 2022-11-04 18:19:11 +0800
  • bca13b1961 feat: xbutton xingyu4j 2022-11-04 18:01:46 +0800
  • d79b23c8a2 feat: add modal component xingyu4j 2022-11-04 16:43:11 +0800
  • 1c1cafdc7f feat: vxe tree table xingyu4j 2022-11-04 10:54:52 +0800
  • 86b6b85934 promotion：增加优惠劵的前端分页界面 80% YunaiV 2022-11-04 00:27:37 +0800
  • a89d5a83db promotion：增加优惠劵的后端分页接口 YunaiV 2022-11-03 22:40:19 +0800
  • eb5870f35e feat: menu vxe table xingyu4j 2022-11-03 18:09:55 +0800
  • fc8a233552 feat: menu vxe table xingyu4j 2022-11-03 18:09:40 +0800
  • b5a4a5446e fix: vue3 代码生成错误 xingyu4j 2022-11-03 17:01:37 +0800
  • 3eb11e2658 refactor: refactor axios xingyu4j 2022-11-03 16:55:01 +0800
  • 9adc84c396 Merge remote-tracking branch 'origin/master' into dev xingyu4j 2022-11-03 14:34:55 +0800
  • 49237ad966 feat: add vxe crud schemas xingyu4j 2022-11-03 14:33:30 +0800
  • ee3ac7b663
         !282 修复 vue3 部分问题，引入 vxe-table Merge pull request !282 from xingyu/dev 芋道源码 2022-11-03 04:32:34 +0000
  • e1b4ab2d1b fix: jsencrypt error xingyu4j 2022-11-03 10:47:21 +0800
  • 87c40a4ab1 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro shizhong 2022-11-03 09:44:48 +0800
  • 2c39405bce promotion：完善的优惠卷的实体 YunaiV 2022-11-03 00:05:13 +0800
  • 8ae8a4a652 promotion：完善优惠劵模板的单元测试、禁用功能 YunaiV 2022-11-02 22:44:37 +0800
  • e3a700b2d2 Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp YunaiV 2022-11-02 22:19:40 +0800
  • bd661296c0 promotion：完善优惠劵模板的功能 YunaiV 2022-11-02 22:19:33 +0800
  • 3537672a52 fix: captcha enable xingyu4j 2022-11-02 13:50:41 +0800
  • ad42eca847 feat: vxe demo xingyu4j 2022-11-02 11:12:47 +0800
  • a33120c5d5 Merge remote-tracking branch 'origin/master' into dev xingyu4j 2022-11-02 11:11:09 +0800
  • 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 +0800
  • 89fefc5f81 处理了商品订单的TODO LAPTOP-CNV4CMCJ\cheng 2022-11-02 10:46:42 +0800
  • ce33b5c219
         !283 fix:vue3 bug Merge pull request !283 from weikun/master 芋道源码 2022-11-02 02:01:54 +0000
  • 2aaeb7af88 promotion：实现部分优惠劵模板的前端表单 80% YunaiV 2022-11-02 00:35:53 +0800
  • dc51a93533 promotion：实现部分优惠劵模板的前端列表 YunaiV 2022-11-01 22:31:07 +0800
  • 3cd6bb3148 fix: seach xingyu4j 2022-11-01 17:35:36 +0800
  • 8917dcf6bf perf: vxe demo xingyu4j 2022-11-01 17:12:26 +0800
  • a95694ae6b perf: vxe demo xingyu4j 2022-11-01 15:56:40 +0800
  • 38161f05ac fix:（同步失败，不存在改变）代码生成，修改字段注解都不能修改 https://gitee.com/zhijiantianya/ruoyi-vue-pro/issues/I5WP5M huyuehua 2022-11-01 14:50:27 +0800
  • 220e0316e0 feat: vxe demo xingyu4j 2022-11-01 14:36:18 +0800
  • 5596984e32 fix: 修改密码api weikun 2022-11-01 14:07:42 +0800
  • 2e2cd448bd chore: update devs xingyu4j 2022-11-01 10:04:15 +0800
  • 6a542b6104 perf: 优化描述组件 xingyu4j 2022-11-01 09:46:13 +0800
  • 983a636928 Merge remote-tracking branch 'origin/master' into dev xingyu4j 2022-11-01 09:25:02 +0800
  • 9745682598
         !286 修复代码生成选择父菜单无效，修复生成的前端代码缺少字段以及格式错误 Merge pull request !286 from 绝影jy/fixed 芋道源码 2022-11-01 01:19:24 +0000
  • 3c10058dbd promotion：实现部分优惠劵模板的前端逻辑 YunaiV 2022-11-01 00:37:07 +0800
  • 979ba0f916 promotion：实现优惠劵模板的逻辑 YunaiV 2022-10-31 23:47:06 +0800
  • 035c2cf28c promotion：完善 优惠劵模板 表~ YunaiV 2022-10-31 21:19:18 +0800
  • faea04546e 修复代码生成父菜单选择无效，前端代码缺少字段，格式错误 jueying 2022-10-31 17:13:05 +0800
  • cca27636b7 code review 订单列表.vue 界面 YunaiV 2022-10-31 10:09:10 +0800
  • e6acdf7098 将 market 模块，调整成 promotion 模块 YunaiV 2022-10-30 17:37:07 +0800
  • 829bbf58b5 price：完成优惠劵的价格计算~ YunaiV 2022-10-30 17:32:59 +0800
  • 160d619d59 price：完成满减送的价格计算~ YunaiV 2022-10-30 13:20:07 +0800
  • 4e9fe4bc54 price：完成限时折扣的价格计算~ YunaiV 2022-10-29 22:23:48 +0800
  • 084d4baba2 price：完成会员价格的计算~ YunaiV 2022-10-29 21:46:19 +0800
  • a88eda340b 调整 price 接口，参考 taobao 的技术文档 YunaiV 2022-10-28 23:49:15 +0800
  • 3b506006dd Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp YunaiV 2022-10-28 22:44:18 +0800