2980 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
YunaiV	d10f49b6a7	promotion：优化价格计算的接口，增加 orderPrice 字段	2022-11-06 22:25:02 +08:00
YunaiV	636cc794dd	promotion：完善价格计算，重新接入限时折扣的多种优惠方式	2022-11-06 18:41:27 +08:00
YunaiV	c87bc084e6	promotion：RewardActivityServiceImpl 的 getMatchRewardActivities 逻辑	2022-11-06 16:36:14 +08:00
YunaiV	941782fb10	promotion：完善限时折扣的修改逻辑	2022-11-06 12:38:13 +08:00
YunaiV	6d48bd1ed8	promotion：完善限时折扣的添加逻辑	2022-11-06 00:48:07 +08:00
YunaiV	544597d6e2	promotion：完善限时折扣，补充相关的单元测试	2022-11-05 19:57:50 +08:00
YunaiV	d4b7f4aaa0	promotion：增加限时折扣的基础代码	2022-11-05 19:13:43 +08:00
YunaiV	00f90e75d9	promotion：增加满减送活动的关闭功能	2022-11-05 10:52:09 +08:00
YunaiV	79304b3a73	promotion：增加满减送活动的排重校验、单元测试	2022-11-05 09:57:45 +08:00
YunaiV	74b6ff1eef	promotion：增加满减送活动的前端 50%	2022-11-05 00:14:02 +08:00
YunaiV	0e5b7734ac	promotion：增加满减送活动的后端 20%	2022-11-04 23:19:28 +08:00
YunaiV	873b530652	promotion：增加优惠劵的回收操作	2022-11-04 21:17:37 +08:00
YunaiV	47c2dfa623	promotion：增加优惠劵的前端分页界面 100%	2022-11-04 19:17:17 +08:00
xingyu4j	6c499faafd	fix: button error	2022-11-04 18:19:11 +08:00
xingyu4j	bca13b1961	feat: xbutton	2022-11-04 18:01:46 +08:00
xingyu4j	d79b23c8a2	feat: add modal component	2022-11-04 16:43:11 +08:00
xingyu4j	1c1cafdc7f	feat: vxe tree table	2022-11-04 10:54:52 +08:00
YunaiV	86b6b85934	promotion：增加优惠劵的前端分页界面 80%	2022-11-04 00:27:37 +08:00
YunaiV	a89d5a83db	promotion：增加优惠劵的后端分页接口	2022-11-03 22:40:19 +08:00
xingyu4j	eb5870f35e	feat: menu vxe table	2022-11-03 18:09:55 +08:00
xingyu4j	fc8a233552	feat: menu vxe table	2022-11-03 18:09:40 +08:00
xingyu4j	b5a4a5446e	fix: vue3 代码生成错误	2022-11-03 17:01:37 +08:00
xingyu4j	3eb11e2658	refactor: refactor axios	2022-11-03 16:55:01 +08:00
xingyu4j	9adc84c396	Merge remote-tracking branch 'origin/master' into dev	2022-11-03 14:34:55 +08:00
xingyu4j	49237ad966	feat: add vxe crud schemas	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
xingyu4j	e1b4ab2d1b	fix: jsencrypt error	2022-11-03 10:47:21 +08:00
YunaiV	2c39405bce	promotion：完善的优惠卷的实体	2022-11-03 00:05:13 +08:00
YunaiV	8ae8a4a652	promotion：完善优惠劵模板的单元测试、禁用功能	2022-11-02 22:44:37 +08:00
YunaiV	e3a700b2d2	Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp	2022-11-02 22:19:40 +08:00
YunaiV	bd661296c0	promotion：完善优惠劵模板的功能	2022-11-02 22:19:33 +08:00
xingyu4j	3537672a52	fix: captcha enable	2022-11-02 13:50:41 +08:00
xingyu4j	ad42eca847	feat: vxe demo	2022-11-02 11:12:47 +08:00
xingyu4j	a33120c5d5	Merge remote-tracking branch 'origin/master' into dev ... # Conflicts: # yudao-ui-admin-vue3/package.json	2022-11-02 11:11:09 +08:00
LAPTOP-CNV4CMCJ\cheng	63cb9eb47e	Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp	2022-11-02 10:46:58 +08:00
LAPTOP-CNV4CMCJ\cheng	89fefc5f81	处理了商品订单的TODO	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
YunaiV	2aaeb7af88	promotion：实现部分优惠劵模板的前端表单 80%	2022-11-02 00:35:53 +08:00
YunaiV	dc51a93533	promotion：实现部分优惠劵模板的前端列表	2022-11-01 22:31:07 +08:00
xingyu4j	3cd6bb3148	fix: seach	2022-11-01 17:35:36 +08:00
xingyu4j	8917dcf6bf	perf: vxe demo	2022-11-01 17:12:26 +08:00
xingyu4j	a95694ae6b	perf: vxe demo	2022-11-01 15:56:40 +08:00
huyuehua	38161f05ac	fix:（同步失败，不存在改变）代码生成，修改字段注解都不能修改 ... https://gitee.com/zhijiantianya/ruoyi-vue-pro/issues/I5WP5M	2022-11-01 14:50:27 +08:00
xingyu4j	220e0316e0	feat: vxe demo	2022-11-01 14:36:18 +08:00
weikun	5596984e32	fix: 修改密码api	2022-11-01 14:07:42 +08:00
xingyu4j	2e2cd448bd	chore: update devs	2022-11-01 10:04:15 +08:00
xingyu4j	6a542b6104	perf: 优化描述组件	2022-11-01 09:46:13 +08:00
xingyu4j	983a636928	Merge remote-tracking branch 'origin/master' into dev	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
YunaiV	3c10058dbd	promotion：实现部分优惠劵模板的前端逻辑	2022-11-01 00:37:07 +08:00