1194 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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	697487ccf7	Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server	2024-11-24 15:18:43 +08:00
wst	93c3c11249	feat: 订单中的couponMation不作为前端参数	2024-11-24 15:18:34 +08:00
lqy	ca655bdc0c	feat:修改地点管理和学校管理的经纬度类型	2024-11-24 14:41:17 +08:00
weizhiqiang	199f843320	feat：修改学校管理修改逻辑	2024-11-24 14:23:26 +08:00
lqy	11c63f2e1a	Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server	2024-11-24 11:44:31 +08:00
lqy	6256c863f7	feat 改更新	2024-11-24 11:44:12 +08:00
wst	274b9cac47	Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server	2024-11-24 11:03:43 +08:00
wst	f1bba9fc57	feat: 商城订单和优惠券添加注释	2024-11-24 11:03:40 +08:00
lqy	2e2bae3e1f	Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server	2024-11-24 10:50:55 +08:00
lqy	e385426b1d	feat:修改位置覆盖--添加自定义sql	2024-11-24 10:50:50 +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
lqy	a3cb1660ce	Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server	2024-11-24 10:05:04 +08:00
lqy	4a583f8a7f	feat:添加版权，修改了参数是否必填，添加了地点模糊搜索	2024-11-24 10:04:58 +08:00
weizhiqiang	9509527d62	feat：解决网关跨域问题	2024-11-24 09:55:28 +08:00
wst	45d50166a3	feat: 增加总商品订单调价功能，订单编号参与模糊查询	2024-11-23 21:58:48 +08:00
wst	460e240483	feat: 修改nacos地址和环境为dev	2024-11-23 21:10:47 +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	fa68a440d3	feat: 枚举类修改	2024-11-21 19:58:57 +08:00
weizhiqiang	011401e7be	feat: 修改枚举	2024-11-21 19:56:25 +08:00
weizhiqiang	71863bb8f2	feat: 二维码支付修改	2024-11-21 16:56:58 +08:00
lqy	245268958e	feat:删除多余的文件接口，添加楼层、教室、服务接口	2024-11-21 15:45:17 +08:00
weizhiqiang	61ba83b4d7	feat: 微信支付修改	2024-11-21 15:37:07 +08:00
weizhiqiang	8be5bcd5bb	feat: 文字补充	2024-11-21 14:31:46 +08:00
weizhiqiang	f408951984	feat: 配置修改	2024-11-21 10:51:31 +08:00
wst	3078e1b072	feat: 发布优惠券和领取优惠券时，增加定时任务	2024-11-21 10:42:29 +08:00
weizhiqiang	ecb2b1511a	feat: 添加返回结果	2024-11-21 10:30:37 +08:00
weizhiqiang	eae7f9facc	feat: 新增根据商品id和门店id批量获取商城商品信息的接口	2024-11-21 10:27:56 +08:00
weizhiqiang	0fc3dbb949	feat: 解决冲突	2024-11-21 10:11:45 +08:00
weizhiqiang	8355afb012	feat: 订单支付	2024-11-21 10:10:17 +08:00
wst	5978d4d482	feat: 新增后台管理接口	2024-11-21 09:18:50 +08:00
wst	1582758af0	Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server	2024-11-21 08:57:10 +08:00
wst	cf4af2b72b	feat: 订单增加address_Id字段及其mation	2024-11-21 08:57:05 +08:00
weizhiqiang	ac3c3f0f36	feat: 操作管理新增VUE路由地址	2024-11-20 19:15:06 +08:00
lqy	36f076d784	feat:修改题库框架bug	2024-11-20 09:42:17 +08:00
DESKTOP-I3O37CJ\lenovo	81491e3586	Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server	2024-11-19 20:18:52 +08:00
DESKTOP-I3O37CJ\lenovo	56752b9cf8	feat:写了答卷的框架	2024-11-19 20:18:45 +08:00
weizhiqiang	3a52c1fefc	feat: 菜单新增vue的path属性	2024-11-19 16:40:48 +08:00
wst	a4be9373da	feat: 查询领取的优惠券时，增加couponMation返回字段	2024-11-18 17:06:00 +08:00
wst	cdd0b8e861	feat: queryShopTradeCartList接口的返回数据修改为列表	2024-11-17 19:48:17 +08:00
wst	3def90b2e7	feat: order实体设置oddNumber为后台设置	2024-11-17 14:22:36 +08:00
wst	64a589017b	feat: 修改根据状态和门店查询优惠券接口的数据库操作异常	2024-11-17 11:40:08 +08:00
wst	c5c8572cf3	Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server	2024-11-17 11:19:34 +08:00
wst	3698765b11	feat: 订单及其子单实体类的成员变量加上对用的枚举类注释	2024-11-17 11:19:30 +08:00
wst	f5def29bb3	feat: wrapper.isNull()判断条件加上and()	2024-11-17 11:15:09 +08:00