Commit Graph

797 Commits

Author SHA1 Message Date
GaoHao fea219ee42 限制金额、数量只能输正整数 2024-11-12 09:40:23 +08:00
YeMingfei666 bbbe6275ee 增加临时菜弹窗 2024-11-11 18:23:59 +08:00
duan 964b5a2316 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dwb 2024-11-11 15:39:36 +08:00
duan 0210e61816 Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dwb 2024-11-11 15:36:06 +08:00
YeMingfei666 b75318c146 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-11-11 14:06:23 +08:00
YeMingfei666 22ae339e30 Merge branch 'ymf_test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf 2024-11-11 14:04:28 +08:00
YeMingfei666 176fc55a5c 增加优惠券,积分抵扣 2024-11-11 14:03:49 +08:00
魏啾 a8f01db5e3 活动管理 2024-11-11 13:36:44 +08:00
魏啾 c79049443a 商品添加缓存 活动 2024-11-11 10:39:45 +08:00
gyq f5368fcf4f Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-11-11 09:53:42 +08:00
gyq af90b029df 新增邀请好友 2024-11-09 18:19:47 +08:00
GaoHao 835809910a Merge branch 'gh' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-11-08 18:24:46 +08:00
GaoHao 4f6fbf376a 优惠券领取详情更新 2024-11-08 18:24:14 +08:00
GaoHao 43df2b637b Merge branch 'gh' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-11-08 16:07:25 +08:00
GaoHao 0a470c3d7d 优惠券增加有效天数 2024-11-08 16:06:26 +08:00
YeMingfei666 28fdcd9e5c 增加商品券抵扣以及商品券抵扣后价格计算过滤不满足满减条件的优惠券,修改部分代客下单逻辑 2024-11-07 17:04:00 +08:00
YeMingfei666 a9a4efabe9 修改部分代客下单逻辑 2024-11-07 13:30:58 +08:00
魏啾 4acb025bb9 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into wwz 2024-11-06 17:51:30 +08:00
魏啾 883a6ffa1a 添加出入库供应商 2024-11-06 17:51:12 +08:00
YeMingfei666 a8c1440a02 1.代课下单修改监听用户改变事件
减少重复请求
2.当会员优惠未0时不展示会员优惠
2024-11-06 15:39:52 +08:00
YeMingfei666 958229f63d 代客下单修复:
结算时切换用户未重新获取订单信息
2024-11-06 15:29:31 +08:00
YeMingfei666 3ad1407173 修改价格计算公式 2024-11-06 15:26:52 +08:00
YeMingfei666 8528341101 修改价格计算,总价格包含赠送商品价格,最后结果为总价格-赠送商品-会员优惠 2024-11-06 15:20:20 +08:00
YeMingfei666 ef8cd6da3a 增加会员价展示 2024-11-06 14:58:46 +08:00
gyq a9691e5891 Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-11-05 17:09:47 +08:00
gyq da1812f78b 优化积分中心新增类型 2024-11-05 17:09:40 +08:00
YeMingfei666 dfe65e0ae6 修复积分抵扣接口报错问题 2024-11-05 16:41:37 +08:00
YeMingfei666 67a892ac01 代客下单结账增加积分优惠券支付 2024-11-05 16:28:01 +08:00
GaoHao 7d8673e6cf Merge branch 'gh' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-11-05 10:54:43 +08:00
GaoHao 649f9bd13f 添加优惠券名字修改 2024-11-05 10:53:43 +08:00
YeMingfei666 63ef70ab6a 修复问题:
【管理系统】数据统计-桌台统计页面中,按时间筛选出当日时间各个桌台订单数量,点击跳转到订单页面结果不准确
2024-11-04 15:01:29 +08:00
YeMingfei666 f95ae26298 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf_test 2024-11-04 14:53:11 +08:00
YeMingfei666 a9736e69f1 增加获取优惠券 2024-11-04 14:52:36 +08:00
duan f4467b6a2e 桌台日期跳转 2024-11-04 14:36:55 +08:00
duan 8ab8fa3a9a Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-11-04 14:11:41 +08:00
duan c9d2e3c80f 桌台跳转报错 2024-11-04 14:11:28 +08:00
魏啾 1b0747ca91 添加耗材价格 2024-11-04 14:07:22 +08:00
duan 13b4a82ce6 修改耗材出库单位 2024-11-04 11:38:42 +08:00
duan 933d70445e Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dwb 2024-11-04 11:28:15 +08:00
duan 51f3a382c8 耗材主副单位联动 2024-11-04 11:27:44 +08:00
gyq 438c11c324 Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-11-01 16:00:26 +08:00
gyq 8acea02448 积分中心图片增加预览功能 2024-11-01 13:48:50 +08:00
duan da693c2fa2 员工管理 2024-11-01 13:36:15 +08:00
魏啾 281a4d200a Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into wwz 2024-11-01 13:35:57 +08:00
魏啾 367cb7c2d7 隐藏耗材管理 2024-11-01 13:35:20 +08:00
YeMingfei666 1067da51c4 修复订单列表页面退菜文字错误 2024-11-01 11:28:13 +08:00
YeMingfei666 b0fd39fa87 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf_test 2024-11-01 11:16:49 +08:00
YeMingfei666 8c99f49700 代客下单部分逻辑处理优化,订单管理退款退菜结账跳转功能问题处理 2024-11-01 11:16:12 +08:00
gyq 964877f763 优惠券api管理 2024-11-01 10:24:16 +08:00
gyq 9621b5bb86 Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-11-01 10:23:36 +08:00