1276 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
wst	5f9968df83	feat: 删除多余代码	2024-12-06 21:55:52 +08:00
wst	cda982993b	feat: 修复新增订单计算百分比折扣bug	2024-12-06 21:52:34 +08:00
lqy	8240edd095	Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server	2024-12-06 20:30:43 +08:00
lqy	3531188f11	feat:修改新增路线时，起点终点名字没有添加到数据库的bug	2024-12-06 20:30:38 +08:00
wst	a62f31e71f	feat:解决代码冲突	2024-12-06 20:17:11 +08:00
wst	424fdb7636	feat: 商品订单评价新增接口增加子订单是否存在判断。	2024-12-06 20:00:59 +08:00
luluyuyu	12ad90cbe8	feat：修改评论状态	2024-12-06 19:37:23 +08:00
wst	eb59f37688	Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server	2024-12-06 16:38:51 +08:00
wst	2ebba174f3	feat: 订单评价查询列表权限改为0，修复购物车修改商品数量bug	2024-12-06 16:38:48 +08:00
luluyuyu	113ce4fd7f	feat：更新订单缓存	2024-12-06 16:32:22 +08:00
luluyuyu	b5e5b2ecb7	Merge remote-tracking branch 'origin/company_server' into company_server ... # Conflicts: # skyeye-shop/shop-store/src/main/java/com/skyeye/order/service/impl/OrderServiceImpl.java	2024-12-06 16:28:27 +08:00
luluyuyu	3554cfeac9	feat：修改订单评价状态	2024-12-06 16:26:51 +08:00
wst	0ddc86f819	feat: 订单查询规格信息改为从商城拿取	2024-12-06 16:13:48 +08:00
wst	1ea56a2f68	Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server	2024-12-06 10:11:08 +08:00
wst	b370adeb72	feat: 订单评价列表查询增加根据规格id查询条件，新增订单后会自动删除购物车中选中的的商品。	2024-12-06 10:11:05 +08:00
lqy	49f188448b	Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server	2024-12-06 09:54:09 +08:00
lqy	fd6df84a53	feat:添加路线管理--根据id查询路线信息	2024-12-06 09:54:05 +08:00
luluyuyu	70961067d7	feat：订单评价	2024-12-05 21:11:15 +08:00
luluyuyu	c5a3822a39	Merge remote-tracking branch 'origin/company_server' into company_server	2024-12-05 21:10:16 +08:00
luluyuyu	d700aeb484	feat：修改订单状态	2024-12-05 21:07:45 +08:00
lqy	aedd479ded	Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server	2024-12-05 20:17:48 +08:00
lqy	92c3ef8388	feat：添加schoolId字段--修改了根据schoolId分页查询路线---添加了路线类型枚举类	2024-12-05 20:17:44 +08:00
wst	890293b485	Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server	2024-12-05 20:15:29 +08:00
wst	b343713d8f	feat: 优化商品订单评价新增接口	2024-12-05 20:15:23 +08:00
luluyuyu	b021d9f90e	feat：修改总单和子单状态	2024-12-05 17:07:09 +08:00
luluyuyu	9bcb330431	Merge remote-tracking branch 'origin/company_server' into company_server ... # Conflicts: # skyeye-shop/shop-store/src/main/java/com/skyeye/order/service/impl/OrderServiceImpl.java	2024-12-05 17:04:51 +08:00
luluyuyu	2f6628b63f	feat：修改总单和子单签收完成状态	2024-12-05 16:59:57 +08:00
wst	d805a6a2ea	feat: 修改订单使用优惠券的原理。满减直接减总价，折扣则找适用对象中价格最高的	2024-12-05 14:49:49 +08:00
lqy	5b8da4931f	Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server	2024-12-04 21:34:09 +08:00
lqy	ae5a5a97c3	feat:修改路线管理，添加了startName,endName字段	2024-12-04 21:34:04 +08:00
weizhiqiang	2f7990cc87	feat: 解决商城用户下单时无法创建定时任务的问题	2024-12-04 20:11:08 +08:00
luluyuyu	c9c723f043	feat：题库题目的增删改查，试卷的增删改查，发布，复制试卷，是否可参加考试，手动结束试卷	2024-12-04 15:14:43 +08:00
weizhiqiang	bc6e0d3a1a	feat: 解决编辑操作按钮时，页面类型回显错误的问题，修改数据库type=2	2024-12-04 11:32:55 +08:00
weizhiqiang	dcb7243ced	feat: 解决获取审批人报错的问题	2024-12-04 11:11:42 +08:00
wst	d3d238bc28	Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server	2024-12-04 09:32:55 +08:00
wst	c698a6656a	feat: 为实体类的注解加入enumClass参数	2024-12-04 09:32:49 +08:00
luluyuyu	b23120295d	feat：商品满减判断	2024-12-04 09:24:08 +08:00
wst	8985a7206a	feat: 修复订单列表查询bug	2024-12-03 22:01:38 +08:00
wst	9ec2bf4171	feat: 订单评价修复判断bug	2024-12-03 20:54:21 +08:00
wst	03387db352	feat: 订单评价增加判断，首评和追评均只能评一次，商家回复不做限制	2024-12-03 20:09:56 +08:00
wst	29fe3318e3	feat: 订单评价增加客户追评和商家回复	2024-12-03 20:09:10 +08:00
wst	a8f3191db8	feat: 订单查询时，分转元	2024-12-03 20:07:40 +08:00
weizhiqiang	c0eab49859	feat: 行政区划列表查询限制三级	2024-12-03 17:22:41 +08:00
weizhiqiang	5bdeb728df	feat: 行政区划列表查询修改	2024-12-03 16:24:27 +08:00
lqy	dfe843785f	Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server	2024-12-02 21:45:51 +08:00
lqy	1560990bf6	feat:完成路线管理	2024-12-02 21:45:48 +08:00
wst	9c51d8fba0	feat: 删除多余代码，修复订单追评bug	2024-12-02 20:51:34 +08:00
wst	86eae069a7	feat: 订单评价查询结果增加创建人信息和店铺信息，queryOrderCommentPageList接口可以根据订单id或订单子单id查询	2024-12-02 19:46:57 +08:00
wst	9c0c3de47f	feat: 修复订单查询数据缺失问题	2024-12-02 17:13:38 +08:00
weizhiqiang	972fdbd7c7	Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server	2024-12-02 16:31:14 +08:00