215 commits

Author	SHA1	Message	Date
weizhiqiang	33d3b2e0d1	feat: 解决冲突	2024-12-13 15:49:46 +08:00
weizhiqiang	168e5ecd68	feat:解决未登录用户获取优惠券列表报错的问题	2024-12-13 15:48:18 +08:00
wst	203a3b7c88	feat: 删除多余代码	2024-12-13 15:37:14 +08:00
wst	48b466edf6	feat: 格式化代码	2024-12-13 14:43:43 +08:00
wst	88ecd450d4	feat: 修改冲突	2024-12-13 14:38:28 +08:00
wst	ef5288ab0b	feat: 所有的订单评价查询接口返回的信息，客户评价与商家回复相对应	2024-12-13 14:31:28 +08:00
luluyuyu	2a3f99327f	feat：修改总使用次数和已使用次数	2024-12-13 11:20:30 +08:00
luluyuyu	6a553259e3	feat：找寻失踪代码	2024-12-13 10:43:02 +08:00
luluyuyu	94366f3218	feat：优惠券总用数量和使用数量的增加	2024-12-13 09:50:26 +08:00
weizhiqiang	4d110f964f	feat: 解决优惠券可以领取多张的问题	2024-12-13 09:18:34 +08:00
DESKTOP-I3O37CJ\lenovo	4a7240a087	Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server	2024-12-12 21:56:06 +08:00
DESKTOP-I3O37CJ\lenovo	817ab49108	feat:修改查询商品评论的bug	2024-12-12 21:56:00 +08:00
luluyuyu	bf77be74af	Merge remote-tracking branch 'origin/company_server' into company_server	2024-12-12 21:50:41 +08:00
luluyuyu	18fcd69d4e	feat：修改优惠券	2024-12-12 21:49:33 +08:00
weizhiqiang	1271bc0dc9	feat: 解决优惠券领取超过设置数量的问题	2024-12-12 21:48:12 +08:00
weizhiqiang	ea3c8f3dd3	feat：优惠券实体类属性修改	2024-12-12 18:45:10 +08:00
wst	e8077e84cf	feat: 订单评价增加查询自己的评价接口	2024-12-12 11:52:45 +08:00
luluyuyu	e5030550cb	feat：商家评论问题	2024-12-11 20:58:54 +08:00
luluyuyu	8a771c7312	feat：订单评论代码	2024-12-10 22:13:57 +08:00
weizhiqiang	e2661c9d2c	feat: 禁止修改会员门店id	2024-12-10 11:52:51 +08:00
wst	a48bba7bb1	feat: 删除查询订单时的分转元，删除多余注释	2024-12-09 11:58:27 +08:00
wst	f15d3dd1e1	feat: 客户首评增加是否已经追评标志。	2024-12-08 19:27:10 +08:00
wst	7ee2fa1e6d	feat: 移除多余的包，格式化代码	2024-12-08 11:48:09 +08:00
luluyuyu	c9dbfabf40	feat：添加评论换回商品与门店的关系信息	2024-12-08 10:55:09 +08:00
wst	01704b9ddf	feat: 根据id查询订单接口返回数据增加是否已追评键值对	2024-12-08 09:01:35 +08:00
wst	b89293ce2d	feat: 删除多余代码	2024-12-07 11:19:50 +08:00
wst	753f729104	feat: 修复新增订单使用百分比折扣优惠券时，子单优惠券位置错误	2024-12-07 10:27:06 +08:00
wst	963e13d4e5	feat: 购物车新增相同商品只会改变数量	2024-12-07 09:48:31 +08:00
wst	5f9968df83	feat: 删除多余代码	2024-12-06 21:55:52 +08:00
wst	cda982993b	feat: 修复新增订单计算百分比折扣bug	2024-12-06 21:52:34 +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	b370adeb72	feat: 订单评价列表查询增加根据规格id查询条件，新增订单后会自动删除购物车中选中的的商品。	2024-12-06 10:11: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
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
wst	d3d238bc28	Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server	2024-12-04 09:32:55 +08:00