183 commits

Author	SHA1	Message	Date
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
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
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
wst	d19415a44c	feat: 订单评价后台管理接口增加查询判断	2024-12-02 11:34:49 +08:00
wst	ccc5276de5	feat: 修改订单取消bug，增加store_id和is_comment字段，增加后台管理接口。	2024-12-01 22:09:56 +08:00
wst	88244b7560	feat: 订单增加后台修改支付状态接口	2024-12-01 10:29:23 +08:00
weizhiqiang	66f8de98ca	feat: 商城订单临时去掉缓存	2024-11-30 17:59:28 +08:00
SUCH HAVE YOU	0cdf414c0f	feat.为订单修改时刷新缓存	2024-11-25 17:28:40 +08:00
weizhiqiang	e02b28c069	feat: 新增根据手机号修改密码的接口	2024-11-25 11:53:33 +08:00
weizhiqiang	43c26dd3ea	fixed: 解决会员没有设置密码时，使用密码登录报错的问题	2024-11-25 11:47:42 +08:00
wst	e8f933b28c	Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server	2024-11-24 22:19:22 +08:00
wst	f885896389	feat: 修改新增订单时，无法使用优惠券bug	2024-11-24 22:19:19 +08:00
wst	36bfb61a92	feat: 订单conponId改为couponUserId，订单评价增加start字段	2024-11-24 22:18:11 +08:00
SUCH HAVE YOU	9772295f07	feat.改动订单取消逻辑	2024-11-24 20:20:23 +08:00
SUCH HAVE YOU	0fb93b8c3a	feat.修改可取消的订单状态，可取消的订单状态：未提交(0)、已提交(1)、待支付(2)、待发货(5)	2024-11-24 17:34:11 +08:00
wst	93c3c11249	feat: 订单中的couponMation不作为前端参数	2024-11-24 15:18:34 +08:00
wst	f1bba9fc57	feat: 商城订单和优惠券添加注释	2024-11-24 11:03:40 +08:00
wst	a9e1ba17f1	feat: 移除多余的包和方法	2024-11-24 10:43:57 +08:00
wst	f55fb3a3dc	Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server	2024-11-24 10:42:55 +08:00
wst	862c78e069	feat: 子订单新增逻辑移至OrderItemServiceImpl，门店id不作为前端参数	2024-11-24 10:42:52 +08:00
weizhiqiang	436453468b	feat: 支付修改	2024-11-24 10:22:24 +08:00
wst	45d50166a3	feat: 增加总商品订单调价功能，订单编号参与模糊查询	2024-11-23 21:58:48 +08:00
wst	c8c3bb253a	feat: 修复新增订单品论时，无法新增的bug	2024-11-22 19:49:12 +08:00
wst	67bdc2e49f	feat: 修复计算订单总价bug，订单返回数据增加ShopMaterial字段	2024-11-22 19:15:11 +08:00
weizhiqiang	71863bb8f2	feat: 二维码支付修改	2024-11-21 16:56:58 +08:00